Updated build files to build pre-release self-extracting shell-archives for UNIX

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

15 files changed, 375 insertions, 18 deletions

diff --git a/build-tools/genzip b/build-tools/genzip
new file mode 100644
index 0000000..85b0832
--- /dev/null
+++ b/build-tools/genzip
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# usage: genzip <archive-name> <license-file> <file> [ <file> ... ]
+
+tmpscr1=script1.$$
+tmpscr2=script2.$$
+
+archive=$1
+shift
+license=$1
+shift
+
+echo "zip'ing..."
+
+zip -r $archive.zip $*
+
+cat ../unzipsfx $archive.zip > $archive
+
+echo "Checksumming..."
+
+sum=`/usr/bin/sum $archive`
+index=1
+for s in $sum
+do
+    case $index in
+    1)  sum1=$s;
+	index=2;
+	;;
+    2)  sum2=$s;
+	index=3;
+	;;
+    esac
+done
+echo sum = $sum1 $sum2
+
+cat ../script1.txt $license ../script2.txt > $tmpscr1
+
+linecount=`/usr/bin/wc -l < $tmpscr1`
+linecount=$(($linecount + 1))
+echo linecount = $linecount
+
+echo "Generating .bin script..."
+
+sed -e s/@LINECOUNT@/$linecount/ -e s/@SUM1@/$sum1/ -e s/@SUM2@/$sum2/ < $tmpscr1 > $tmpscr2
+cat $tmpscr2 $archive > ../$archive.bin
+chmod +x ../$archive.bin
+
+echo "Cleaning up..."
+rm -f $tmpscr1
+rm -f $tmpscr2
+rm -f $archive.zip
+rm -f $archive
+
+echo "Done"
diff --git a/build-tools/linux-amd64/script1.txt b/build-tools/linux-amd64/script1.txt
new file mode 100644
index 0000000..05d4088
--- /dev/null
+++ b/build-tools/linux-amd64/script1.txt
@@ -0,0 +1,4 @@
+#!/bin/sh
+PATH=/usr/bin:/bin
+more <<"EOF"
+
diff --git a/build-tools/linux-amd64/script2.txt b/build-tools/linux-amd64/script2.txt
new file mode 100644
index 0000000..2e6a0d2
--- /dev/null
+++ b/build-tools/linux-amd64/script2.txt
@@ -0,0 +1,56 @@
+
+EOF
+agreed=
+while [ x$agreed = x ]; do
+    echo
+    echo "Do you agree to the above license terms? [yes or no] "
+    read reply leftover
+    case $reply in
+        y* | Y*)
+            agreed=1;;
+        n* | n*)
+    echo "If you don't agree to the license you can't install this sofware";
+    exit 1;;
+    esac
+done
+if [ ! -w `pwd` ] ; then
+    echo "You do not have write permission to `pwd`"
+    echo "Java 3D installation failed"
+    exit 1
+fi
+outname=install.sfx.$$
+echo "Unpacking..."
+tail -n +@LINECOUNT@ $0 > $outname
+if [ -x /usr/bin/sum ] ; then
+    echo "Checksumming..."
+
+    sum=`/usr/bin/sum $outname`
+    index=1
+    for s in $sum
+    do
+        case $index in
+        1)  sum1=$s;
+            index=2;
+            ;;
+        2)  sum2=$s;
+            index=3;
+            ;;
+        esac
+    done
+    if expr $sum1 != @SUM1@ || expr $sum2 != @SUM2@  ; then
+        echo "The download file appears to be corrupted.  Please refer"
+        echo "to the Troubleshooting section of the Installation"
+        echo "Instructions on the download page for more information."
+        echo "Please do not attempt to install this archive file."
+        rm -f $outname
+        exit 1
+    fi
+else
+    echo "Can't find /usr/bin/sum to do checksum.  Continuing anyway."
+fi
+echo "Extracting..."
+chmod u+x $outname
+./$outname
+rm -f $outname
+echo "Done."
+exit 0
diff --git a/build-tools/linux-amd64/unzipsfx b/build-tools/linux-amd64/unzipsfx
new file mode 100755
index 0000000..12bfc5c
--- /dev/null
+++ b/build-tools/linux-amd64/unzipsfx
diff --git a/build-tools/linux-i586/script1.txt b/build-tools/linux-i586/script1.txt
new file mode 100644
index 0000000..05d4088
--- /dev/null
+++ b/build-tools/linux-i586/script1.txt
@@ -0,0 +1,4 @@
+#!/bin/sh
+PATH=/usr/bin:/bin
+more <<"EOF"
+
diff --git a/build-tools/linux-i586/script2.txt b/build-tools/linux-i586/script2.txt
new file mode 100644
index 0000000..2e6a0d2
--- /dev/null
+++ b/build-tools/linux-i586/script2.txt
@@ -0,0 +1,56 @@
+
+EOF
+agreed=
+while [ x$agreed = x ]; do
+    echo
+    echo "Do you agree to the above license terms? [yes or no] "
+    read reply leftover
+    case $reply in
+        y* | Y*)
+            agreed=1;;
+        n* | n*)
+    echo "If you don't agree to the license you can't install this sofware";
+    exit 1;;
+    esac
+done
+if [ ! -w `pwd` ] ; then
+    echo "You do not have write permission to `pwd`"
+    echo "Java 3D installation failed"
+    exit 1
+fi
+outname=install.sfx.$$
+echo "Unpacking..."
+tail -n +@LINECOUNT@ $0 > $outname
+if [ -x /usr/bin/sum ] ; then
+    echo "Checksumming..."
+
+    sum=`/usr/bin/sum $outname`
+    index=1
+    for s in $sum
+    do
+        case $index in
+        1)  sum1=$s;
+            index=2;
+            ;;
+        2)  sum2=$s;
+            index=3;
+            ;;
+        esac
+    done
+    if expr $sum1 != @SUM1@ || expr $sum2 != @SUM2@  ; then
+        echo "The download file appears to be corrupted.  Please refer"
+        echo "to the Troubleshooting section of the Installation"
+        echo "Instructions on the download page for more information."
+        echo "Please do not attempt to install this archive file."
+        rm -f $outname
+        exit 1
+    fi
+else
+    echo "Can't find /usr/bin/sum to do checksum.  Continuing anyway."
+fi
+echo "Extracting..."
+chmod u+x $outname
+./$outname
+rm -f $outname
+echo "Done."
+exit 0
diff --git a/build-tools/linux-i586/unzipsfx b/build-tools/linux-i586/unzipsfx
new file mode 100755
index 0000000..00c946c
--- /dev/null
+++ b/build-tools/linux-i586/unzipsfx
diff --git a/build-tools/solaris-sparc/script1.txt b/build-tools/solaris-sparc/script1.txt
new file mode 100644
index 0000000..05d4088
--- /dev/null
+++ b/build-tools/solaris-sparc/script1.txt
@@ -0,0 +1,4 @@
+#!/bin/sh
+PATH=/usr/bin:/bin
+more <<"EOF"
+
diff --git a/build-tools/solaris-sparc/script2.txt b/build-tools/solaris-sparc/script2.txt
new file mode 100644
index 0000000..6cd859c
--- /dev/null
+++ b/build-tools/solaris-sparc/script2.txt
@@ -0,0 +1,56 @@
+
+EOF
+agreed=
+while [ x$agreed = x ]; do
+    echo
+    echo "Do you agree to the above license terms? [yes or no] "
+    read reply leftover
+    case $reply in
+        y* | Y*)
+            agreed=1;;
+        n* | n*)
+    echo "If you don't agree to the license you can't install this sofware";
+    exit 1;;
+    esac
+done
+if [ ! -w `pwd` ] ; then
+    echo "You do not have write permission to `pwd`"
+    echo "Java 3D installation failed"
+    exit 1
+fi
+outname=install.sfx.$$
+echo "Unpacking..."
+tail +@LINECOUNT@ $0 > $outname
+if [ -x /usr/bin/sum ] ; then
+    echo "Checksumming..."
+
+    sum=`/usr/bin/sum $outname`
+    index=1
+    for s in $sum
+    do
+        case $index in
+        1)  sum1=$s;
+            index=2;
+            ;;
+        2)  sum2=$s;
+            index=3;
+            ;;
+        esac
+    done
+    if expr $sum1 != @SUM1@ || expr $sum2 != @SUM2@  ; then
+        echo "The download file appears to be corrupted.  Please refer"
+        echo "to the Troubleshooting section of the Installation"
+        echo "Instructions on the download page for more information."
+        echo "Please do not attempt to install this archive file."
+        rm -f $outname
+        exit 1
+    fi
+else
+    echo "Can't find /usr/bin/sum to do checksum.  Continuing anyway."
+fi
+echo "Extracting..."
+chmod u+x $outname
+./$outname
+rm -f $outname
+echo "Done."
+exit 0
diff --git a/build-tools/solaris-sparc/unzipsfx b/build-tools/solaris-sparc/unzipsfx
new file mode 100755
index 0000000..a27ffd5
--- /dev/null
+++ b/build-tools/solaris-sparc/unzipsfx
diff --git a/build-tools/solaris-x86/script1.txt b/build-tools/solaris-x86/script1.txt
new file mode 100644
index 0000000..05d4088
--- /dev/null
+++ b/build-tools/solaris-x86/script1.txt
@@ -0,0 +1,4 @@
+#!/bin/sh
+PATH=/usr/bin:/bin
+more <<"EOF"
+
diff --git a/build-tools/solaris-x86/script2.txt b/build-tools/solaris-x86/script2.txt
new file mode 100644
index 0000000..6cd859c
--- /dev/null
+++ b/build-tools/solaris-x86/script2.txt
@@ -0,0 +1,56 @@
+
+EOF
+agreed=
+while [ x$agreed = x ]; do
+    echo
+    echo "Do you agree to the above license terms? [yes or no] "
+    read reply leftover
+    case $reply in
+        y* | Y*)
+            agreed=1;;
+        n* | n*)
+    echo "If you don't agree to the license you can't install this sofware";
+    exit 1;;
+    esac
+done
+if [ ! -w `pwd` ] ; then
+    echo "You do not have write permission to `pwd`"
+    echo "Java 3D installation failed"
+    exit 1
+fi
+outname=install.sfx.$$
+echo "Unpacking..."
+tail +@LINECOUNT@ $0 > $outname
+if [ -x /usr/bin/sum ] ; then
+    echo "Checksumming..."
+
+    sum=`/usr/bin/sum $outname`
+    index=1
+    for s in $sum
+    do
+        case $index in
+        1)  sum1=$s;
+            index=2;
+            ;;
+        2)  sum2=$s;
+            index=3;
+            ;;
+        esac
+    done
+    if expr $sum1 != @SUM1@ || expr $sum2 != @SUM2@  ; then
+        echo "The download file appears to be corrupted.  Please refer"
+        echo "to the Troubleshooting section of the Installation"
+        echo "Instructions on the download page for more information."
+        echo "Please do not attempt to install this archive file."
+        rm -f $outname
+        exit 1
+    fi
+else
+    echo "Can't find /usr/bin/sum to do checksum.  Continuing anyway."
+fi
+echo "Extracting..."
+chmod u+x $outname
+./$outname
+rm -f $outname
+echo "Done."
+exit 0
diff --git a/build-tools/solaris-x86/unzipsfx b/build-tools/solaris-x86/unzipsfx
new file mode 100755
index 0000000..fdf918f
--- /dev/null
+++ b/build-tools/solaris-x86/unzipsfx
diff --git a/build.xml b/build.xml
index 612dd02..8b3199e 100644
--- a/build.xml
+++ b/build.xml
@@ -57,7 +57,7 @@
   * The following property specifies the beta revision of the current
   * Java 3D version being built. It is ignored for non-beta builds.
   -->
-  <property name="version_betastr"    value="beta1"/>
+  <property name="version_betastr"    value="beta2"/>
 
   <!--
   * The following property specifies the patch revision of the current
@@ -149,7 +149,9 @@
     <echo message="version_rpm     = ${version_rpm}"/>
   </target>
 
-  <target name="setupSolaris" if="isSolarisOnSparc">	
+  <target name="setupSolaris" if="isSolarisOnSparc">
+    <property name="isUnix" value="true"/>
+    <property name="shell" value="/usr/bin/ksh"/>
     <property name="wstype" value="x11"/>
     <property name="platformname" value="solaris-sparc"/>
     <property name="platform" value="solaris-sparc-${build.comp}"/>
@@ -157,6 +159,8 @@
   </target>
 
   <target name="setupSolarisX86" if="isSolarisOnX86">
+    <property name="isUnix" value="true"/>
+    <property name="shell" value="/usr/bin/ksh"/>
     <property name="wstype" value="x11"/>
     <property name="platformname" value="solaris-x86"/>
     <property name="platform" value="solaris-x86-${build.comp}"/>
@@ -164,27 +168,35 @@
   </target>
 
   <target name="setupLinux" if="isLinuxOnX86">	
+    <property name="isUnix" value="true"/>
+    <property name="shell" value="/bin/sh"/>
     <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">	
+  <target name="setupLinuxAmd64" if="isLinuxOnAmd64">
+    <property name="isUnix" value="true"/>
+    <property name="shell" value="/bin/sh"/>
     <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">	
+  <target name="setupLinuxIA64" if="isLinuxOnIA64">
+    <property name="isUnix" value="true"/>
+    <property name="shell" value="/bin/sh"/>
     <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">	
+  <target name="setupLinuxPPC" if="isLinuxOnPPC">
+    <property name="isUnix" value="true"/>
+    <property name="shell" value="/bin/sh"/>
     <property name="wstype" value="x11"/>
     <property name="platformname" value="linux-ppc"/>
     <property name="platform" value="linux-ppc"/>
@@ -192,21 +204,23 @@
   </target>
 
     <!-- win32 should be rename as windows -->
-  <target name="setupWindows" if="isWindowsOnX86">	
+  <target name="setupWindows" if="isWindowsOnX86">
+    <property name="isWindows" value="true"/>
     <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">	
+  <target name="setupWindowsAmd64" if="isWindowsOnAmd64">
+    <property name="isWindows" value="true"/>
     <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">	
+  <target name="setupMacOSX" if="isMacOSX">
     <property name="wstype" value="jogl"/>
     <property name="platformname" value="macosx"/>
     <property name="platform" value="macosx"/>
@@ -286,6 +300,7 @@
     <property name="buildTypeSet" value="true"/>
 
     <property name="releaseType_milestone" value="true"/>
+    <property name="releaseType_dailyOrMilestone" value="true"/>
     <property name="is_dev_phase" value="false"/>
     <property name="is_production" value="true"/>
     <property name="use_verbose_buildtime" value="true"/>
@@ -304,6 +319,7 @@
     <property name="buildTypeSet" value="true"/>
 
     <property name="releaseType_milestone" value="true"/>
+    <property name="releaseType_dailyOrMilestone" value="true"/>
     <property name="is_dev_phase" value="true"/>
     <property name="is_production" value="false"/>
     <property name="use_verbose_buildtime" value="true"/>
@@ -322,6 +338,7 @@
     <property name="buildTypeSet" value="true"/>
 
     <property name="releaseType_daily" value="true"/>
+    <property name="releaseType_dailyOrMilestone" value="true"/>
     <property name="is_dev_phase" value="true"/>
     <property name="is_production" value="false"/>
     <property name="use_verbose_buildtime" value="true"/>
@@ -481,14 +498,19 @@
   </target>
 
   <target name="init-release">
-      <property name="platformTmp" location="${dist}/${platform}/tmp"/>
+      <property name="platformTmpBund" location="${dist}/${platform}/tmp/bund"/>
+      <property name="platformTmpInst" location="${dist}/${platform}/tmp/inst"/>
       <property name="release_name" value="java3d-${version_file}-${platformname}"/>
+      <mkdir dir="${dist}/release"/>
   </target>
 
-  <target name="release-daily" if="releaseType_daily">
-      <mkdir dir="${dist}/release"/>
-      <mkdir dir="${platformTmp}/${release_name}"/>
-      <zip destfile="${platformTmp}/${release_name}/j3d-jre.zip">
+  <target name="release-daily" depends="init-release,release-zip-bund-pre" if="releaseType_daily">
+  </target>
+  
+  <target name="release-zip-bund-pre" if="releaseType_dailyOrMilestone">
+      <mkdir dir="${platformTmpBund}/${release_name}"/>
+
+      <zip destfile="${platformTmpBund}/${release_name}/j3d-jre.zip">
           <fileset dir="${dist}/${platform}"
               includes="lib/**"
           />
@@ -496,24 +518,64 @@
               includes="bin/**"
           />
       </zip>
-      <copy todir="${platformTmp}/${release_name}">
+      <copy todir="${platformTmpBund}/${release_name}">
           <fileset dir="." includes="COPYRIGHT.txt"/>
           <fileset dir="release-info/pre-release"
               includes="LICENSE*.txt README.txt README-unzip.html"
           />
       </copy>
       <zip destfile="${dist}/release/${release_name}.zip">
-          <fileset dir="${platformTmp}"
+          <fileset dir="${platformTmpBund}"
               includes="${release_name}/**"
           />
       </zip>
   </target>
 
-  <target name="release-milestone" if="releaseType_milestone">
-      <fail message="release-milestone not yet implenented"/>
+  <target name="release-milestone" depends="init-release,release-zip-bund-pre,release-zip-inst-pre" if="releaseType_milestone">
+  </target>
+
+  <target name="release-zip-inst-pre" if="releaseType_milestone">
+      <antcall target="release-zip-inst-pre-unix"/>
+      <antcall target="release-zip-inst-pre-windows"/>
+  </target>
+
+  <target name="release-zip-inst-pre-unix" if="isUnix">
+    <mkdir dir="${platformTmpInst}/${release_name}"/>
+
+    <copy todir="${platformTmpInst}/${release_name}">
+      <fileset dir="${dist}/${platform}"
+          includes="lib/**"/>
+      <fileset dir="${dist}/${platform}"
+          includes="bin/**"/>
+    </copy>
+
+    <copy tofile="${platformTmpInst}/${release_name}/LICENSE.txt">
+      <fileset dir="release-info/pre-release"
+        includes="LICENSE*.txt"/>
+    </copy>
+
+    <chmod dir="${platformTmpInst}/${release_name}" perm="755"
+       includes="**/*.so"/>
+
+    <copy todir="${platformTmpInst}">
+        <fileset dir="${build-tools}/${platformname}"
+            includes="script*.txt, unzipsfx"/>
+    </copy>
+
+    <exec dir="${platformTmpInst}/${release_name}" executable="${shell}">
+      <arg line="${build-tools}/genzip ${release_name} LICENSE.txt lib"/>
+    </exec>
+
+    <copy file="${platformTmpInst}/${release_name}.bin" todir="${dist}/release"/>
+
+    <chmod file="${dist}/release/${release_name}.bin" perm="755"/>
+  </target>
+
+  <target name="release-zip-inst-pre-windows" if="isWindows">
+      <echo message="EXECUTE: release-zip-inst-pre-windows"/>
   </target>
 
-  <target name="release-final" if="releaseType_final">
+  <target name="release-final" depends="init-release" if="releaseType_final">
       <fail message="release-final not yet implenented"/>
   </target>
 
diff --git a/src/native/build.xml b/src/native/build.xml
index de87ff4..b458a28 100644
--- a/src/native/build.xml
+++ b/src/native/build.xml
@@ -398,6 +398,7 @@
 
   <target name="dist">
 	   <ant antfile="build-${platform}.xml" dir="${build.rend}" target="dist"/>
+           <chmod dir="${dist}/${platform}" perm="755" includes="**/*.dll, **/*.so"/>
   </target>
 
 </project>