harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r423782 - in /incubator/harmony/enhanced/drlvm/trunk/build: build.sh make/build.xml make/components/extra/java_script.xml
Date Thu, 20 Jul 2006 05:42:33 GMT
Author: geirm
Date: Wed Jul 19 22:42:33 2006
New Revision: 423782

URL: http://svn.apache.org/viewvc?rev=423782&view=rev
Log:
small tweaks : 

1) make it so that the shell script is called "java"
   which invokes the executable "java.exec".  A 
   hack, but works until we sort out the library issue.

2) create a 'canonical' deploy directory in build/deploy
   so that no matter what platform, compiler, or debug/release
   (all of which become part of the path to the 
    vm), we have a known, standard place to fish out the
    jre.  This will be useful in building snapshots
    via federation.


Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/build.sh
    incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml

Modified: incubator/harmony/enhanced/drlvm/trunk/build/build.sh
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/build.sh?rev=423782&r1=423781&r2=423782&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/build.sh (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/build.sh Wed Jul 19 22:42:33 2006
@@ -50,11 +50,10 @@
 # Check external resources / software installation
 # ================================================
 
-if [ ! -x $JAVA_HOME/bin/java ] && [ ! -x $JAVA_HOME/bin/ij ]; then
-    echo "* Neigher $JAVA_HOME/bin/java nor $JAVA_HOME/bin/ij found."
+if [ ! -x $JAVA_HOME/bin/java ] ; then
+    echo "* Neither $JAVA_HOME/bin/java not found."
     echo "* Make sure you have J2SDK or DRLVM installed on your computer and that"
-    echo "* JAVA_HOME environment variable points out to its installation dir, e.g."
-    echo "* export JAVA_HOME=/usr/local/jdk_1.4.2"
+    echo "* JAVA_HOME environment variable points out to its installation dir"
     ERROR
 elif [ ! -x $ANT_HOME/bin/ant ]; then
     echo "* File $ANT_HOME/bin/ant not found."

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=423782&r1=423781&r2=423782&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml Wed Jul 19 22:42:33 2006
@@ -217,6 +217,8 @@
         <!-- product binary deploy location -->
         <property name="build.deploy.dir" location="../${build.os.short}_${build.arch}_${build.cxx}_${build.cfg}/deploy/jre"
/>
 
+        <property name="canonical.deploy.dir" location="../deploy" />
+
         <!-- product doc deploy location -->
         <property name="build.deploy.doc.dir" location="../${build.os.short}_${build.arch}_${build.cxx}_${build.cfg}/docs"
/>
     </target>
@@ -313,7 +315,9 @@
     </target>
 
     <!-- Main target for building components -->
-    <target name="build" depends="setup, init, set.target.to.build, process.components,
fill.up.deploy" />
+    <target name="build" depends="setup, init, set.target.to.build,
+                                    process.components, fill.up.deploy,
+                                    deploy.canonical" />
 
     <target name="set.target.to.build">
         <property name="target" value="build" />
@@ -404,7 +408,8 @@
     <target name="fill.up.deploy" depends="deploy.jni.n.jvmti.includes,
                                            deploy.readme,
                                            deploy.getting_started,
-                                           deploy.copy_classlib">
+                                           deploy.copy_classlib,
+                                           deploy.tweakname">
         <if>
             <and>
                 <isset property="if.lnx" />
@@ -413,8 +418,53 @@
             <then>
                 <chmod perm="755">
                     <fileset dir="${build.deploy.dir}/bin">
+                        <include name="java.exec" />
+                        <include name="java" />
+                        <include name="eclipse.sh" />
+                        <include name="*.so" />
+                        <include name="*.so.*" />
+                    </fileset>
+                </chmod>
+            </then>
+        </if>
+    </target>
+
+    <!-- tweak the names of java -> java.exec and
+         java.sh -> java so typing "java" works -->
+    <target name="deploy.tweakname">
+
+        <if>
+            <isset property="if.lnx"/>
+            <then>
+                <move file="${build.deploy.dir}/bin/java"
+                    tofile="${build.deploy.dir}/bin/java.exec" />
+                <move file="${build.deploy.dir}/bin/java.sh"
+                    tofile="${build.deploy.dir}/bin/java" />
+            </then>
+        </if>
+
+    </target>
+
+    <!-- place things into canonical 'deploy' directory
+    so irrespective of the platform, compiler or release/debug
+    there's a predicable place to find the output -->
+
+    <target name="deploy.canonical">
+        <delete dir="${canonical.deploy.dir}" />
+
+        <mkdir dir="${canonical.deploy.dir}" />
+
+        <copy todir="${canonical.deploy.dir}/jre">
+            <fileset dir="${build.deploy.dir}"/>
+        </copy>
+
+        <if>
+            <isset property="if.lnx"/>
+            <then>
+                <chmod perm="755">
+                    <fileset dir="${canonical.deploy.dir}/jre/bin">
+                        <include name="java.exec" />
                         <include name="java" />
-                        <include name="java.sh" />
                         <include name="eclipse.sh" />
                         <include name="*.so" />
                         <include name="*.so.*" />

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml?rev=423782&r1=423781&r2=423782&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml Wed
Jul 19 22:42:33 2006
@@ -43,7 +43,7 @@
 JAVA_DIR=`dirname $0`
 LD_LIBRARY_PATH=$JAVA_DIR:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-$JAVA_DIR/java  "$@"
+$JAVA_DIR/java.exec "$@"
 </echo>
         </select>
     </target>



Mime
View raw message