Revision: 21312
          http://sourceforge.net/p/jmol/code/21312
Author:   hansonr
Date:     2016-12-17 14:03:52 +0000 (Sat, 17 Dec 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.8.1020161217"

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/tools/jmol-release.xml

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2016-12-17 13:56:22 UTC 
(rev 21311)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2016-12-17 14:03:52 UTC 
(rev 21312)
@@ -47,8 +47,11 @@
  -- sets the echo offset to a specific screen pixel offset
  -- TODO not saved in state
 
-Jmol.___JmolVersion="14.8.1020161217-beta"
+Jmol.___JmolVersion="14.8.1020161217"
 
+JmolVersion="14.8.1020161217-beta"
+released
+
 Release Note: switching to semantic versioning (http://semver.org/)
 Release Note: incrementing will be at the xx.x.xx level; digits after that are 
a date stamp
 Release Note: for example, the next version in this series will be 
14.8.11yyyymmdd-beta

Modified: trunk/Jmol/tools/jmol-release.xml
===================================================================
--- trunk/Jmol/tools/jmol-release.xml   2016-12-17 13:56:22 UTC (rev 21311)
+++ trunk/Jmol/tools/jmol-release.xml   2016-12-17 14:03:52 UTC (rev 21312)
@@ -12,7 +12,7 @@
     </classpath>
   </taskdef>
 
-  <property name="zipOnly"         value="true" />
+  <property name="sendZip"         value="true" />
   <property name="dist.dir"        value="build/dist" />
   <property name="src.dir"         value="src" />
   <property name="temp.dir"        value="build/release" />
@@ -119,13 +119,18 @@
     <delete dir="${temp.dir}" />
     <mkdir dir="${temp.dir}" />
     <mkdir dir="${temp.dir}/${uploadPath}" />
+       
+       <if>
+     <equals arg1="${sendZip}" arg2="true" />
+        <then>
     <copy todir="${temp.dir}/${uploadPath}"
           file="${dist.dir}/Jmol-${version}-binary.zip" />
     <copy tofile="${temp.dir}/${uploadPath}/README-${version}.properties"
           file="${dist.dir}/Jmol.properties" />
-
+    </then>
+       </if>
        <if>
-     <equals arg1="${zipOnly}" arg2="false" />
+     <equals arg1="${betaFlag}" arg2="" />
         <then>
            <copy todir="${temp.dir}/${uploadPath}"
                  file="${dist.dir}/Jmol-${version}-binary.tar.gz" />

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to