Commits

Charlie Groves committed 24a0965

pull over r3097 from trunk since that was what actually built 2.2b1

Comments (0)

Files changed (1)

   - call target 'full-build'
 This build will create a working directory named full_build_${svn.tag} at the same
 level as your local directories jython, sandbox and installer.
-It will contain a big jython_installer_${svn.tag}.jar file suitable for installation.
+It will contain a big jython_installer-${jython.version}.jar file suitable for installation.
 
 Please be aware:
 To build older releases, it may be necessary to use an older build.xml, too (with the corresponding tag).
         <!-- predefined tags for jython and cpython -->
         <property name="svn.tag" value="Release_2_2beta1" />
 
-        <!-- revision handling -->
-    	<property name="svn.revision" value="${svn.tag}" />
-
         <property name="work.dir" value="${basedir}/../full_build_${svn.tag}" />
         <property name="svn.checkout.dir" value="${work.dir}/checkout" />
         <property name="jython.base.dir" value="${svn.checkout.dir}/jython" />
         <condition property="do.checkout" value="true">
             <istrue value="${has.repositories.connection}" />
         </condition>
-        <condition property="do.snapshot.build" value="true">
-        	<not>
-                <equals arg1="${svn.revision}" arg2="${svn.tag}" />
-            </not>
+        <condition property="do.snapshot.build">
+            <isset property="svn.revision" />
         </condition>
+        <condition property="jython.version" value="${svn.revision}">
+            <isset property="svn.revision" />
+        </condition>
+        <property name="jython.version" value="2.2b1" />
+	<property name="svn.revision" value="HEAD"/>
     	
         <!-- classpath for svn ant task -->
         <path id="svn.classpath">
         	<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" />
         </svn> 
 
-    	<!-- checkout cpython license from the correct python maintenance branch -->
+        <!-- checkout cpython license from the correct python maintenance branch -->
         <svn javahl="${javahl.dir}" >
-        	<checkout url="http://svn.python.org/projects/python/branches/release22-maint/" destPath="${svn.checkout.dir}/python" recurse="false" />
+               <checkout url="http://svn.python.org/projects/python/branches/release22-maint/" destPath="${svn.checkout.dir}/python" recurse="false" />
         </svn> 
     </target>
 
               <attribute name="Built-By" value="${user.name}" />
               <!-- info section. ATTN: no blanks, no '.' in the names -->
               <section name="Build-Info">
-                  <attribute name="version" value="${svn.revision}" />
+                  <attribute name="version" value="${jython.version}" />
                   <attribute name="svn-build" value="${do.checkout}" />
                   <attribute name="threadlocal" value="${threadlocal.present}" />
                   <attribute name="secureclassloader" value="${secureclassloader.present}" />
             <fileset dir="${install.src.dir}" includes="**/*.png" excludes="bin/**" />
         </copy>
         <echo>building installer .jar file</echo>
-        <jar destfile="${work.dir}/jython_installer_${svn.revision}.jar" basedir="${dist.dir}" update="true">
+        <jar destfile="${work.dir}/jython_installer-${jython.version}.jar" basedir="${dist.dir}" update="true">
             <manifest>
                 <attribute name="Main-Class" value="org.python.util.install.Installation" />
                 <attribute name="Built-By" value="${user.name}" />
                 <!-- section for the install program -->
                 <section name="Jython">
-                    <attribute name="version" value="${svn.revision}" />
+                    <attribute name="version" value="${jython.version}" />
                     <attribute name="exclude-dirs" value="org;META-INF" />
                 </section>
                 <!-- info section. ATTN: no blanks, no '.' in the names -->