harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r441745 - in /incubator/harmony/enhanced/drlvm/trunk: build/make/ build/make/components/ build/make/components/vm/ vm/launcher/src/ vm/vmcore/src/init/
Date Sat, 09 Sep 2006 05:14:19 GMT
Author: geirm
Date: Fri Sep  8 22:14:18 2006
New Revision: 441745

URL: http://svn.apache.org/viewvc?view=rev&rev=441745
Log:
Next step in the move to full launcher compatibility.

There are still some internal problems, but structurally
we work.  The build dumps into a /default directory, the 
help and -X stuff are fixed, and it seems to not fall over
when running code.  

This has been tested on Ubuntu 6 - once checked in, I'll test
and fix as necessary on Win32.

Lots of this either inspired by or taken from HARMONY-1390, so
thanks to Evgueni Brevnov for blazing the trail.


Removed:
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmstart.xml
    incubator/harmony/enhanced/drlvm/trunk/vm/launcher/src/main.cpp
Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp

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?view=diff&rev=441745&r1=441744&r2=441745
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml Fri Sep  8 22:14:18 2006
@@ -442,8 +442,6 @@
             <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.*" />
@@ -457,7 +455,7 @@
          java.sh -> java so typing "java" works -->
     <target name="deploy.tweakname">
 
-        <if>
+ <!--       <if>
             <isset property="if.lnx"/>
             <then>
                 <move file="${build.deploy.dir}/bin/java"
@@ -466,7 +464,7 @@
                     tofile="${build.deploy.dir}/bin/java" />
             </then>
         </if>
-
+-->
     </target>
 
     <!-- place things into canonical 'deploy' directory
@@ -482,13 +480,21 @@
             <fileset dir="${build.deploy.dir}"/>
         </copy>
 
+    	<!-- copy our hythr for the launcher to use -->
+    	
+    	<copy todir="${canonical.deploy.dir}/jre/bin">
+    		<fileset dir="${canonical.deploy.dir}/jre/bin/default/">
+    			<include name="*hythr*"/>
+    		</fileset>
+    	</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="javaw" />
                         <include name="eclipse.sh" />
                         <include name="*.so" />
                         <include name="*.so.*" />
@@ -504,7 +510,6 @@
         <copy todir="${build.deploy.dir}">
             <fileset dir="${external.dep.CLASSLIB}/deploy/jdk/jre">
                 <include name="**"/>
-                <exclude name="bin/java*"/>
                 <exclude name="bin/default/**"/>
                 <exclude name="bin/*hythr*"/>
             </fileset>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm.xml?view=diff&rev=441745&r1=441744&r2=441745
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm.xml Fri Sep  8 22:14:18
2006
@@ -36,8 +36,7 @@
                                                    vm.interpreter,
                                                    vm.hythr,
                                                    vm.jitrino,
-                                                   vm.kernel_classes,
-                                                   vm.vmstart" />
+                                                   vm.kernel_classes" />
         </select>
 
         <!-- ia32 dependence but w/o vm.vmi -->
@@ -48,8 +47,7 @@
                                                   vm.interpreter,
                                                   vm.hythr,
                                                   vm.jitrino,
-                                                  vm.kernel_classes,
-                                                  vm.vmstart" />
+                                                  vm.kernel_classes" />
         </select>
         
         <!-- ia32 dependence but w/o vm.vmi and vm.jitrino -->
@@ -59,8 +57,7 @@
                                                   vm.gc, 
                                                   vm.interpreter,
                                                   vm.hythr,
-                                                  vm.kernel_classes,
-                                                  vm.vmstart"  />
+                                                  vm.kernel_classes"  />
         </select>
 
         <property name="test.depends" value="vm.vmcore"/>

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?view=diff&rev=441745&r1=441744&r2=441745
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml Fri Sep  8 22:14:18 2006
@@ -24,40 +24,36 @@
 
 <deploy>
     <vm>
-        <vmstart>
-            <executable>bin:java</executable>
-        </vmstart>
-
         <encoder>
-            <static>bin:encoder</static>
+            <static>bin/default:encoder</static>
         </encoder>
 
         <em>
-            <shared>bin:em</shared>
+            <shared>bin/default:em</shared>
         </em>
 
         <vmcore>
-            <static>bin:harmonyvm</static>
-            <shared>bin:harmonyvm</shared>
+            <static>bin/default:harmonyvm</static>
+            <shared>bin/default:harmonyvm</shared>
         </vmcore>
 
         <interpreter>
-            <shared>bin:interpreter</shared>
+            <shared>bin/default:interpreter</shared>
         </interpreter>
 
         <select arch="ia32,ipf">
             <jitrino>
-                <shared>bin:jitrino</shared>
+                <shared>bin/default:jitrino</shared>
             </jitrino>
         </select>
 
         <gc>
-            <shared>bin:gc</shared>
+            <shared>bin/default:gc</shared>
         </gc>
 
         <select arch="ia32">
             <vmi>
-                <shared>bin:vmi</shared>
+                <shared>bin/default:vmi</shared>
             </vmi>
         </select>
 
@@ -66,7 +62,7 @@
         </kernel_classes>
 
         <hythr>
-            <shared>bin:hythr</shared>
+            <shared>bin/default:hythr</shared>
         </hythr>
      </vm>
 
@@ -74,29 +70,23 @@
     <extra>
         <eclipse_script>
             <select os="win">
-                <other>bin:eclipse.bat</other>
+                <other>bin/default:eclipse.bat</other>
             </select>
 
             <select os="lnx">
-                <other>bin:eclipse.sh</other>
+                <other>bin/default:eclipse.sh</other>
             </select>
         </eclipse_script>
         <select os="win">
             <zlib>
-                <shared>bin:zlib1</shared>
+                <shared>bin/default:zlib1</shared>
             </zlib>
         </select>
 
-        <hyplugin>
+<!--        <hyplugin>
             <jar>lib:*</jar>
         </hyplugin>
-
-
-        <java_script>
-            <select os="lnx">
-                <other>bin:java.sh</other>
-            </select>
-        </java_script>
+-->
 
     </extra>
 </deploy>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml?view=diff&rev=441745&r1=441744&r2=441745
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml Fri Sep  8 22:14:18 2006
@@ -105,7 +105,7 @@
         <property name="CLASSLIB.check.file" value="native-src/README.txt" />
         <property name="ECLIPSE.check.file" value="plugins/org.eclipse.jdt.core_3.1.1.jar"
/>
         <property name="XALAN.check.file" value="xalan.jar" />
-        <property name="VM.check.file" value="vmstart/src/main.cpp" />
+        <property name="VM.check.file" value="vmcore/src/init/vm_main.cpp" />
     </target>
 
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp?view=diff&rev=441745&r1=441744&r2=441745
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp Fri Sep
 8 22:14:18 2006
@@ -74,6 +74,8 @@
 extern bool parallel_jit;
 extern const char * dump_file_name;
 
+static void print_help_on_nonstandard_options();
+
 /**
  * Check if a string begins with another string. Note, even gcc
  * substitutes actual string length instead of strlen
@@ -280,6 +282,16 @@
         else if (strcmp(option, "_org.apache.harmony.vmi.portlib") == 0) {
             // Store a pointer to the portlib
             p_env->portLib = p_env->vm_arguments.options[i].extraInfo;
+        }
+        else if (strcmp(option, "-help") == 0 
+              || strcmp(option, "-h") == 0
+              || strcmp(option, "-?") == 0) {
+            print_generic_help();
+            LOGGER_EXIT(0);
+        }
+        else if (strcmp(option,"-X") == 0) {
+                print_help_on_nonstandard_options();
+                LOGGER_EXIT(0);
         }
         else {
             ECHO("Unknown option " << option << USE_JAVA_HELP);

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp?view=diff&rev=441745&r1=441744&r2=441745
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp Fri Sep  8 22:14:18
2006
@@ -194,6 +194,8 @@
         
         full_name = apr_pstrcat(prop_pool, path, PORT_FILE_SEPARATOR_STR,
             BOOTCLASSPATH_KERNEL_JAR, NULL);
+            
+        TRACE2("init", "kernel jar path : " << full_name);
         
         for(int i = 0; i < props_count; i++){
             full_name = apr_pstrcat(prop_pool, full_name, PORT_PATH_SEPARATOR_STR,



Mime
View raw message