Changeset 1252

Timestamp:

26/07/18 17:19:20 (11 months ago)

Author:

mjuckes

Message:

makefile updates for site maintenance (versions)

Location:

CMIP6dreqbuild/trunk/src/framework

Files:

• Makefile (modified) (5 diffs)
• dreqPy/extensions/__init__.pyc (modified) (previous)
• dreqPy/extensions/collect.pyc (modified) (previous)

CMIP6dreqbuild/trunk/src/framework/Makefile

@@ -3 +3 @@
 targ ?= dreq2
 fmt ?= xls
+version ?= version
 www ?= /var/www/html/dreq
 wwwdata ?= /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site
 ddir ?= /data/svn/exarch/CMIP6dreq/trunk
+prevVersion ?= 01.00.24
 
 
@@ -105 +107 @@
 
 siteDataShift:
-        ##mv $(wwwdata)/latest $(wwwdata)/$(version) 
+        mv $(wwwdata)/latest $(wwwdata)/old
         ##[[ $$? != 0 ]] && exit -1;
-        ##echo MOVED $(wwwdata)/latest to $(wwwdata)/$(version)
+        ##echo MOVED $(wwwdata)/latest to $(wwwdata)/$(prevVersion)
         mv $(wwwdata)/new $(wwwdata)/latest
-        [[ $$? != 0 ]] && exit -1;
+        ##[[ $$? != 0 ]] && exit -1;
         echo MOVED $(wwwdata)/new to $(wwwdata)/latest
 
@@ -117 +119 @@
           echo "Let's rock" >&2; \
         else \
-          echo "Base directory does not exist" >&2; \
+          echo "Base directory -- $(wwwdata)/new -- does not exist" >&2; \
           exit 1; \
         fi
@@ -128 +130 @@
         cp dreqPy/data3ex.js $(wwwdata)/new/data/exptData.js
 
+betaHtml:
+        mkdir -p $(www)/beta/ $(www)/beta/css/ $(www)/beta/index/
+        (cd $(www)/beta; ln -s $(wwwdata)/new/data ; ln -s $(wwwdata)/new/tabs03 ;  ln -s $(wwwdata)/new/u ; ln -s $(wwwdata)/new/t)
+        cp dreqPy/tab01_1_1_dn.html dreqPy/tab01_1_1.html dreqPy/tab01_3_3.html $(www)/beta/
+        cp websiteExtras/dreq.css $(www)/beta/css/
+        cp -r dreqPy/html/index/* $(www)/beta/index/
+        cp -r dreqPy/html/index.html $(www)/beta/
+
 siteHtml:
         cp dreqPy/tab01_1_1_dn.html dreqPy/tab01_1_1.html dreqPy/tab01_3_3.html $(www)/
@@ -133 +143 @@
         cp -r dreqPy/html/index/* $(www)/index/
         cp -r dreqPy/html/index.html $(www)/
+
+versionHtml:
+        mkdir $(www)/$(version)  $(www)/$(version)/index $(www)/$(version)/css
+        cp $(www)/tab01_1_1_dn.html dreqPy/tab01_1_1.html dreqPy/tab01_3_3.html $(www)/$(version)
+        cp  $(www)/css/dreq.css  $(www)/$(version)/css/
+        cp $(www)/index/* $(www)/$(version)/index/
+        cp $(www)/index.html $(www)/experiments.html $(www)/mipVars.html  $(www)/$(version)
+
+versionLinks:
+        (cd $(www)/$(version); ln -s /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site/$(version)/data)
+        (cd $(www)/$(version); ln -s /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site/$(version)/tabs03)
+        (cd $(www)/$(version); ln -s /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site/$(version)/u)
+        (cd $(www)/$(version); ln -s /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site/$(version)/t)
 
 cleanLocalHtml: