Closes umple#639 and umple#617

build/_template.xml

@@ -9,8 +9,8 @@
 
   <property name="myenv" value="cc" />
   <import file="_${myenv}.xml" />
-  
-
+
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
 
   <property name="dist.dir"                     value="${basedir}/dist" />
   <property file="${dist.dir}/recent.build.properties" />
@@ -29,8 +29,8 @@
           <property name="dist.@{name}.jar.prev"  value="umple-${dist.umple.latest.version}.jar" />
         </then>
         <else>
-          <property name="dist.umple.@{name}.jar"       value="@{name}-${umple.version}.jar" />
-          <property name="dist.umple.@{name}.jar.prev"  value="@{name}-${dist.umple.latest.version}.jar" />
+          <property name="dist.umple.@{name}.jar"       value="umple@{name}-${umple.version}.jar" />
+          <property name="dist.umple.@{name}.jar.prev"  value="umple@{name}-${dist.umple.latest.version}.jar" />
         </else>
       </if>
     </sequential>

build/_versionLast.xml

@@ -3,7 +3,7 @@
 
   <property prefix="last" file="build/umpleversion.last.txt"/>
   <property name="umple.version" value="${last.version}" />
-  <echo message="Last Version: ${umple.version}" />
+  <echo message="Last Version: ${last.version}" />
 
 </project>
 

build/build.deps.xml

@@ -5,6 +5,7 @@
     Environment Variables
   ``````````````````````````` -->
   <import file="_template.xml" />
+  <import file="_versionLast.xml" />
 
   <!-- Ivy Configuration -->
   <property name="ivy.install.version" value="2.4.0" />
@@ -16,7 +17,7 @@
   <!-- Umple Last -->
   <property name="umple.deps.dir" value="${dist.dir}/libs" />
   <property name="umple.deps.manual.dir" value="${umple.deps.dir}/manual" />
-  <property name="umple.stable.jar" value="${umple.deps.dir}/../umple-stable.jar" />
+  <property name="umple.stable.jar" value="${umple.deps.dir}/../umple-${last.version}.jar" />
 
   <!-- Vendor Configuration -->
   <property name="vendors.path" value="${dist.dir}/vendors" />
@@ -172,8 +173,9 @@
         <echo level="warning">WARNING: This is merely wget-ing http://cruise.eecs.uottawa.ca/umpleonline/scripts/umple.jar</echo>
         <mkdir dir="${umple.deps.dir}" />
         <get src="http://cruise.eecs.uottawa.ca/umpleonline/scripts/umple.jar"
-             dest="${umple.last.jar.file}"
+             dest="${umple.stable.jar}"
              usetimestamp="true" />
+        <copy file="${umple.stable.jar}" tofile="${umple.stable.jar}" />
       </else>
     </if>
 

build/build.sandbox.xml

@@ -21,7 +21,7 @@
   ``````````````````````````` -->
 
   <target name="umpleSandbox">
-    <java jar="${dist.dir}/${dist.umple.jar.prev}" fork="true" failonerror="true">
+    <java jar="${umple.stable.jar}" fork="true" failonerror="true">
       <arg value="sandbox/src/sandbox.ump"/>
     </java>
   </target>

build/build.umple.xml

@@ -68,13 +68,13 @@
 
     <deps-load-path conf="core" pathid="core.ivy.classpath" />
 
-    <java jar="${dist.dir}/${dist.umple.jar.prev}" fork="true" failonerror="true">
+    <java jar="${umple.stable.jar}" fork="true" failonerror="true">
       <arg value="cruise.umple/src/Master.ump"/>
     </java>
-    <java jar="${dist.dir}/${dist.umple.jar.prev}" fork="true" failonerror="true">
+    <java jar="${umple.stable.jar}" fork="true" failonerror="true">
       <arg value="cruise.umple.validator/src/Master.ump"/>
     </java>
-    <java jar="${dist.dir}/${dist.umple.jar.prev}" fork="true" failonerror="true">
+    <java jar="${umple.stable.jar}" fork="true" failonerror="true">
       <arg value="cruise.umplificator/src/Master.ump"/>
     </java>
   </target>
@@ -329,15 +329,10 @@
       </manifest>
 
     </jar>
-
-    <copy file="${dist.dir}/${dist.umple.jar}" 
-          tofile="${dist.dir}/${dist.umple.jar.next}" />
   </target>
 
   <target name="packageJars">
     <antcall target="packageMainJar" />
-
-    <echo message="dist.umple.latest.version=${umple.version}" file="${recent.build.properties.file}" />
 
     <deps-get-path conf="core" pathid="core.ivy.classpath" />
     <manifestclasspath property="umple.jar.classpath" jarfile="${dist.dir}/${dist.umple.jar}" >