Menu
▾
▴
[Jmol-commits] CVS: Jmol-web build-deploy.xml,1.6,1.7 cache.properties,1.1,1.2
|
From: Nicolas <ni...@us...> - 2005-05-03 20:34:41
|
Update of /cvsroot/jmol/Jmol-web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12818 Modified Files: build-deploy.xml cache.properties Log Message: Files for uploading Jmol-web Index: build-deploy.xml =================================================================== RCS file: /cvsroot/jmol/Jmol-web/build-deploy.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build-deploy.xml 26 Apr 2005 18:01:50 -0000 1.6 +++ build-deploy.xml 3 May 2005 20:34:29 -0000 1.7 @@ -5,7 +5,15 @@ The scp task requires the jsch jar in the class path. --> - <property name="from.dir" value="build/html" /> + <!-- Contributions --> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="./ant-contrib.jar"/> + </classpath> + </taskdef> + + <property name="from.dir" value="build/html" /> + <property name="tmp.cache" value="build/cache.properties" /> <!-- Copying files to website --> <target name="deploy" > @@ -31,25 +39,79 @@ addproperty="ssh.password" /> + <!-- Path management --> + <property + name="dir.expanded" + value="${basedir}${file.separator}build${file.separator}html${file.separator}"/> + <propertyregex + property="dir.expanded" override="true" input="${dir.expanded}" + regexp="\\" replace="\\\\\\\\" global="true"/> + <propertyregex + property="dir.expanded" override="true" input="${dir.expanded}" + regexp=":" replace="\\\\:" global="true"/> + <propertyregex + property="dir.expanded" override="true" input="${dir.expanded}" + regexp="\\" replace="\\\\\\\\" global="true"/> + + <!-- Prepare temporary cache.properties --> + <copy file="cache.properties" tofile="${tmp.cache}" overwrite="true"/> + <property name="separator.replacement" value="${file.separator}"/> + <propertyregex + property="separator.replacement" override="true" + input="${file.separator}" + regexp="\\" replace="\\\\\\\\\\\\\\\\" global="true"/> + <replaceregexp + file="${tmp.cache}" + match="/" replace="${separator.replacement}" flags="g"/> + <replaceregexp + file="${tmp.cache}" + match="^([^#])" replace="${dir.expanded}\1" flags="gm"/> + <replaceregexp + file="${tmp.cache}" + match="\\" replace="\\\\\\\\" flags="g"/> + <replaceregexp + file="${tmp.cache}" + match=":" replace="\\\\:" flags="g"/> + <!-- Do the copy using scp --> - <echo message="Copying all files to Jmol website"/> - <copy file="cache.properties" tofile="cache_tmp.properties" overwrite="true"/> + <echo message="Copying all files to Jmol website" level="info"/> <scp todir="${ssh.user}:${ssh.password}@shell.sourceforge.net:/home/groups/j/jm/jmol/htdocs" trust="yes" failonerror="true"> <fileset dir="${from.dir}"> <modified> - <param name="cache.cachefile" value="cache_tmp.properties"/> + <param name="cache.cachefile" value="${tmp.cache}"/> </modified> </fileset> </scp> - <copy file="cache_tmp.properties" tofile="cache.properties"/> - <delete file="cache_tmp.properties"/> + + <!-- Recreate cache.properties --> + <replaceregexp + file="${tmp.cache}" + match="^${dir.expanded}" replace="" flags="gm"/> + <replaceregexp + file="${tmp.cache}" + match="\\\\" replace="/" flags="g"/> + <replaceregexp + file="${tmp.cache}" + match="^#.*$" replace="" flags="gm"/> + <loadfile srcfile="${tmp.cache}" property="unsorted.files"/> + <sortlist + property="sorted.files" value="${unsorted.files}" + delimiter="${line.separator}"/> + <echo file="cache.properties">${sorted.files}</echo> + + <!-- Post-processing for access rights --> <sshexec host="shell.sourceforge.net" username="${ssh.user}" password="${ssh.password}" trust="yes" failonerror="false" command="chmod -R -f ug+rw,o+r /home/groups/j/jm/jmol/htdocs/"> </sshexec> + <sshexec + host="shell.sourceforge.net" username="${ssh.user}" password="${ssh.password}" + trust="yes" failonerror="false" + command="chgrp -R -f jmol /home/groups/j/jm/jmol/htdocs/"> + </sshexec> </target> Index: cache.properties =================================================================== RCS file: /cvsroot/jmol/Jmol-web/cache.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cache.properties 26 Apr 2005 18:32:46 -0000 1.1 +++ cache.properties 3 May 2005 20:34:29 -0000 1.2 @@ -1,990 +1,994 @@ -#Tue Apr 26 20:06:22 CEST 2005 -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p934.xyz.gz=81545359e168268a133071d58e7bcfa7 -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p1024.xyz.gz=c15c7831cc301decb7ef34074c102fed -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p567.xyz.gz=ef1eb6b22bc9754c93aca4c0323d5c44 -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p696.xyz.gz=a98ca522a021f83fd4a72d9eba90ae1d -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p206.xyz.gz=c70e0dbcb66536bb58b8d39e411eea65 -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p335.xyz.gz=af41b44e014d383b71649a68a27e4bfa -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p1219.xyz.gz=64ade1c3572786e9e66ec88eb595a765 -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p1123.xyz.gz=a0424d37c57c6292e0ca3185261ee6b9 -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p1252.xyz.gz=de73874c08688c41af2edf57eac08684 -E\:\\Java\\Jmol-web\\build\\html\\fah\\projects\\p1318.xyz.gz=c59f8604860be5e739cdc625fb95624e [...1954 lines suppressed...] +v9/SN1_reaction.xyz=a526a4624b213cc3517f7fad63805a7a +v9/aspirina.mol=128a490bb4f9e6bcbfd6ca8b4c414792 +v9/bulk_si.in=1da28ec79fef23a4b881fcbf41e12178 +v9/caffeine.xyz=a574887d2918a0647c7e53919c70f667 +v9/conformeren.cml=531fe3a7131a576b346aaedfd9a9aeb3 +v9/dna.xyz=0a9c73f6330909a73850ee94acfded92 +v9/estron.cml=eed4e72a99ff605edbeb0831a23928a9 +v9/index.en.html=6375cdd1a36a639c67a54e6691ed896a +v9/jmol.mol=897d2d2d8b0cdff3515f485421014051 +v9/methanol1.cml=30d6115a2541655581dd07407a27709f +v9/move.txt=4691bf7bd8e9536e1f7734a9e467515a +v9/screenshot1.jpg=b5215a401d7e50beb065d2136140ee8b +v9/screenshot2.jpg=350875c4d5006bad57aaaeedb9534b1e +v9/screenshot3.jpg=b112d3fbf22cf0ab515ae07da4d120b7 +v9/screenshot4.jpg=b004fc7254173d7ddd195c47880a6d12 +v9/screenshot5.jpg=ada1e0a701e71c863eadfe283d7986a1 +v9/testscript.txt=0bcdaf5a6167a9ac1a24727630137692 +websites/index.en.html=e3bc9ecc333395ed2fb0a685fa3d65c0 +websites/index.fr.html=25e80b0cfd8c97f4b00fb8806b9a177f \ No newline at end of file |