Changes to make daily builds work again

git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@704 ba19aa83-45c5-6ac9-afd3-db810772062c

3 files changed, 41 insertions, 51 deletions

diff --git a/build.xml b/build.xml
index 69f286a..89d8510 100644
--- a/build.xml
+++ b/build.xml
@@ -151,36 +151,42 @@
 
   <target name="setupSolaris" if="isSolarisOnSparc">	
     <property name="wstype" value="x11"/>
+    <property name="platformname" value="solaris-sparc"/>
     <property name="platform" value="solaris-sparc-${build.comp}"/>
     <property name="install.bin" value="lib/sparc"/>
   </target>
 
   <target name="setupSolarisX86" if="isSolarisOnX86">
     <property name="wstype" value="x11"/>
+    <property name="platformname" value="solaris-x86"/>
     <property name="platform" value="solaris-x86-${build.comp}"/>
     <property name="install.bin" value="lib/i386"/>
   </target>
 
   <target name="setupLinux" if="isLinuxOnX86">	
     <property name="wstype" value="x11"/>
+    <property name="platformname" value="linux-i586"/>
     <property name="platform" value="linux-i586"/>
     <property name="install.bin" value="lib/i386"/>
   </target>
 
   <target name="setupLinuxAmd64" if="isLinuxOnAmd64">	
     <property name="wstype" value="x11"/>
+    <property name="platformname" value="linux-amd64"/>
     <property name="platform" value="linux-amd64"/>
     <property name="install.bin" value="lib/amd64"/>
   </target>
 
   <target name="setupLinuxIA64" if="isLinuxOnIA64">	
     <property name="wstype" value="x11"/>
+    <property name="platformname" value="linux-ia64"/>
     <property name="platform" value="linux-ia64"/>
     <property name="install.bin" value="lib/ia64"/>
   </target>
 
   <target name="setupLinuxPPC" if="isLinuxOnPPC">	
     <property name="wstype" value="x11"/>
+    <property name="platformname" value="linux-ppc"/>
     <property name="platform" value="linux-ppc"/>
     <property name="install.bin" value="lib/ppc"/>
   </target>
@@ -188,18 +194,21 @@
     <!-- win32 should be rename as windows -->
   <target name="setupWindows" if="isWindowsOnX86">	
     <property name="wstype" value="win32"/>
+    <property name="platformname" value="windows-i586"/>
     <property name="platform" value="windows-i586-${build.comp}"/>
     <property name="install.bin" value="bin"/>
   </target>
 
   <target name="setupWindowsAmd64" if="isWindowsOnAmd64">	
     <property name="wstype" value="win32"/>
+    <property name="platformname" value="windows-amd64"/>
     <property name="platform" value="windows-amd64-${build.comp}"/>
     <property name="install.bin" value="bin"/>
   </target>
 
   <target name="setupMacOSX" if="isMacOSX">	
     <property name="wstype" value="jogl"/>
+    <property name="platformname" value="macosx"/>
     <property name="platform" value="macosx"/>
     <!-- Exclude native pipeline from compilation as we don't have a NativeConfigTemplate3D, etc. for this platform -->
     <property name="javac.excludes" value="javax/media/j3d/NativeContext.java,javax/media/j3d/NativeDrawable.java,javax/media/j3d/NativePipeline.java,javax/media/j3d/NativeShaderObject.java"/>
@@ -240,6 +249,7 @@
   <target name="setupBuildPatch" if="buildType_patch">
     <property name="buildTypeSet" value="true"/>
 
+    <property name="releaseType_final" value="true"/>
     <property name="is_dev_phase" value="false"/>
     <property name="is_production" value="true"/>
     <property name="use_verbose_buildtime" value="false"/>
@@ -257,6 +267,7 @@
   <target name="setupBuildFcs" if="buildType_fcs">
     <property name="buildTypeSet" value="true"/>
 
+    <property name="releaseType_final" value="true"/>
     <property name="is_dev_phase" value="false"/>
     <property name="is_production" value="true"/>
     <property name="use_verbose_buildtime" value="false"/>
@@ -274,6 +285,7 @@
   <target name="setupBuildBeta" if="buildType_beta">
     <property name="buildTypeSet" value="true"/>
 
+    <property name="releaseType_milestone" value="true"/>
     <property name="is_dev_phase" value="false"/>
     <property name="is_production" value="true"/>
     <property name="use_verbose_buildtime" value="true"/>
@@ -291,6 +303,7 @@
   <target name="setupBuildStable" if="buildType_stable">
     <property name="buildTypeSet" value="true"/>
 
+    <property name="releaseType_milestone" value="true"/>
     <property name="is_dev_phase" value="true"/>
     <property name="is_production" value="false"/>
     <property name="use_verbose_buildtime" value="true"/>
@@ -308,6 +321,7 @@
   <target name="setupBuildDaily" if="buildType_daily">
     <property name="buildTypeSet" value="true"/>
 
+    <property name="releaseType_daily" value="true"/>
     <property name="is_dev_phase" value="true"/>
     <property name="is_production" value="false"/>
     <property name="use_verbose_buildtime" value="true"/>
@@ -462,50 +476,19 @@
 
   <target name="all" depends="jar-debug,dist,docs-jcp,docs-private"/>
 
-  <target name="rpm" description="Build rpm package" depends="dist">
-      <mkdir dir="${build}/${platform}/rpm"/>
-      <mkdir dir="${build}/${platform}/rpm/SPECS"/>
-      <mkdir dir="${build}/${platform}/rpm/SOURCES"/>
-      <mkdir dir="${build}/${platform}/rpm/BUILD"/>
-      <mkdir dir="${build}/${platform}/rpm/RPMS"/>
-
-      <copy file="build-tools/java3d-rpm.spec" 
-            todir="${build}/${platform}/rpm/SPECS"
-            overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${version}"/>
-              <filter token="VERSION_FILE" value="${version_file}"/>
-              <filter token="VERSION_RPM" value="${version_rpm}"/>
-          </filterset>
-      </copy>
-
-      <tar destfile="${build}/${platform}/rpm/SOURCES/java3d-${version_file}.tar.gz"
-           compression="gzip">
-          <tarfileset dir="${dist}/${platform}"
-                      includes="lib/**"
-          />
-          <tarfileset dir="release-info"
-                      includes="BINARY-CODE-LICENSE.txt"
-          />
-          <tarfileset dir="."
-                      includes="COPYRIGHT.txt README-FIRST.txt"
-          />
-      </tar>
-
-      <rpm specFile="java3d-rpm.spec"
-           topDir="${build}/${platform}/rpm"/>
+  <target name="release" description="Package distribution for release"
+	depends="dist,init-release,release-daily,release-milestone,release-final">
+  </target>
 
-      <copy
-        file="${build}/${platform}/rpm/RPMS/i586/java3d-${version_rpm}-1.i586.rpm"
-        tofile="dist/${platform}/java3d-${version_file}-1-i586.rpm"/>
+  <target name="init-release">
+      <property name="platformTmp" location="${dist}/${platform}/tmp"/>
+      <property name="release_name" value="java3d-${version_file}-${platformname}"/>
   </target>
-  
-  <target name="release" description="Package distribution for release" depends="dist">
-      <property name="staging" location="${dist}/${platform}/staging"/>
-      <property name="release_name" value="java3d-${version_file}-${platform}"/>
+
+  <target name="release-daily" if="releaseType_daily">
       <mkdir dir="${dist}/release"/>
-      <mkdir dir="${staging}/${release_name}"/>
-      <zip destfile="${staging}/${release_name}/j3d-jre-${version_file}-${platform}.zip">
+      <mkdir dir="${platformTmp}/${release_name}"/>
+      <zip destfile="${platformTmp}/${release_name}/j3d-jre.zip">
           <fileset dir="${dist}/${platform}"
               includes="lib/**"
           />
@@ -513,20 +496,27 @@
               includes="bin/**"
           />
       </zip>
-      <copy todir="${staging}/${release_name}">
+      <copy todir="${platformTmp}/${release_name}">
           <fileset dir="." includes="COPYRIGHT.txt"/>
-          <fileset dir="." includes="LICENSE*.txt"/>
           <fileset dir="release-info/pre-release"
-              includes="HOW-TO-INSTALL.txt  README.txt"
+              includes="LICENSE*.txt README.txt README-unzip.html"
           />
       </copy>
       <zip destfile="${dist}/release/java3d-${version_file}-${platform}.zip">
-          <fileset dir="${dist}/${platform}/staging"
+          <fileset dir="${platformTmp}"
               includes="${release_name}/**"
           />
       </zip>
   </target>
 
+  <target name="release-milestone" if="releaseType_milestone">
+      <fail message="release-milestone not yet implenented"/>
+  </target>
+
+  <target name="release-final" if="releaseType_final">
+      <fail message="release-final not yet implenented"/>
+  </target>
+
   <target name="clean-dist">
     <!-- Delete the ${dist} directory tree  -->
     <delete dir="${dist}"/>
diff --git a/release-info/pre-release/README-unzip.html b/release-info/pre-release/README-unzip.html
index b0614fd..289fba8 100644
--- a/release-info/pre-release/README-unzip.html
+++ b/release-info/pre-release/README-unzip.html
@@ -37,7 +37,7 @@ similar
 tool) into "c:\Temp". This will create a
 "java3d-1_5_0-XXX" subdirectory in \Temp where the
 downloaded files can be found. The file you need for manual
-installation is "j3d-150-XXX-.zip".<br>
+installation is "j3d-jre.zip".<br>
     <br>
   </li>
   <li>Unzip Java 3D 1.5.0 into your JRE as follows:<br>
@@ -48,7 +48,7 @@ installation is "j3d-150-XXX-.zip".<br>
 is:
 "c:\Program&nbsp;Files\Java\jre1.5.0_08"</li>
     <br>
-    <li>Unzip j3d-150-XXX.zip (found in
+    <li>Unzip j3d-jre.zip (found in
 c:\Temp\java3d-1_5_0-XXX)
 to the jre directory.</li>
     <br>
@@ -69,7 +69,7 @@ directory of your JDK as follows:</li>
 for the
 current release is: "c:\Program&nbsp;Files\Java\jdk1.5.0_08\jre"</li>
     <br>
-    <li>Unzip j3d-150-XXX.zip (found in
+    <li>Unzip j3d-jre.zip (found in
 c:\Temp\java3d-1_5_0-XXX)
 to the jre directory of the JDK.</li>
     <br>
@@ -102,7 +102,7 @@ for example, "/tmp"</li>
 This will create a
 "java3d-1_5_0-XXX" subdirectory in /tmp where the
 downloaded files can be found. The file you need for manual
-installation is "j3d-150-XXX.zip".<br>
+installation is "j3d-jre.zip".<br>
     <br>
   </li>
   <li>Unzip Java 3D 1.5.0 into the
@@ -112,7 +112,7 @@ directory of your JDK. For example, if your JDK is in
     <br>
     <ul>
       <code>cd /usr/java/jdk1.5.0_08/jre</code><br>
-      <code>unzip /tmp/java3d-1_5_0-*/j3d-150-*.zip</code><br>
+      <code>unzip /tmp/java3d-1_5_0-*/j3d-jre.zip</code><br>
     </ul>
     <br>
 Verify that the j3dcore.jar, j3dutils.jar, and vecmath.jar files end up
diff --git a/release-info/pre-release/README.txt b/release-info/pre-release/README.txt
index c0996af..4a9ed70 100644
--- a/release-info/pre-release/README.txt
+++ b/release-info/pre-release/README.txt
@@ -35,6 +35,6 @@ After downloading and unzipping the java3d-1_5_0-XXX.zip file into a temporary d
     LICENSE-JRL.txt            Software License Agreement
     README-unzip.html          Instructions for manually installing the release
     README.txt                 README file (you are reading it now)
-    j3d-150-XXX.zip            Zip file containing the files to be installed
+    j3d-jre.zip                Zip file containing the files to be installed
 
 To manually install Java 3D, open README-unzip.html in your browser and follow the instructions.