Changeset 1288


Ignore:
Timestamp:
22/11/18 15:03:30 (6 months ago)
Author:
mjuckes
Message:

updated Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/Makefile

    r1287 r1288  
    55version ?= version 
    66www ?= /var/www/html/dreq 
    7 wwwdata ?= /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site 
     7###wwwdata ?= /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site 
     8wwwdata ?= /group_workspaces/jasmin4/cedaproc/mjuckes/site 
    89ddir ?= /data/svn/exarch/CMIP6dreq/trunk 
    910prevVersion ?= 01.00.24 
     
    132133        fi 
    133134        mkdir -p $(wwwdata)/new/data/tabs02/  $(wwwdata)/new/tabs03/ $(wwwdata)/new/u/ $(wwwdata)/new/t/ 
    134         cp -r dreqPy/xls/* $(wwwdata)/new/data/tabs02/ 
    135         cp -r dreqPy/html/tabs03/* $(wwwdata)/new/tabs03/ 
     135        rsync -r dreqPy/xls/ $(wwwdata)/new/data/tabs02/ 
     136        rsync -r dreqPy/html/tabs03/ $(wwwdata)/new/tabs03/ 
    136137        rsync -r dreqPy/html/u/ $(wwwdata)/new/u/ 
    137138        rsync -r dreqPy/html/t/ $(wwwdata)/new/t/ 
     
    140141 
    141142siteDataV2: 
    142         cp dreqPy/tab01_1_1_dn.html dreqPy/tab01_1_1.html dreqPy/tab01_3_3.html $(www)/beta/ 
     143        cp dreqPy/tab01_1_1_dn.html dreqPy/tab01_1_1.html dreqPy/tab01_3_3.html $(wwwdata)/new/ 
     144        cp -r dreqPy/html/index $(wwwdata)/new/ 
     145        cp -r dreqPy/html/index.html $(wwwdata)/new/ 
    143146 
    144147betaHtml: 
     
    155158        (cd $(wwwdata)/new/; cp tab01_1_1_dn.html tab01_1_1.html tab01_3_3.html $(www)/beta/) 
    156159        cp websiteExtras/dreq.css $(www)/beta/css/ 
    157         cp -r dreqPy/html/index/* $(www)/beta/index/ 
    158         cp -r dreqPy/html/index.html $(www)/beta/ 
     160        cp -r $(wwwdata)/new/index/* $(www)/beta/index/ 
     161        cp -r $(wwwdata)/new/index.html $(www)/beta/ 
    159162 
    160163siteHtml: 
     
    172175 
    173176versionLinks: 
    174         (cd $(www)/$(version); ln -s /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site/$(version)/data) 
    175         (cd $(www)/$(version); ln -s /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site/$(version)/tabs03) 
    176         (cd $(www)/$(version); ln -s /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site/$(version)/u) 
    177         (cd $(www)/$(version); ln -s /group_workspaces/jasmin2/cmip6_prep/cmip6_data_request/site/$(version)/t) 
     177        (cd $(www)/$(version); ln -s $(wwwdata)/$(version)/data) 
     178        (cd $(www)/$(version); ln -s $(wwwdata)/$(version)/tabs03) 
     179        (cd $(www)/$(version); ln -s $(wwwdata)/$(version)/u) 
     180        (cd $(www)/$(version); ln -s $(wwwdata)/$(version)/t) 
    178181 
    179182cleanLocalHtml: 
Note: See TracChangeset for help on using the changeset viewer.