[Wrapper-cvs] SF.net SVN: wrapper:[2047] trunk/wrapper/build.xml

[<mor...@us...>]

Revision: 2047
          http://sourceforge.net/p/wrapper/code/2047
Author:   mortenson
Date:     2020-11-30 15:01:21 +0000 (Mon, 30 Nov 2020)
Log Message:
-----------
Work on 3.5.45

Modified Paths:
--------------
    trunk/wrapper/build.xml

Modified: trunk/wrapper/build.xml
===================================================================
--- trunk/wrapper/build.xml	2020-11-30 07:17:32 UTC (rev 2046)
+++ trunk/wrapper/build.xml	2020-11-30 15:01:21 UTC (rev 2047)
@@ -473,7 +473,7 @@
         <filter token="app.long.name"     value="${app.long.name}" />
         <filter token="app.description"   value="${app.desc}"      />
         
-        <property name="intermmarker" value="pre-release"/>
+        <property name="prerelease.marker" value="pre-release"/>
     </target>
     <target name="init:msg" depends="init">
         <echo message="**********************************************************************"/>
@@ -508,7 +508,7 @@
     <!-- =================================================================== -->
     <target name="update-info" depends="convert">
         <!-- Delete the pre-release marker file as early as possible. -->
-        <delete file="${build.dir}/${intermmarker}"/>
+        <delete file="${build.dir}/prerelease/${prerelease.marker}"/>
         
         <!-- copy server info source, using filtering to update version and build time -->
         <copy file="${src.dir}/java/org/tanukisoftware/wrapper/WrapperInfo.java.in"
@@ -1245,12 +1245,12 @@
     </target>
     <target name="pre-release" depends="pre-release:disabled, release-common"
         description="Builds an intermediate release file that can then be deployed to individual platforms to complete the platform specific releases.">
-        <property name="intermfile" value="wrapper_prerelease_${version}"/>
-        <property name="intermdir" value="${build.dir}/${intermfile}"/>
-        <delete dir="${intermdir}"/>
-        <mkdir dir="${intermdir}"/>
+        <property name="prerelease.file" value="wrapper_prerelease_${version}"/>
+        <property name="prerelease.dir" value="${build.dir}/prerelease/${prerelease.file}"/>
+        <delete dir="${prerelease.dir}"/>
+        <mkdir dir="${prerelease.dir}"/>
         
-        <copy todir="${intermdir}" >
+        <copy todir="${prerelease.dir}" >
             <fileset dir="${basedir}" >
                 <include name="index.html" />
                 <include name="build*" />
@@ -1293,67 +1293,69 @@
         </copy>
         
         <!-- Make sure that files are formatted correctly for their platforms -->
-        <fixcrlf srcdir="${intermdir}" includes="**/*.bat" eol="crlf" />
-        <fixcrlf srcdir="${intermdir}" includes="**/*.bat.in" eol="crlf" />
-        <fixcrlf srcdir="${intermdir}" includes="**/*.sh.in" eol="lf" />
-        <fixcrlf srcdir="${intermdir}" includes="**/*.shconf.in" eol="lf" />
-        <fixcrlf srcdir="${intermdir}" includes="src/test/**/*.in" eol="lf" />
-        <fixcrlf srcdir="${intermdir}" includes="build32.sh" eol="lf" />
-        <fixcrlf srcdir="${intermdir}" includes="build64.sh" eol="lf" />
-        <fixcrlf srcdir="${intermdir}" includes="**/Makefile-*" eol="lf" />
+        <fixcrlf srcdir="${prerelease.dir}" includes="**/*.bat" eol="crlf" />
+        <fixcrlf srcdir="${prerelease.dir}" includes="**/*.bat.in" eol="crlf" />
+        <fixcrlf srcdir="${prerelease.dir}" includes="**/*.sh.in" eol="lf" />
+        <fixcrlf srcdir="${prerelease.dir}" includes="**/*.shconf.in" eol="lf" />
+        <fixcrlf srcdir="${prerelease.dir}" includes="src/test/**/*.in" eol="lf" />
+        <fixcrlf srcdir="${prerelease.dir}" includes="build32.sh" eol="lf" />
+        <fixcrlf srcdir="${prerelease.dir}" includes="build64.sh" eol="lf" />
+        <fixcrlf srcdir="${prerelease.dir}" includes="**/Makefile-*" eol="lf" />
         
-        <!-- Create a marker in both the intermdir and the build dir so the release target
-            can be run from the current source tree or from the intermdir tree. -->
-        <touch file="${build.dir}/${intermmarker}"/>
-        <touch file="${intermdir}/build/${intermmarker}"/>
+        <!-- Create a marker in both the prerelease.dir and the build dir so the release target
+            can be run from the current source tree or from the prerelease.dir tree. -->
+        <mkdir dir="${build.dir}/prerelease"/>
+        <touch file="${build.dir}/prerelease/${prerelease.marker}"/>
+        <mkdir dir="${prerelease.dir}/build/prerelease"/>
+        <touch file="${prerelease.dir}/build/prerelease/${prerelease.marker}"/>
         
         <!-- Create a logs dir so the prerelease file can easily be tested. -->
-        <mkdir dir="${intermdir}/logs"/>
-        <touch file="${intermdir}/logs/wrapper.log"/>
+        <mkdir dir="${prerelease.dir}/logs"/>
+        <touch file="${prerelease.dir}/logs/wrapper.log"/>
         
         <!-- Make the intermediate build for Windows -->
         <!-- Set files to windows line feeds for .zip files -->
-        <fixcrlf srcdir="${intermdir}" eol="crlf" includes="**/*.java, **/*.properties, **/*.txt, **/*.xml, **/*.html, **/*.css, **/*.conf*, **/*.c.in, **/*.c, **/*.h, **/*.log"/>
+        <fixcrlf srcdir="${prerelease.dir}" eol="crlf" includes="**/*.java, **/*.properties, **/*.txt, **/*.xml, **/*.html, **/*.css, **/*.conf*, **/*.c.in, **/*.c, **/*.h, **/*.log"/>
 
         <!-- Copy the README's -->
-        <copy todir="${intermdir}" overwrite="true" encoding="UTF-8" outputencoding="UTF-8">
+        <copy todir="${prerelease.dir}" overwrite="true" encoding="UTF-8" outputencoding="UTF-8">
             <fileset dir="${basedir}" >
                 <include name="README_*.txt" />
             </fileset>
         </copy>
-        <fixcrlf srcdir="${intermdir}" encoding="UTF-8" outputencoding="UTF-8" includes="README_*.txt" eol="crlf"/>
+        <fixcrlf srcdir="${prerelease.dir}" encoding="UTF-8" outputencoding="UTF-8" includes="README_*.txt" eol="crlf"/>
         
         <!-- Create the pre-release package -->
-        <zip zipfile="${dist.dir}/${intermfile}.zip"
-            basedir="${build.dir}"
+        <zip zipfile="${dist.dir}/${prerelease.file}.zip"
+            basedir="${build.dir}/prerelease"
             compress="true">
-            <include name="${intermfile}/**/*" />
+            <include name="${prerelease.file}/**/*" />
         </zip>
         
         <!-- Make the intermediate build for Unix -->
-        <fixcrlf srcdir="${intermdir}" eol="lf" includes="**/*.java, **/*.properties, **/*.txt, **/*.xml, **/*.html, **/*.css, **/*.conf*, **/*.c.in, **/*.c, **/*.h, **/*.log"/>
+        <fixcrlf srcdir="${prerelease.dir}" eol="lf" includes="**/*.java, **/*.properties, **/*.txt, **/*.xml, **/*.html, **/*.css, **/*.conf*, **/*.c.in, **/*.c, **/*.h, **/*.log"/>
 
         <!-- Copy the README's again but this time convert the encoding in favour for unix (UTF-8) -->
-        <copy todir="${intermdir}" overwrite="true" encoding="UTF-8" outputencoding="UTF-8">
+        <copy todir="${prerelease.dir}" overwrite="true" encoding="UTF-8" outputencoding="UTF-8">
             <fileset dir="${basedir}" >
                 <include name="README_*.txt" />
             </fileset>
         </copy>
-        <fixcrlf srcdir="${intermdir}" encoding="UTF-8" outputencoding="UTF-8" includes="README_*.txt" eol="lf"/>
+        <fixcrlf srcdir="${prerelease.dir}" encoding="UTF-8" outputencoding="UTF-8" includes="README_*.txt" eol="lf"/>
         
         <!-- Create the pre-release package -->
-        <tar tarfile="${build.dir}/${intermfile}.tar">
-            <tarfileset dir="${build.dir}" mode="755">
-                <include name="${intermfile}/build32.sh"/>
-                <include name="${intermfile}/build64.sh"/>
+        <tar tarfile="${build.dir}/${prerelease.file}.tar">
+            <tarfileset dir="${build.dir}/prerelease" mode="755">
+                <include name="${prerelease.file}/build32.sh"/>
+                <include name="${prerelease.file}/build64.sh"/>
             </tarfileset>
-            <tarfileset dir="${build.dir}">
-                <include name="${intermfile}/**/*" />
-                <exclude name="${intermfile}/build32.sh"/>
-                <exclude name="${intermfile}/build64.sh"/>
+            <tarfileset dir="${build.dir}/prerelease">
+                <include name="${prerelease.file}/**/*" />
+                <exclude name="${prerelease.file}/build32.sh"/>
+                <exclude name="${prerelease.file}/build64.sh"/>
             </tarfileset>
         </tar>
-        <gzip zipfile="${dist.dir}/${intermfile}.tar.gz" src="${build.dir}/${intermfile}.tar" />
+        <gzip zipfile="${dist.dir}/${prerelease.file}.tar.gz" src="${build.dir}/${prerelease.file}.tar" />
         
         <echo/>
         <echo>**********************************************************</echo>
@@ -1366,16 +1368,16 @@
         <echo>* platform by running "build&lt;64/32&gt; release" now.        *</echo>
         <echo>*                                                        *</echo>
         <echo>* Intermediate pre-release distributions:                *</echo>
-        <echo>*   ${dist.dir}/${intermfile}.zip</echo>
-        <echo>*   ${dist.dir}/${intermfile}.tar.gz</echo>
+        <echo>*   ${dist.dir}/${prerelease.file}.zip</echo>
+        <echo>*   ${dist.dir}/${prerelease.file}.tar.gz</echo>
         <echo>**********************************************************</echo>
     </target>
     
     <target name="pre-release:check-init" depends="init:msg">
-        <property name="intermfile" value="wrapper_prerelease_${version}"/>
-        <property name="intermdir" value="${build.dir}/${intermfile}"/>
+        <property name="prerelease.file" value="wrapper_prerelease_${version}"/>
+        <property name="prerelease.dir" value="${build.dir}/prerelease/${prerelease.file}"/>
         
-        <available property="pre-release.exists" value="true" file="${build.dir}/${intermmarker}"/>
+        <available property="pre-release.exists" value="true" file="${build.dir}/prerelease/${prerelease.marker}"/>
     </target>
     <target name="pre-release:check" depends="pre-release:check-init" unless="pre-release.exists">
         <echo/>

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