harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r419262 - in /incubator/harmony/enhanced/drlvm/trunk/build/make: ./ components/ components/extra/ components/vm/ targets/
Date Wed, 05 Jul 2006 15:48:24 GMT
Author: hindessm
Date: Wed Jul  5 08:48:23 2006
New Revision: 419262

URL: http://svn.apache.org/viewvc?rev=419262&view=rev
Log:
Applied patch from "[#HARMONY-753] DRLVM build cleanup: remove some of classlib tasks".

Removed:
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/classlib.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/bcprov.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/icu4c.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/resolver.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/serializer.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/xml_api_copy.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml
Modified:
    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/vm/kernel_classes.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml

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=419262&r1=419261&r2=419262&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml Wed Jul  5 08:48:23 2006
@@ -224,7 +224,7 @@
         <ant antfile="setup.xml" target="clean.update" inheritall="true" />
     </target>
 
-    <target name="update" depends="detect.os.arch.cxx.cfg, set.semis.dirs">
+    <target name="update" depends="extern_dep, detect.os.arch.cxx.cfg, set.semis.dirs">
         <ant antfile="setup.xml" target="update.external.resources" inheritall="true"
/>
     </target>
 

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=419262&r1=419261&r2=419262&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  5 08:48:23
2006
@@ -30,17 +30,12 @@
         <property name="build.depends" value="extra.apr,
                                               extra.apriconv,
                                               extra.aprutil,
-                                              extra.bcprov,
                                               extra.eclipse_script,
                                               extra.hello,
-                                              extra.icu4c,
                                               extra.hyplugin,
                                               extra.ij_script,
                                               extra.jre_libraries,
                                               extra.log4cxx,
-                                              extra.resolver,
-                                              extra.serializer,
-                                              extra.xml_api_copy,
                                               extra.zlib" />
        
     </target>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml?rev=419262&r1=419261&r2=419262&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml Wed
Jul  5 08:48:23 2006
@@ -37,9 +37,6 @@
             <pathelement location="${build.vm.home}/vmcore/src/kernel_classes/javasrc"
/>
         </path>                 
 
-        <patternset id="java.classes.pattern"  includes="**/*.class"/>
-        <patternset id="java.source.pattern"  includes="**/*.java"/>
-
         <path id="java.class.path">
             <pathelement location="${java.build.dir}"/>
 

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=419262&r1=419261&r2=419262&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml Wed Jul  5 08:48:23 2006
@@ -91,14 +91,6 @@
             <jar>lib:*</jar>
         </hyplugin>
 
-        <icu4c>
-            <jar>lib/boot:*</jar>
-            <shared>bin:*</shared>
-        </icu4c>
-
-        <xml_api_copy>
-            <jar>lib/boot:*</jar>
-        </xml_api_copy>
 
         <ij_script>
             <select os="win">
@@ -109,18 +101,6 @@
                 <other>bin:ij.sh</other>
             </select>
         </ij_script>
-
-        <bcprov>
-            <jar>lib/boot:*</jar>
-        </bcprov>
-
-        <resolver>
-            <jar>lib/boot:resolver</jar>
-        </resolver>
-
-        <serializer>
-            <jar>lib/boot:serializer</jar>
-        </serializer>
 
         <hello>
             <other>bin:Hello.class</other>

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?rev=419262&r1=419261&r2=419262&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml Wed Jul  5 08:48:23 2006
@@ -106,8 +106,6 @@
         <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="BCPROV.check.file" value="bcprov-jdk14-129.jar" />
-        <property name="RESOLVER.check.file" value="resolver.jar" />
     </target>
 
 
@@ -163,6 +161,8 @@
                 <include name="plugins/org.junit_3.8.1/junit.jar" />
             </fileset>
         </copy>
+
+
         <propertyregex property="build.XALAN.path" input="${if.XALAN.exist}" regexp="(.*)/${XALAN.check.file}"
select="\1" />
         <copy file="${build.XALAN.path}/xalan.jar" todir="tmp" />
         <fail>
@@ -178,6 +178,7 @@
 * See README for details.
         </fail>
         <copy file="${build.XALAN.path}/serializer.jar" todir="tmp" />
+
         <propertyregex property="build.CPPTASKS.path" input="${if.CPPTASKS.exist}" regexp="(.*)/${CPPTASKS.check.file}"
select="\1" />
         <copy file="${build.CPPTASKS.path}/cpptasks.jar" todir="tmp" />
         <echo message="done" file="tmp/done.txt" />
@@ -203,7 +204,7 @@
 
 
     <target name="setup.resources" depends="plugin.antcontrib">
-        <property name="common.resources" value="LOG4CXX,HYPLUGIN,CPPTASKS,XALAN,VM,BCPROV,RESOLVER"
/>
+        <property name="common.resources" value="LOG4CXX,HYPLUGIN,CPPTASKS,XALAN,VM" />
         <property name="build.resources" value="CPPTASKS,ECLIPSE" />
         <if>
             <isset property="if.lnx" />

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml?rev=419262&r1=419261&r2=419262&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml Wed Jul  5 08:48:23
2006
@@ -23,11 +23,14 @@
 
         <mkdir dir="${java.build.dir}" />
 
+        <patternset id="java.classes.pattern"  includes="**/*.class"/>
+        <patternset id="java.source.pattern"  includes="**/*.java"/>
+
         <javac destdir="${java.build.dir}" source="${javac.source}"
                 target="${javac.target}" debug="${java.debug.option}">
             <src refid="java.source" />
             <patternset refid="java.source.pattern" />
-            <bootclasspath refid="java.class.path"/>
+            <classpath refid="java.class.path"/>
         </javac>
         <fileset id="java.classes.fileset" dir="${java.build.dir}">
             <patternset refid="java.classes.pattern" />



Mime
View raw message