harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r532792 - in /harmony/enhanced/drlvm/trunk/build/make: ./ components/ components/vm/ targets/
Date Thu, 26 Apr 2007 16:23:11 GMT
Author: ayza
Date: Thu Apr 26 09:23:10 2007
New Revision: 532792

URL: http://svn.apache.org/viewvc?view=rev&rev=532792
Log:
With this fix DRLVM build will produce corresponding source files' jars for all jars generated
by the build. See HARMONY-3764.

Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.xml
    harmony/enhanced/drlvm/trunk/build/make/build_component.xml
    harmony/enhanced/drlvm/trunk/build/make/build_component.xsl
    harmony/enhanced/drlvm/trunk/build/make/components/README.txt
    harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/build.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Thu Apr 26 09:23:10 2007
@@ -172,7 +172,7 @@
         <property name="build.executable.pattern" value="\1" />
         <property name="build.shared.pattern" value="lib\1.so lib\1.so.*" />
         <property name="build.static.pattern" value="lib\1.a" />
-        <property name="build.jar.pattern" value="\1.jar" />
+        <property name="build.jar.pattern" value="\1.jar \1-src.jar" />
         <property name="build.other.pattern" value="\1" />
     </target>
 
@@ -183,7 +183,7 @@
         <property name="build.executable.pattern" value="\1.exe \1.pdb" />
         <property name="build.shared.pattern" value="\1.dll \1.pdb" />
         <property name="build.static.pattern" value="\1.lib" />
-        <property name="build.jar.pattern" value="\1.jar" />
+        <property name="build.jar.pattern" value="\1.jar \1-src.jar" />
         <property name="build.other.pattern" value="\1" />
     </target>
 
@@ -705,11 +705,11 @@
                             <!-- 'lib:luni': select 'luni' from it -->
                             <propertyregex property="component.deploy.filenames" input="${deploy.@{component}.@{deploy.property.tail}}"
regexp=".+:(.+)" select="\1" defaultValue="${deploy.@{component}.@{deploy.property.tail}}"
override="true" />
 
-                            <!-- filenames: 'luni,luni2' -->
+                            <!-- filenames: 'luni' -->
                             <!-- pattern:   'lib\1.so,lib\1.so.34' -->
-                            <!-- output:    'libluni.so,libluni.so.34,libluni2.so,libluni.so.34'
-->
+                            <!-- output:    'libluni.so,libluni.so.34' -->
                             <!-- note the last comma in input and output -->
-                            <propertyregex property="component.deploy.filenames" input="${component.deploy.filenames},"
regexp="(.+),\s*" replace="${build.@{deploy.property.tail}.pattern}," global="true" defaultValue="${component.deploy.filenames}"
override="true" />
+                            <propertyregex property="component.deploy.filenames" input="${component.deploy.filenames}"
regexp="(.+)\s*" replace="${build.@{deploy.property.tail}.pattern}" global="true" defaultValue="${component.deploy.filenames}"
override="true" />
 
                             <mkdir dir="${build.deploy.dir}/jdk/jre/${component.deploy.filedir}"
/>
                             <switch value="@{deploy.property.tail}">

Modified: harmony/enhanced/drlvm/trunk/build/make/build_component.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build_component.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build_component.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build_component.xml Thu Apr 26 09:23:10 2007
@@ -313,11 +313,11 @@
                               inheritRefs="true"
                               return="${component.name}.libdir,
                                       ${component.name}.libname,
-                                      ${component.name}.jarname,
                                       ${component.name}.src,
                                       ${component.name}.includes,
                                       ${component.name}.jardir,
-                                      ${component.name}.jarname" >
+                                      ${component.name}.jarname,
+                                      ${component.name}.srcjarname" >
                         <property name="component"
                                   value="${component.name}" />
                         <property name="build.dir"

Modified: harmony/enhanced/drlvm/trunk/build/make/build_component.xsl
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build_component.xsl?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build_component.xsl (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build_component.xsl Thu Apr 26 09:23:10 2007
@@ -70,6 +70,13 @@
         </xsl:call-template>
     </xsl:template>
 
+    <xsl:template match="property[@name='srcjarname']">
+        <xsl:copy-of select="." />
+        <xsl:call-template name="insert-property">
+            <xsl:with-param name="suffix">srcjarname</xsl:with-param>
+        </xsl:call-template>
+    </xsl:template>
+
     <xsl:template name="insert-property">
         <xsl:param name="suffix"/>
         <xsl:element name="property">

Modified: harmony/enhanced/drlvm/trunk/build/make/components/README.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/README.txt?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/README.txt (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/README.txt Thu Apr 26 09:23:10 2007
@@ -164,12 +164,17 @@
 
               <property name="jarname" value="kernel.jar" />
 
-            - Java* source file set description. 
+            - The property "srcjarname" represents the output .jar file name
+              with Java* source files. 
               Example: 
 
-              <path id="java.source">
-                  <pathelement location="${build.vm.home}/vmcore/src/kernel_classes/javasrc"
/>
-              </path>                 
+              <property name="srcjarname" value="kernel-src.jar" />
+
+            - Java* source files location. 
+              Example: 
+
+              <property name="java.source.dir"
+                  location="${build.vm.home}/vmcore/src/kernel_classes/javasrc"/>
 
             - Java* source files pattern: files to pass to javac
               Example: 

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml Thu Apr 26 09:23:10 2007
@@ -1,115 +1,115 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-Author: Marina V. Goldburt, Dmitry B. Yershov
-Version: $Revision: 1.4.2.3 $
--->
-<!--
-    This is build descriptor for the component "vm.gc_cc".
-
-    Please refer to make/components/README.txt for details about the component
-    build descriptor structure.
-  -->
-
-<project name="vm.gc_cc">
-    <target name="init" depends="common_vm">
-        <property name="build.depends" value="extra.apr,vm.vmcore,vm.hythr,vm.kernel_classes"
/>
-        <property name="outtype" value="shared" />
-        <property name="libname" value="gc_cc" />
-        <property name="src" location="${build.vm.home}" />
-
-        <compiler id="cpp.compiler" extends="common.cpp.compiler">
-            <includepath>
-                <pathelement location="${extra.apr.includes}" />
-            </includepath>
-
-            <includepath>
-                <dirset dir="${build.vm.home}">
-                    <include name="include" />
-                    <include name="vmcore/include" />
-                    <include name="vm/interface" />
-                    <select os="win">
-                        <include name="vmcore/src/util/win/include" />
-                    </select>
-                    <select os="lnx">
-                        <include name="vmcore/src/util/linux/include" />
-                    </select>
-                </dirset>
-            </includepath>
-
-            <fileset dir="${src}/gc_cc/src">
-                <include name="*.cpp" />            
-            </fileset>
-
-            <defineset define="BUILDING_GC" />
-
-            <select os="win">
-                <defineset define="_USRDLL" />
-            </select>
-
-            <select os="win" cfg="release" cxx="icl">
-                <compilerarg value="/Qip" />
-            </select>
-        </compiler>
-
-        <select os="win" arch="ipf">
-            <fileset id="asm.fileset"
-                     dir="${build.vm.home}/gc_cc/src">
-                <include name="ini_ipf_low_level.asm" />
-            </fileset>
-        </select>
-
-        <linker id="linker" extends="common.linker">
-            <select os="win">
-                <syslibset libs="advapi32,odbc32,ws2_32,mswsock" />
-                <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
-            </select>
-
-            <select os="win" arch="ipf">
-                <syslibset libs="AdvAPI32" />
-            </select>
-
-            <select os="win" cfg="debug" arch="ia32">
-                <linkerarg value="/NODEFAULTLIB:libcmtd.lib" />
-                <syslibset libs="msvcrtd" />
-            </select>
-
-            <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" />
-            <select os="lnx">
-                <linkerarg value="-Bsymbolic" />
-            </select>
-        </linker>
-
-         <!-- Java helpers -->
-        <property name="build.java.depends" value=""/>
-
-        <path id="java.source">
-            <pathelement location="${build.vm.home}/gc_cc/javasrc" />
-        </path>                 
-
-        <path id="java.class.path">
-            <pathelement location="${java.build.dir}"/>
-
-            <fileset dir="${external.dep.CLASSLIB.jardir}" includes="*.jar" />
-            <pathelement location="${vm.kernel_classes.jardir}/kernel.jar"/>
-            <fileset dir="${build.VMMAGIC.home}" includes="vmmagic-20070207.jar" />
-        </path>
-
-        <property name="jarname" value="gc_cc.jar"/>
-
-    </target>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!--
+Author: Marina V. Goldburt, Dmitry B. Yershov
+Version: $Revision: 1.4.2.3 $
+-->
+<!--
+    This is build descriptor for the component "vm.gc_cc".
+
+    Please refer to make/components/README.txt for details about the component
+    build descriptor structure.
+  -->
+
+<project name="vm.gc_cc">
+    <target name="init" depends="common_vm">
+        <property name="build.depends" value="extra.apr,vm.vmcore,vm.hythr,vm.kernel_classes"
/>
+        <property name="outtype" value="shared" />
+        <property name="libname" value="gc_cc" />
+        <property name="src" location="${build.vm.home}" />
+
+        <compiler id="cpp.compiler" extends="common.cpp.compiler">
+            <includepath>
+                <pathelement location="${extra.apr.includes}" />
+            </includepath>
+
+            <includepath>
+                <dirset dir="${build.vm.home}">
+                    <include name="include" />
+                    <include name="vmcore/include" />
+                    <include name="vm/interface" />
+                    <select os="win">
+                        <include name="vmcore/src/util/win/include" />
+                    </select>
+                    <select os="lnx">
+                        <include name="vmcore/src/util/linux/include" />
+                    </select>
+                </dirset>
+            </includepath>
+
+            <fileset dir="${src}/gc_cc/src">
+                <include name="*.cpp" />            
+            </fileset>
+
+            <defineset define="BUILDING_GC" />
+
+            <select os="win">
+                <defineset define="_USRDLL" />
+            </select>
+
+            <select os="win" cfg="release" cxx="icl">
+                <compilerarg value="/Qip" />
+            </select>
+        </compiler>
+
+        <select os="win" arch="ipf">
+            <fileset id="asm.fileset"
+                     dir="${build.vm.home}/gc_cc/src">
+                <include name="ini_ipf_low_level.asm" />
+            </fileset>
+        </select>
+
+        <linker id="linker" extends="common.linker">
+            <select os="win">
+                <syslibset libs="advapi32,odbc32,ws2_32,mswsock" />
+                <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
+            </select>
+
+            <select os="win" arch="ipf">
+                <syslibset libs="AdvAPI32" />
+            </select>
+
+            <select os="win" cfg="debug" arch="ia32">
+                <linkerarg value="/NODEFAULTLIB:libcmtd.lib" />
+                <syslibset libs="msvcrtd" />
+            </select>
+
+            <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" />
+            <select os="lnx">
+                <linkerarg value="-Bsymbolic" />
+            </select>
+        </linker>
+
+         <!-- Java helpers -->
+        <property name="build.java.depends" value=""/>
+
+        <property name="java.source.dir"
+                  location="${build.vm.home}/gc_cc/javasrc"/>
+
+        <path id="java.class.path">
+            <pathelement location="${java.build.dir}"/>
+
+            <fileset dir="${external.dep.CLASSLIB.jardir}" includes="*.jar" />
+            <pathelement location="${vm.kernel_classes.jardir}/kernel.jar"/>
+            <fileset dir="${build.VMMAGIC.home}" includes="vmmagic-20070207.jar" />
+        </path>
+
+        <property name="jarname" value="gc_cc.jar"/>
+        <property name="srcjarname" value="gc_cc-src.jar"/>
+
+    </target>
+</project>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml Thu Apr 26 09:23:10 2007
@@ -1,139 +1,138 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-Author: Marina V. Goldburt, Dmitry B. Yershov
-Version: $Revision: 1.2 $
--->
-<!--
-    This is build descriptor for the component "vm.gc_gen".
-
-    Please refer to make/components/README.txt for details about the component
-    build descriptor structure.
-  -->
-
-<project name="vm.gc_gen">
-    <target name="init" depends="common_vm">
-        <property name="build.depends" value="extra.apr,vm.vmcore,vm.hythr,vm.kernel_classes"
/>
-        <property name="outtype" value="shared" />
-        <property name="libname" value="gc_gen" />
-        <property name="src" location="${build.vm.home}" />
-
-        <compiler id="cpp.compiler" extends="common.cpp.compiler">
-            <includepath>
-                <pathelement location="${extra.apr.includes}" />
-            </includepath>
-
-            <includepath>
-                <dirset dir="${build.vm.home}">
-                    <include name="include" />
-                    <include name="vmcore/include" />
-                    <include name="vm/interface" />
-                    <select os="win">
-                        <include name="vmcore/src/util/win/include" />
-                    </select>
-                    <select os="lnx">
-                        <include name="vmcore/src/util/linux/include" />
-                    </select>
-                </dirset>
-            </includepath>
-
-            <fileset dir="${src}/gc_gen/src">
-                <select arch="ia32,em64t">
-                <include name="common/*.cpp" />            
-                <include name="gen/*.cpp" />            
-                <include name="mark_compact/*.cpp" />            
-                <include name="mark_sweep/*.cpp" />            
-                <include name="thread/*.cpp" />            
-                <include name="trace_forward/*.cpp" />            
-                <include name="utils/*.cpp" /> 
-                <include name="jni/*.cpp" /> 
-                <include name="verify/*.cpp" />             
-                <include name="finalizer_weakref/*.cpp" />
-                </select>
-
-                <select arch="ipf">
-                <exclude name="common/*.cpp" />            
-                <exclude name="gen/*.cpp" />            
-                <exclude name="mark_compact/*.cpp" />            
-                <exclude name="mark_sweep/*.cpp" />            
-                <exclude name="thread/*.cpp" />            
-                <exclude name="trace_forward/*.cpp" />            
-                <exclude name="utils/*.cpp" /> 
-                <exclude name="jni/*.cpp" /> 
-                <exclude name="verify/*.cpp" />            
-                <exclude name="finalizer_weakref/*.cpp" />
-                </select>
-            </fileset>
-
-            <defineset define="BUILDING_GC" />
-
-            <select os="win">
-                <defineset define="_USRDLL" />
-            </select>
-
-            <select os="win" cfg="release" cxx="icl">
-                <compilerarg value="/Qip" />
-            </select>
-        </compiler>
-
-        <select os="win" arch="ipf">
-            <fileset id="asm.fileset"
-                     dir="${build.vm.home}/gc_gen/src">
-                <include name="ini_ipf_low_level.asm" />
-            </fileset>
-        </select>
-
-        <linker id="linker" extends="common.linker">
-            <select os="win">
-                <syslibset libs="advapi32,odbc32,ws2_32,mswsock" />
-                <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
-            </select>
-
-            <select os="win" arch="ipf">
-                <syslibset libs="AdvAPI32" />
-            </select>
-
-            <select os="win" cfg="debug">
-                <linkerarg value="/NODEFAULTLIB:libcmtd.lib" />
-                <syslibset libs="msvcrtd" />
-            </select>
-
-            <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" />
-            <select os="lnx">
-                <linkerarg value="-Bsymbolic" />
-            </select>
-        </linker>
-
-        <!-- Java helpers -->
-        <property name="build.java.depends" value=""/>
-
-        <path id="java.source">
-            <pathelement location="${build.vm.home}/gc_gen/javasrc" />
-        </path>                 
-
-        <path id="java.class.path">
-            <pathelement location="${java.build.dir}"/>
-
-            <fileset dir="${external.dep.CLASSLIB.jardir}" includes="*.jar" />
-            <pathelement location="${vm.kernel_classes.jardir}/kernel.jar"/>
-            <fileset dir="${build.VMMAGIC.home}" includes="vmmagic-20070207.jar" />
-        </path>
-
-        <property name="jarname" value="gc_gen.jar"/>
-
-    </target>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!--
+Author: Marina V. Goldburt, Dmitry B. Yershov
+Version: $Revision: 1.2 $
+-->
+<!--
+    This is build descriptor for the component "vm.gc_gen".
+
+    Please refer to make/components/README.txt for details about the component
+    build descriptor structure.
+  -->
+
+<project name="vm.gc_gen">
+    <target name="init" depends="common_vm">
+        <property name="build.depends" value="extra.apr,vm.vmcore,vm.hythr,vm.kernel_classes"
/>
+        <property name="outtype" value="shared" />
+        <property name="libname" value="gc_gen" />
+        <property name="src" location="${build.vm.home}" />
+
+        <compiler id="cpp.compiler" extends="common.cpp.compiler">
+            <includepath>
+                <pathelement location="${extra.apr.includes}" />
+            </includepath>
+
+            <includepath>
+                <dirset dir="${build.vm.home}">
+                    <include name="include" />
+                    <include name="vmcore/include" />
+                    <include name="vm/interface" />
+                    <select os="win">
+                        <include name="vmcore/src/util/win/include" />
+                    </select>
+                    <select os="lnx">
+                        <include name="vmcore/src/util/linux/include" />
+                    </select>
+                </dirset>
+            </includepath>
+
+            <fileset dir="${src}/gc_gen/src">
+                <select arch="ia32,em64t">
+                <include name="common/*.cpp" />            
+                <include name="gen/*.cpp" />            
+                <include name="mark_compact/*.cpp" />            
+                <include name="mark_sweep/*.cpp" />            
+                <include name="thread/*.cpp" />            
+                <include name="trace_forward/*.cpp" />            
+                <include name="utils/*.cpp" /> 
+                <include name="jni/*.cpp" /> 
+                <include name="verify/*.cpp" />             
+                <include name="finalizer_weakref/*.cpp" />
+                </select>
+
+                <select arch="ipf">
+                <exclude name="common/*.cpp" />            
+                <exclude name="gen/*.cpp" />            
+                <exclude name="mark_compact/*.cpp" />            
+                <exclude name="mark_sweep/*.cpp" />            
+                <exclude name="thread/*.cpp" />            
+                <exclude name="trace_forward/*.cpp" />            
+                <exclude name="utils/*.cpp" /> 
+                <exclude name="jni/*.cpp" /> 
+                <exclude name="verify/*.cpp" />            
+                <exclude name="finalizer_weakref/*.cpp" />
+                </select>
+            </fileset>
+
+            <defineset define="BUILDING_GC" />
+
+            <select os="win">
+                <defineset define="_USRDLL" />
+            </select>
+
+            <select os="win" cfg="release" cxx="icl">
+                <compilerarg value="/Qip" />
+            </select>
+        </compiler>
+
+        <select os="win" arch="ipf">
+            <fileset id="asm.fileset"
+                     dir="${build.vm.home}/gc_gen/src">
+                <include name="ini_ipf_low_level.asm" />
+            </fileset>
+        </select>
+
+        <linker id="linker" extends="common.linker">
+            <select os="win">
+                <syslibset libs="advapi32,odbc32,ws2_32,mswsock" />
+                <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
+            </select>
+
+            <select os="win" arch="ipf">
+                <syslibset libs="AdvAPI32" />
+            </select>
+
+            <select os="win" cfg="debug">
+                <linkerarg value="/NODEFAULTLIB:libcmtd.lib" />
+                <syslibset libs="msvcrtd" />
+            </select>
+
+            <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" />
+            <select os="lnx">
+                <linkerarg value="-Bsymbolic" />
+            </select>
+        </linker>
+
+        <!-- Java helpers -->
+        <property name="build.java.depends" value=""/>
+
+        <property name="java.source.dir"
+                  location="${build.vm.home}/gc_gen/javasrc"/>
+
+        <path id="java.class.path">
+            <pathelement location="${java.build.dir}"/>
+
+            <fileset dir="${external.dep.CLASSLIB.jardir}" includes="*.jar" />
+            <pathelement location="${vm.kernel_classes.jardir}/kernel.jar"/>
+            <fileset dir="${build.VMMAGIC.home}" includes="vmmagic-20070207.jar" />
+        </path>
+
+        <property name="jarname" value="gc_gen.jar"/>
+
+    </target>
+</project>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml Thu Apr 26 09:23:10 2007
@@ -117,9 +117,8 @@
          <!-- Java helpers -->
         <property name="build.java.depends" value=""/>
 
-        <path id="java.source">
-            <pathelement location="${build.vm.home}/thread/javasrc" />
-        </path>                 
+        <property name="java.source.dir"
+                  location="${build.vm.home}/thread/javasrc"/>
 
         <path id="java.class.path">
             <pathelement location="${java.build.dir}"/>
@@ -130,6 +129,7 @@
         </path>
 
         <property name="jarname" value="hythr.jar"/>
+        <property name="srcjarname" value="hythr-src.jar"/>
 
     </target>
 </project>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml Thu Apr 26 09:23:10
2007
@@ -43,10 +43,6 @@
         <fileset id="cpp.fileset" dir="." includes="empty_fileset"/>
         <fileset id="asm.fileset" dir="." includes="empty_fileset"/>        
 
-        <path id="java.source">
-            <pathelement location="." />
-        </path>
-
         <patternset id="java.classes.pattern" includes="empty_pattern"/>
 
         <compiler id="cpp.compiler" extends="common.cpp.compiler">

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml Thu Apr 26 09:23:10
2007
@@ -33,9 +33,8 @@
         <property name="src"
                   location="${build.vm.home}/vmcore/src/kernel_classes/native" />
 
-        <path id="java.source">
-            <pathelement location="${build.vm.home}/vmcore/src/kernel_classes/javasrc"
/>
-        </path>                 
+        <property name="java.source.dir"
+                  location="${build.vm.home}/vmcore/src/kernel_classes/javasrc"/>
 
         <path id="java.class.path">
             <fileset dir="${external.dep.CLASSLIB.jardir}" includes="*.jar" />
@@ -56,7 +55,8 @@
         <property name="java.debug.option" value="true"/>
 
         <property name="jarname" value="kernel.jar"/>
-        
+        <property name="srcjarname" value="kernel-src.jar"/>
+
         <property name="manifest.file" 
             location="${build.vm.home}/vmcore/src/kernel_classes/resource/MANIFEST.MF" />
  
         

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml Thu Apr 26 09:23:10 2007
@@ -32,11 +32,17 @@
             <jar jarfile="${jardir}/${jarname}" manifest="${manifest.file}">
                 <fileset refid="java.classes.fileset" />
             </jar>
-
+            <jar jarfile="${jardir}/${srcjarname}"
+                 manifest="${manifest.file}">
+                <fileset refid="java.sources.fileset" />
+            </jar>
         </then>
         <else>
             <jar jarfile="${jardir}/${jarname}">
                  <fileset refid="java.classes.fileset" />
+            </jar>
+            <jar jarfile="${jardir}/${srcjarname}">
+                <fileset refid="java.sources.fileset" />
             </jar>
         </else>
         </if>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml Thu Apr 26 09:23:10 2007
@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 <project name="BUILD_JAVA_TARGET">
-    <target name="build.java" depends="init_component" if="java.build.dir">
+    <target name="build.java" depends="init_component" if="java.source.dir">
         <echo message="## Building Java classes of '${component}'" />
 
         <mkdir dir="${java.build.dir}" />
@@ -23,13 +23,18 @@
         <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}" compiler="${hy.javac.compiler}">
-            <src refid="java.source" />
+        <javac srcdir="${java.source.dir}" destdir="${java.build.dir}"
+               source="${javac.source}" target="${javac.target}"
+               debug="${java.debug.option}"
+               compiler="${hy.javac.compiler}">
+            <!--src refid="java.source" /-->
             <patternset refid="java.source.pattern" />
             <classpath refid="java.class.path"/>
             <bootclasspath refid="java.boot.class.path"/>
         </javac>
+        <fileset id="java.sources.fileset" dir="${java.source.dir}">
+            <patternset refid="java.source.pattern" />
+        </fileset>
         <fileset id="java.classes.fileset" dir="${java.build.dir}">
             <patternset refid="java.classes.pattern" />
         </fileset>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.xml?view=diff&rev=532792&r1=532791&r2=532792
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.xml Thu Apr 26 09:23:10 2007
@@ -38,9 +38,9 @@
         <linker id="common.linker" />
 
         <!-- empty common ids, must be defined in component descriptors -->
-        <path id="java.source">
+        <!--path id="java.source">
             <pathelement location="." />
-        </path>
+        </path-->
 
         <patternset id="java.classes.pattern" includes="empty_pattern" />
     </target>



Mime
View raw message