harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r423639 - in /incubator/harmony/enhanced/drlvm/trunk/build: ./ make/ make/components/ make/components/extra/ make/components/vm/ make/targets/
Date Wed, 19 Jul 2006 22:23:49 GMT
Author: geirm
Date: Wed Jul 19 15:23:48 2006
New Revision: 423639

URL: http://svn.apache.org/viewvc?rev=423639&view=rev
Log:
Lets call it Java :)

Added:
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml
      - copied, changed from r421882, incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/ij_script.xml
Removed:
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/ij_script.xml
Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/build.bat
    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.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/eclipse_script.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmstart.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml

Modified: incubator/harmony/enhanced/drlvm/trunk/build/build.bat
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/build.bat?rev=423639&r1=423638&r2=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/build.bat (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/build.bat Wed Jul 19 15:23:48 2006
@@ -96,9 +96,9 @@
 REM ================================================
 
 IF NOT EXIST "%JAVA_HOME%\bin\java.exe" (
-    IF NOT EXIST "%JAVA_HOME%\bin\ij.exe" (
-        ECHO * Neigher "%JAVA_HOME%\bin\java.exe" nor "%JAVA_HOME%\bin\ij.exe" found.
-        ECHO * Make sure you have Harmony JRE or DRLVM installed on your computer and that

+    IF NOT EXIST "%JAVA_HOME%\bin\java.exe" (
+        ECHO * Neigher "%JAVA_HOME%\bin\java.exe" nor "%JAVA_HOME%\bin\java.exe" found.
+        ECHO * Make sure you have Harmony JRE or DRLVM installed on your computer and that
         ECHO * JAVA_HOME environment variable points out to its installation dir, e.g.
         ECHO * SET JAVA_HOME=c:\jre
         GOTO ERROR
@@ -109,7 +109,7 @@
     ECHO * File %ANT_HOME%\bin\ant.bat not found.
     ECHO * Make sure you have Ant 1.6.5 or above installed from
     ECHO * http://ant.apache.org/bindownload.cgi and the ANT_HOME environment
-    ECHO * variable points to the Ant installation dir, e.g. 
+    ECHO * variable points to the Ant installation dir, e.g.
     ECHO * SET ANT_HOME=c:\ant_1.6.5
     GOTO ERROR
 )
@@ -130,12 +130,7 @@
 SET CLASSPATH=%CD%\make\tmp\cpptasks\patched.classes;%CLASSPATH%
 SET CLASSPATH=.\make\tmp\ant-contrib.jar;%CLASSPATH%
 
-REM Ant launcher doesn't know about ij.exe
-IF EXIST "%JAVA_HOME%\bin\ij.exe" (
-    SET ANT_COMMAND=%JAVA_HOME%\bin\ij.exe -Duser.timezone=en_US -classpath %ANT_HOME%\lib\ant-launcher.jar
-Dant.home=%ANT_HOME% org.apache.tools.ant.launch.Launcher -cp %CLASSPATH% -Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
-) ELSE (
-    SET ANT_COMMAND=%ANT_HOME%\bin\ant.bat
-)
+SET ANT_COMMAND=%ANT_HOME%\bin\ant.bat
 
 REM  Note: vm.jitrino is always complied in release mode, otherwise it makes VM debug too
slow
 CALL "%ANT_COMMAND%" -f make/build.xml -Dvm.jitrino.cfg=release %*

Modified: incubator/harmony/enhanced/drlvm/trunk/build/build.sh
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/build.sh?rev=423639&r1=423638&r2=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/build.sh (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/build.sh Wed Jul 19 15:23:48 2006
@@ -39,9 +39,6 @@
 # Set default environment variables
 # ================================================
 
-if [ -z "$JAVA_HOME" ]; then
-    JAVA_HOME=/usr/local/jrockit-j2sdk1.4.2_04
-fi
 
 # Apache Ant 1.6.2 or higher (can be obtained at http://ant.apache.org)
 if [ -z "$ANT_HOME" ]; then
@@ -53,13 +50,7 @@
 # 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."
-    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"
-    ERROR
-elif [ ! -x $ANT_HOME/bin/ant ]; then
+if [ ! -x $ANT_HOME/bin/ant ]; then
     echo "* File $ANT_HOME/bin/ant not found."
     echo "* Make sure you have Ant 1.6.5 or above installed from"
     echo "* http://ant.apache.org/bindownload.cgi and that ANT_HOME environment"
@@ -68,7 +59,6 @@
     ERROR
 fi
 
-export JAVA_HOME=`(cd $JAVA_HOME;pwd)`
 export ANT_HOME=`(cd $ANT_HOME;pwd)`
 export CXX
 export BUILD_CFG
@@ -81,11 +71,7 @@
 CLASSPATH=`pwd`/make/tmp/ant-contrib.jar:$CLASSPATH
 export CLASSPATH
 
-if [ -x $JAVA_HOME/bin/ij ]; then
-    ANT_COMMAND="$JAVA_HOME/bin/ij  -Duser.timezone=en_US -classpath $ANT_HOME/lib/ant-launcher.jar
-Dant.home=$ANT_HOME org.apache.tools.ant.launch.Launcher -cp $CLASSPATH "
-else
-    ANT_COMMAND="$ANT_HOME/bin/ant --noconfig"
-fi
+ANT_COMMAND="$ANT_HOME/bin/ant --noconfig"
 
 # it is necessarily to compile 'vm.jitrino' in release mode
 

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=423639&r1=423638&r2=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml Wed Jul 19 15:23:48 2006
@@ -413,8 +413,8 @@
             <then>
                 <chmod perm="755">
                     <fileset dir="${build.deploy.dir}/bin">
-                        <include name="ij" />
-                        <include name="ij.sh" />
+                        <include name="java" />
+                        <include name="java.sh" />
                         <include name="eclipse.sh" />
                         <include name="*.so" />
                         <include name="*.so.*" />
@@ -494,10 +494,10 @@
             <isset property="if.win"/>
             <then>
 <echo file="${build.deploy.dir}/readme.txt" append="true">
-Use generic Java* conventions for launching ij.exe
+Use generic Java* conventions for launching java.exe
 
     c:\drlvm&gt;cd bin
-    c:\drlvm\bin&gt;ij -classpath . Hello
+    c:\drlvm\bin&gt;java -classpath . Hello
 </echo>
             </then>
             <else>
@@ -506,21 +506,21 @@
 		<then>
 		<!-- ${CXX} == icc -->
 <echo file="${build.deploy.dir}/readme.txt" append="true">
-Use generic Java* conventions for launching ij
+Use generic Java* conventions for launching java
 
     $ cd bin
     $ LD_LIBRARY_PATH=${PWD}:&lt;Path to ICC libs&gt;:${LD_LIBRARY_PATH}; export
LD_LIBRARY_PATH
-    $ ./ij -classpath . Hello
+    $ ./java -classpath . Hello
 </echo>
 		</then>
 		<else>
 		<!-- ${CXX} != icc -->
 <echo file="${build.deploy.dir}/readme.txt" append="true">
-Use generic Java* conventions for launching ij
+Use generic Java* conventions for launching java
 
     $ cd bin
     $ LD_LIBRARY_PATH=${PWD}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH
-    $ ./ij -classpath . Hello
+    $ ./java -classpath . Hello
 </echo>
 		</else>
 	      </if>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml?rev=423639&r1=423638&r2=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml Wed Jul 19 15:23:48
2006
@@ -33,7 +33,7 @@
                                               extra.eclipse_script,
                                               extra.hello,
                                               extra.hyplugin,
-                                              extra.ij_script,
+                                              extra.java_script,
                                               extra.jre_libraries,
                                               extra.log4cxx,
                                               extra.zlib" />

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/eclipse_script.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/eclipse_script.xml?rev=423639&r1=423638&r2=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/eclipse_script.xml
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/eclipse_script.xml
Wed Jul 19 15:23:48 2006
@@ -37,10 +37,10 @@
             <echo file="${build.dir}/_other/eclipse.bat" append="true">
 <![CDATA[
 if exist "%ECLIPSE_HOME%/plugins/org.eclipse.jdt.core_3.1.1.jar" (
-   rem Copying IJ Launching Plugin to Eclipse directory
+   rem Copying Java Launching Plugin to Eclipse directory
    del /S /Q "%ECLIPSE_HOME%\plugins\org.apache.harmony.eclipse.jdt.launching_1.0.0.*.*"
    copy "%BUILD_HOME%\lib\org.apache.harmony.eclipse.jdt.launching_1.0.0.jar" "%ECLIPSE_HOME%\plugins"
-    "%BUILD_HOME%\bin\ij.exe" -cp "%ECLIPSE_HOME%\startup.jar" -Dosgi.install.area="%ECLIPSE_HOME%"
org.eclipse.core.launcher.Main -debug
+    "%BUILD_HOME%\bin\java.exe" -cp "%ECLIPSE_HOME%\startup.jar" -Dosgi.install.area="%ECLIPSE_HOME%"
org.eclipse.core.launcher.Main -debug
 ) else (
     echo ===================================================================
     echo Please install Eclipse 3.1.1 or reset ECLIPSE_HOME correspondingly.
@@ -56,12 +56,12 @@
 <![CDATA[
 #! /bin/sh
 
-IJ_DIR=`dirname $0`
-case $IJ_DIR in
+JAVA_DIR=`dirname $0`
+case $JAVA_DIR in
    /*) ;;
-   *) IJ_DIR=$PWD/$IJ_DIR;;
+   *) JAVA_DIR=$PWD/$JAVA_DIR;;
 esac
-export LD_LIBRARY_PATH=$IJ_DIR:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$JAVA_DIR:$LD_LIBRARY_PATH
 if [ ! -f "${ECLIPSE_HOME}/plugins/org.eclipse.jdt.core_3.1.1.jar" ]; then
     echo "==================================================================="
     echo "Please install Eclipse 3.1.1 or reset ECLIPSE_HOME correspondingly."
@@ -69,8 +69,8 @@
     exit 1
 fi
 rm -rf ${ECLIPSE_HOME}/plugins/org.apache.harmony.eclipse.jdt.launching_1.0.0*
-cp -R ${IJ_DIR}/../lib/org.apache.harmony.eclipse.jdt.launching_1.0.0.jar ${ECLIPSE_HOME}/plugins/
-${IJ_DIR}/ij -Xmx512m -Xms512m -Xjit -Dosgi.install.area=${ECLIPSE_HOME} -classpath ${ECLIPSE_HOME}/startup.jar
org.eclipse.core.launcher.Main  -debug
+cp -R ${JAVA_DIR}/../lib/org.apache.harmony.eclipse.jdt.launching_1.0.0.jar ${ECLIPSE_HOME}/plugins/
+${JAVA_DIR}/java -Xmx512m -Xms512m -Xjit -Dosgi.install.area=${ECLIPSE_HOME} -classpath ${ECLIPSE_HOME}/startup.jar
org.eclipse.core.launcher.Main  -debug
 
 ]]>
 </echo>

Copied: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml
(from r421882, incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/ij_script.xml)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml?p2=incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml&p1=incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/ij_script.xml&r1=421882&r2=423639&rev=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/ij_script.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml Wed
Jul 19 15:23:48 2006
@@ -19,31 +19,31 @@
 Version: $Revision: 1.1.2.6 $
 -->
 <!--
-    This is build descriptor for the component "extra.ij_script".
+    This is build descriptor for the component "extra.java_script".
 
     Please refer to make/components/README.txt for details about the component
     build descriptor structure.
   -->
 
-<project name="extra.ij_script">
+<project name="extra.java_script">
     <target name="init" >
         <mkdir dir="${build.dir}/_other" />
         <select os="win">
-            <echo file="${build.dir}/_other/ij.bat">
+            <echo file="${build.dir}/_other/java.bat">
 <![CDATA[
-.\ij.exe %*
+.\java.exe %*
 ]]>
 </echo>
         </select>
 
         <select os="lnx">
-            <echo file="${build.dir}/_other/ij.sh">
+            <echo file="${build.dir}/_other/java.sh">
 #!/bin/sh
 
-IJ_DIR=`dirname $0`
-LD_LIBRARY_PATH=$IJ_DIR:$LD_LIBRARY_PATH
+JAVA_DIR=`dirname $0`
+LD_LIBRARY_PATH=$JAVA_DIR:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-$IJ_DIR/ij  "$@"
+$JAVA_DIR/java  "$@"
 </echo>
         </select>
     </target>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmstart.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmstart.xml?rev=423639&r1=423638&r2=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmstart.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmstart.xml Wed Jul 19
15:23:48 2006
@@ -35,7 +35,7 @@
                                               extra.aprutil,
                                               extra.log4cxx" />
         <property name="outtype" value="executable" />
-        <property name="libname" value="ij" />
+        <property name="libname" value="java" />
         <property name="src" location="${build.vm.home}/launcher/src" />
 
         <compiler id="cpp.compiler" extends="common.cpp.compiler">

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml?rev=423639&r1=423638&r2=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml Wed Jul 19 15:23:48 2006
@@ -25,7 +25,7 @@
 <deploy>
     <vm>
         <vmstart>
-            <executable>bin:ij</executable>
+            <executable>bin:java</executable>
         </vmstart>
 
         <encoder>
@@ -92,15 +92,15 @@
         </hyplugin>
 
 
-        <ij_script>
+        <java_script>
             <select os="win">
-                <other>bin:ij.bat</other>
+                <other>bin:java.bat</other>
             </select>
 
             <select os="lnx">
-                <other>bin:ij.sh</other>
+                <other>bin:java.sh</other>
             </select>
-        </ij_script>
+        </java_script>
 
         <hello>
             <other>bin:Hello.class</other>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?rev=423639&r1=423638&r2=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Wed Jul 19 15:23:48
2006
@@ -136,7 +136,7 @@
                                 <equals arg1="${int.or.jit.arg}" arg2="" />
                             </not>
                             <then>
-                                <java newenvironment="yes" output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out"
classname="${class.name}" fork="true" jvm="${build.deploy.dir}/bin/ij${executable.postfix}"
error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
+                                <java newenvironment="yes" output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out"
classname="${class.name}" fork="true" jvm="${build.deploy.dir}/bin/java${executable.postfix}"
error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
                                     <jvmarg value="-Dvm.assert_dialog=0" />
                                     <jvmarg value="${int.or.jit.arg}" />
                                     <jvmarg value="-classpath" />
@@ -145,7 +145,7 @@
                                 </java>
                             </then>
                             <else>
-                                <java newenvironment="yes" output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out"
classname="${class.name}" fork="true" jvm="${build.deploy.dir}/bin/ij${executable.postfix}"
error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
+                                <java newenvironment="yes" output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out"
classname="${class.name}" fork="true" jvm="${build.deploy.dir}/bin/java${executable.postfix}"
error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
                                     <jvmarg value="-Dvm.assert_dialog=0" />
                                     <jvmarg value="-classpath" />
                                     <jvmarg value="${build.dir}/_smoke.tests/classes"
/>
@@ -167,7 +167,7 @@
                                 <condition property="java.executable" value="${env.JAVA_HOME}/bin/java${executable.postfix}">
                                     <available file="${env.JAVA_HOME}/bin/java${executable.postfix}"
/>
                                 </condition>
-                                <property name="java.executable" value="${env.JAVA_HOME}/bin/ij${executable.postfix}"
/>
+                                <property name="java.executable" value="${env.JAVA_HOME}/bin/java${executable.postfix}"
/>
 
                                 <java output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.golden"
classname="${class.name}" fork="true" jvm="${java.executable}" error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.golden.err">
                                     <jvmarg value="-classpath" />

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml?rev=423639&r1=423638&r2=423639&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml Wed Jul 19 15:23:48
2006
@@ -36,7 +36,7 @@
                 </javac>
                 <mkdir dir="${build.dir}/_unit.tests/report" />
                 <junit printsummary="true" haltonfailure="no"
-                       fork="yes" forkmode="once" jvm="${build.deploy.dir}/bin/ij.exe" failureproperty="some.unit.test.is.failed">
+                       fork="yes" forkmode="once" jvm="${build.deploy.dir}/bin/java.exe"
failureproperty="some.unit.test.is.failed">
                     <jvmarg value="-Xbootclasspath/p:${build.dir}/_unit.tests/classes;${build.junit.jar}"
/>
                     <formatter type="plain" usefile="true" />
                     <batchtest todir="${build.dir}/_unit.tests/report">



Mime
View raw message