Fixed the structure for the daily builds

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

2 files changed, 18 insertions, 9 deletions

diff --git a/build.xml b/build.xml
index 029ed5a..d7d94ab 100644
--- a/build.xml
+++ b/build.xml
@@ -412,19 +412,28 @@
   </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}"/>
       <mkdir dir="${dist}/release"/>
-      <zip destfile="${dist}/release/java3d-${version_file}-${platform}.zip">
+      <mkdir dir="${staging}/${release_name}"/>
+      <zip destfile="${staging}/${release_name}/j3d-jre-${version_file}-${platform}.zip">
           <fileset dir="${dist}/${platform}"
-                      includes="lib/**"
+              includes="lib/**"
           />
           <fileset dir="${dist}/${platform}"
-                      includes="bin/**"
+              includes="bin/**"
           />
-          <fileset dir="release-info"
-                      includes="BINARY-CODE-LICENSE.txt"
+      </zip>
+      <copy todir="${staging}/${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"
           />
-          <fileset dir="."
-                      includes="COPYRIGHT.txt README-FIRST.txt"
+      </copy>
+      <zip destfile="${dist}/release/java3d-${version_file}-${platform}.zip">
+          <fileset dir="${dist}/${platform}/staging"
+              includes="${release_name}/**"
           />
       </zip>
   </target>
diff --git a/release-info/pre-release/HOW-TO-INSTALL.txt b/release-info/pre-release/HOW-TO-INSTALL.txt
index c18b2f9..aa91ff0 100644
--- a/release-info/pre-release/HOW-TO-INSTALL.txt
+++ b/release-info/pre-release/HOW-TO-INSTALL.txt
@@ -1,9 +1,9 @@
 This interrim build runs on JDK version 1.4.2 and higher.
 To install this build, chdir to the "jre" directory within the jdk
-and unjar (or unzip) the jar file.  For example, if your JDK is installed
+and unzip (or unjar) the zip file.  For example, if your JDK is installed
 in /usr/java/j2sdk1.5.0, you would install this as follows:
 
 	cd /usr/java/j2sdk1.5.0/jre
-	jar xvf /path-to-downloaded-jar-file.jar
+	unzip /path-to-extracted-files/j3d-jre-*.zip
 
 You may need to be "root" to do this on Solaris or Linux.