harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r616241 [3/3] - in /harmony/enhanced/drlvm/trunk: ./ make/ make/extra/ make/resources/ make/tests/ make/vm/
Date Tue, 29 Jan 2008 10:34:18 GMT
Propchange: harmony/enhanced/drlvm/trunk/make/vm/gc_gen.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/make/vm/hythr.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/hythr.xml?rev=616241&view=auto
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/hythr.xml (added)
+++ harmony/enhanced/drlvm/trunk/make/vm/hythr.xml Tue Jan 29 02:34:12 2008
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<project name="hythr" default="build" basedir="../..">
+    
+    <property name="component" value="hythr"/>
+    <import file="common-vm.xml"/>
+    
+    <target name="build" depends="-common-vm">        
+        <init-native/>
+
+        <make-native libname="hythr" type="shared">
+        <compiler id="c.compiler" extends="common.c.compiler">
+            <includepath>
+              <pathelement location="${drlvm.include.dir}" />
+              <path refid="vm.include"/>
+              <pathelement location="${vm.home}/thread/src" />
+            </includepath>
+
+            <fileset dir="${vm.home}/thread/src">
+                <include name="*.c" />
+                <include name="win/*.c" if="is.windows"/>
+                <include name="linux/*.c" if="is.unix"/>
+            </fileset>
+
+            <defineset define="APR_DECLARE_STATIC" />
+        </compiler>
+
+        <linker id="linker" extends="common.linker">
+            <libset libs="port,log4cxx,aprutil-1,apr-1"
+                    dir="${drlvm.lib.dir}" />
+
+            <linkerarg value="/DEF:${vm.home}/thread/src/hythr.def" if="is.windows"/>
+
+            <syslibset libs="stdc++,rt,pthread" if="is.linux"/>
+            <syslibset libs="stdc++,pthread" if="is.freebsd"/>
+            <linkerarg value="-Wl,-init" if="is.unix"/>
+            <linkerarg value="-Wl,hythread_library_init" if="is.unix"/>
+            <linkerarg value="-Wl,--version-script,${vm.home}/thread/src/hythr.exp" if="is.unix"/>
+        </linker>
+        </make-native>
+    </target>
+    
+    <target name="clean" >
+        <clean-native/>
+    </target>
+
+</project>

Propchange: harmony/enhanced/drlvm/trunk/make/vm/hythr.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml?rev=616241&view=auto
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml (added)
+++ harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml Tue Jan 29 02:34:12 2008
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<project name="interpreter" default="build" basedir="../..">
+        
+    <property name="component" value="interpreter"/>
+    <import file="common-vm.xml"/>
+        
+    <target name="build" depends="-common-vm">        
+        <init-native/>
+        
+        <compile-asm>
+            <fileset id="int.asm" dir="${vm.home}/interpreter/src">
+                <include name="invokeJNI_ia32.asm" if="is.unix.x86"/>
+                <include name="invokeJNI_em64t.asm" if="is.unix.x86_64"/>
+                <include name="invokeJNI_ipf.asm" if="is.unix.ia64"/>
+    
+                <exclude name="*" if="is.windows.x86"/>
+                <include name="invokeJNI_Windows_ipf.asm" if="is.windows.ia64"/>
+                <include name="invokeJNI_Windows_em64t.asm" if="is.windows.x86_64"/>
+            </fileset>
+        </compile-asm>
+        
+        <path id="int.includes">
+            <pathelement location="${drlvm.include.dir}" />
+            <dirset dir="${vm.home}">
+                <include name="include" />
+                <include name="vmcore/include" />
+                <include name="port/include" />
+
+                <include name="vmcore/src/util/win/include" if="is.windows"/>
+                <include name="vmcore/src/util/linux/include" if="is.unix"/>
+
+                <include name="vmcore/src/util/ipf/include" if="is.ia64"/>
+                <include name="vmcore/src/util/ipf/base_natives" if="is.ia64"/>
+                <include name="port/src/lil/ipf/pim/include" if="is.ia64"/>
+
+                <include name="vmcore/src/util/ia32/base_natives" if="is.x86"/>
+                <include name="port/src/encoder/ia32_em64t" if="is.x86"/>
+                <include name="port/src/lil/ia32/pim/include" if="is.x86"/>
+
+                <include name="vmcore/src/util/em64t/base_natives" if="is.x86_64"/>
+                <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
+                <include name="port/src/lil/em64t/pim/include" if="is.x86_64"/>
+            </dirset>
+        </path>
+        <depend-includes paths="int.includes"/>
+        <depend-selector rebuild-flag="int.includes.uptodate" id="int.depends"/>
+
+        <compile-cc>
+        <compiler id="cpp.compiler" extends="common.cpp.compiler">
+            <includepath refid="int.includes"/>
+            <fileset dir="${vm.home}/interpreter/src">
+                <selector refid="int.depends"/>
+                <include name="*.cpp" />
+                <exclude name="interp_native_ia32.cpp" unless="is.x86"/>
+                <exclude name="interp_native_ipf.cpp" unless="is.ia64"/>
+                <exclude name="interp_native_em64t.cpp" unless="is.x86_64"/>
+            </fileset>
+
+            <compilerarg value="/Op" if="is.windows" unless="is.cfg.debug"/>
+            <compilerarg value="-Qwd1572" if="is.icl"/>
+        </compiler>
+        </compile-cc>
+
+        <link-lib name="interpreter" type="shared">
+            <linker id="linker" extends="common.linker">
+                <linkerarg value="--version-script=${vm.home}/interpreter/build/interpreter.exp"
if="is.unix"/>
+                <libset libs="harmonyvm,hythr" dir="${drlvm.shlib.dir}" />
+            </linker>
+        </link-lib>
+
+        <copy todir="${drlvm.bin.dir}" file="${vm.home}/interpreter/interpreter.emconf"
/>
+    </target>
+    
+    <target name="clean" >
+        <clean-native />
+    </target>
+
+</project>

Propchange: harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml?rev=616241&view=auto
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml (added)
+++ harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml Tue Jan 29 02:34:12 2008
@@ -0,0 +1,207 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<project name="jitrino" default="build" basedir="../..">
+    
+    <property name="component" value="jitrino"/>
+    <import file="common-vm.xml"/>
+    
+    <target name="build" depends="-init-win,-init-unix">
+        <init-native/>
+        
+        <path id="jit.includes">
+            <dirset dir="${vm.home}/jitrino/src">
+                <include name="dynopt" />
+                <include name="main" />
+                <include name="shared" />
+                <include name="optimizer" />
+                <include name="optimizer/ssa" />
+                <include name="optimizer/abcd" />
+                <include name="translator" />
+                <include name="translator/java" />
+                <include name="vm" />
+                <include name="codegenerator" />
+
+                <include name="codegenerator/ia32" unless="is.ia64"/>
+                <include name="jet" unless="is.ia64"/>
+
+                <include name="codegenerator/ipf" if="is.ia64"/>
+                <include name="codegenerator/ipf/include" if="is.ia64"/>
+            </dirset>
+            <dirset dir="${vm.home}">
+                <include name="port/src/encoder/ia32_em64t" unless="is.ia64"/>
+                <include name="vmcore/src/util/win/include" if="is.windows"/>
+                <include name="vmcore/src/util/linux/include" if="is.unix"/>
+            </dirset>
+            <pathelement location="${drlvm.include.dir}" />
+            <pathelement location="${vm.home}/include" />
+            <pathelement location="${vm.home}/vmcore/include" />
+            <pathelement location="${vm.home}/port/include" />
+        </path>
+        <depend-includes paths="jit.includes"/>
+        <depend-selector rebuild-flag="jit.includes.uptodate" id="jit.depends"/>
+
+        <compile-cc>
+            <compiler id="cpp.compiler" extends="plaf.cpp.compiler">
+                <includepath refid="jit.includes"/>
+                <fileset dir="${vm.home}/jitrino/src">
+                    <selector refid="jit.depends"/>
+                    <include name="dynopt/*.cpp" />
+                    <include name="main/*.cpp" />
+                    <include name="shared/*.cpp" />
+                    <include name="optimizer/*.cpp" />
+                    <include name="optimizer/ssa/*.cpp" />
+                    <include name="optimizer/abcd/*.cpp" />
+                    <include name="translator/*.cpp" />
+                    <include name="translator/java/*.cpp" />
+                    <include name="vm/*.cpp" />
+                    <include name="codegenerator/*.cpp"/>
+    
+                    <include name="codegenerator/ipf/*.cpp" if="is.ia64"/>
+                    <include name="codegenerator/ia32/*.cpp" unless="is.ia64"/>
+                    <include name="jet/*.cpp" unless="is.ia64"/>
+                </fileset>
+    
+                <defineset define="PROJECT_JITRINO" />
+                <defineset define="JIT_LOGS,JIT_STATS" if="is.cfg.debug" />
+            </compiler>
+        </compile-cc>
+        <link-lib name="jitrino" type="shared">
+            <linker id="jitrino.linker" extends="common.linker">
+                <libset libs="harmonyvm,encoder,hythr" dir="${drlvm.lib.dir}" if="is.windows"/>
+                <linkerarg value="/OPT:REF" if="is.windows"/>
+        
+                <syslibset type="shared" libs="m" if="is.unix"/>
+                <syslibset type="shared" libs="dl" if="is.linux"/>
+                <linkerarg value="--version-script=${vm.home}/jitrino/build/jitrino.exp"
if="is.unix"/>
+            </linker>
+        </link-lib>
+
+        <echo message="Copying configuration files for jitrino..."/> 
+        <copy todir="${drlvm.bin.dir}" flatten="true">
+              <fileset dir="${vm.home}/jitrino/config">
+                  <include name="ia32/*" if="is.x86"/>
+                  <include name="em64t/*" if="is.x86_64"/>
+                  <include name="ipf/*" if="is.ia64"/>
+              </fileset>
+        </copy>
+    </target>
+
+            <!-- windows specific -->
+        <target name="-init-win" depends="-common-vm" if="is.windows">
+            <compiler id="plaf.cpp.compiler" extends="common.cpp.compiler">
+                <!-- _CRT_SECURE_NO_DEPRECATE added to suppress a huge amount of complaints
from msvc em64t compiler -->
+                <defineset define="_MBCS,_REENTRANT,__SMP__,_CRT_SECURE_NO_DEPRECATE,_HAS_ITERATOR_DEBUGGING=0,_SECURE_SCL=0"
/>
+
+                <compilerarg value="/TP" />
+                <compilerarg value="/Zc:forScope" />
+                <compilerarg value="/WL" />
+                <compilerarg value="/W4" />
+<!--                <compilerarg value="/WX" /> -->
+
+                <compilerarg value="/Gm" if="is.cfg.debug"/>
+                <compilerarg value="/RTC1" if="is.cfg.debug"/>
+
+                <compilerarg value="/Ot" if="is.cfg.release"/>
+
+                <compilerarg value="/Qvec_report0" if="is.icl" unless="is.cfg.debug"/>
+                <compilerarg value="/Qww1,82,111,172,181,279,280,373,424,593,654,858"
if="is.icl"/>
+                <compilerarg value="/Qwd82,193,271,304,373,383,424,444,654,869,981,1125,1418,1419,1572,1683"
if="is.icl"/>
+                    <!--
+                      # /Qwd[tag,...] Disable the soft diagnostics that corresponds to tag.

+                      # /Qwr[tag,...] Override the severity of the soft diagnostics corresponding
to tag and make it a remark. 
+                      # /Qww[tag,...] Override the severity of the soft diagnostics corresponding
to tag and make it a warning. 
+                      # /Qwe[tag,...] Override the severity of the soft diagnostics corresponding
to tag and make it an error.
+                      #
+                      # Following icl warning added to icl command line
+                      #
+                      # remark #1: last line of file ends without a newline      
+                      # remark #82: storage class is not first
+                      # remark #111: statement is unreachable
+                      # remark #181: argument is incompatible with corresponding format string
conversion
+                      # remark #193: zero used for undefined preprocessing identifier
+                      # remark #271: trailing comma is nonstandard   
+                      # remark #279: controlling expression is constant    
+                      # remark #280: selector expression is constant
+                      # remark #304: access control not specified ("private" by default)
    
+                      # remark #373: "xxx" is inaccessible
+                      # remark #383: value copied to temporary, reference to temporary used
+                      # remark #424: extra ";" ignored
+                      # remark #444: destructor for base class "..." is not virtual    
+                      # remark #593: variable "xxx" was set but never used
+                      # remark #654: overloaded virtual function "xxx" is only partially
overridden in class "yyy"
+                      # remark #858: type qualifier on return type is meaningless
+                      # remark #869: parameter "o" was never referenced    
+                      # remark #981: operands are evaluated in unspecified order
+                      # remark #1418: external definition with no prior declaration    
+                      # remark #1419: external declaration in primary source file      
+                      #
+                      # warning #1125: function "xxx" is hidden by "yyy" - virtual function
override intended?
+                      # warning #1572: floating-point equality and inequality comparisons
are unreliable
+                    -->
+
+                <compilerarg value="/wd4201" if="is.msvc"/>
+                <compilerarg value="/wd4244" if="is.msvc"/>
+                <compilerarg value="/wd4512" if="is.msvc"/>
+                <compilerarg value="/wd4702" if="is.msvc"/>
+                <compilerarg value="/wd4100" if="is.msvc"/>
+                <compilerarg value="/wd4127" if="is.msvc"/>
+                <compilerarg value="/wd4718" if="is.msvc" unless="is.cfg.debug"/>
+                    <!--
+                      #4201 - W4, nonstandart extention - nameless struct or union
+                      #4702 - W4, unreachable code (fired in STL's <list>)
+                      #4512 - assigment operator can not be generated
+                      #4100 - unreferenced formal parameter
+                      #4127 - conditional expression is constant
+                      #4718 - release: recursive call has no side effects, deleting
+
+                      # specify where to put the per-compilation unit pdb
+                      # this is needed to make the parallel compilation to work with cl:

+                      # the default name is the same for all input files (vc70.pdb) and 
+                      # thus causes problems during parralel build.
+                    -->
+            </compiler>
+        </target>
+        
+        <target name="-init-unix" depends="-common-vm" if="is.unix">
+            <compiler id="plaf.cpp.compiler" extends="common.cpp.compiler">
+                <compilerarg value="-fmessage-length=0" if="is.gcc"/>
+                <compilerarg value="-Wall" if="is.gcc"/>
+                <compilerarg value="-Werror" if="is.gcc"/>
+
+                <compilerarg value="-x" />
+                <compilerarg value="c++" />
+                <compilerarg value="-fPIC" />
+                <compilerarg value="-fno-exceptions" />
+
+                <compilerarg value="-wd68" if="is.icc"/>
+                <compilerarg value="-wd654" if="is.icc"/>
+                <compilerarg value="-wd854" if="is.icc"/>
+                <compilerarg value="-wd470" if="is.icc"/>
+                <compilerarg value="-wd1572" if="is.icc"/>
+                <compilerarg value="-wd1125" if="is.icc"/>
+                    <!--                        
+                      # 470 - 'qualified name is not allowed in member declaration'
+                      # warning #1125: function "xxx" is hidden by "yyy"
+                      - virtual function override intended 
+                      # warning #1572: floating-point equality and inequality comparisons
are unreliable
+                    -->
+
+                <compilerarg value="-O" if="is.unix" unless="is.cfg.debug"/>
+            </compiler>
+        </target>
+
+</project>

Propchange: harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/make/vm/kernel.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/kernel.xml?rev=616241&view=auto
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/kernel.xml (added)
+++ harmony/enhanced/drlvm/trunk/make/vm/kernel.xml Tue Jan 29 02:34:12 2008
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<project name="kernel" default="build" basedir="../..">
+    
+    <import file="../build-java.xml"/>
+    
+    <target name="fetch-depends">
+        <fetch dep="antlr"/>
+        <fetch dep="vmmagic"/>
+    </target>
+
+    <target name="check-depends">
+        <check-one-file dest="${antlr}" src="${antlr.url}"/>
+        <check-one-file dest="${vmmagic}" src="${vmmagic.url}"/>
+    </target>
+    
+    <target name="check-setup">
+        <basename file="${vmmagic}" property="vmmagic.basename"/>
+        <available file="${drlvm.deploy.dir}/jdk/jre/lib/boot/${vmmagic.basename}" 
+            property="vmmagic.available"/>
+        <basename file="${antlr}" property="antlr.basename"/>
+        <available file="${drlvm.deploy.dir}/jdk/jre/lib/boot/${antlr.basename}" 
+            property="antlr.available"/>
+        <condition property="setup.complete">
+            <and>
+                <isset property="antlr.available"/>
+                <isset property="vmmagic.available"/>
+            </and>
+        </condition>
+    </target>
+    
+    <target name="setup" depends="check-setup" unless="setup.complete">
+        <check-one-file dest="${antlr}" src="${antlr.url}"/>
+        <check-one-file dest="${vmmagic}" src="${vmmagic.url}"/>
+        <copy todir="${drlvm.deploy.dir}/jdk/jre/lib/boot" file="${vmmagic}"/>
+        <add-bcp-entry name="vmmagic-20070207.jar" ordinal="100"/>
+        <copy todir="${drlvm.deploy.dir}/jdk/jre/lib/boot" file="${antlr}"/>
+        <add-bcp-entry name="antlr-2.7.5.jar" ordinal="101"/>
+    </target>
+
+    <target name="build" depends="setup">
+        <make-java component="kernel" 
+            src="${vm.home}/vmcore/src/kernel_classes/javasrc"
+            manifest="${vm.home}/vmcore/src/kernel_classes/resource/MANIFEST.MF">
+            <classpath>
+                <fileset dir="${drlvm.deploy.dir}/jdk/jre/lib/boot" includes="*.jar" />
+            </classpath>
+    
+            <!-- 
+            the kernel classes destination directory must be in bootclasspath -
+            otherwise the Reference Java "kernel" classes are referred during
+            compilation of drlvm kernel classes - this produces incompatibility
+            -->
+            <bootclasspath>
+                <pathelement location="${drlvm.semi.dir}/kernel/classes"/>
+            </bootclasspath>
+        </make-java>        
+    </target>
+    
+    <target name="clean" >
+        <delete dir="${drlvm.semi.dir}/kernel/classes"/>
+    </target>
+
+</project>

Propchange: harmony/enhanced/drlvm/trunk/make/vm/kernel.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/make/vm/port.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/port.xml?rev=616241&view=auto
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/port.xml (added)
+++ harmony/enhanced/drlvm/trunk/make/vm/port.xml Tue Jan 29 02:34:12 2008
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<project name="portlib" default="build" basedir="../..">
+    
+    <property name="component" value="portlib"/>
+    
+    <import file="common-vm.xml"/>
+    
+    <target name="build" depends="-common-vm">        
+        <init-native/>
+        
+        <path id="port.includes">
+            <dirset dir="${vm.home}">
+                <include name="include" />
+                <include name="port/include" />
+            </dirset>
+            <pathelement location="${drlvm.include.dir}"/>
+            <pathelement location="${hy.hdk}/include" />
+        </path>
+        <patternset id="port.src">
+            <include name="disasm/linux/*.c" if="is.unix"/>
+            <include name="file_io/linux/*.c" if="is.unix"/>
+            <include name="misc/linux/*.c" if="is.unix"/>
+            <include name="vmem/linux/*.c" if="is.unix"/>
+            <include name="thread/linux/*.c" if="is.unix"/>
+
+            <include name="atomic/linux/*.c" if="is.unix" unless="is.ia64"/>
+            <include name="atomic/linux_ipf/*.c" if="is.unix.ia64"/>
+
+            <include name="atomic/win/*.c" if="is.windows"/>
+            <include name="disasm/win/*.c" if="is.windows"/>
+            <include name="file_io/win/*.c" if="is.windows"/>
+            <include name="misc/win/*.c" if="is.windows"/>
+            <include name="vmem/win/*.c" if="is.windows"/>
+            <include name="thread/win/*.c" if="is.windows"/>
+            <include name="file_io/*.c"/>
+        </patternset>
+
+        <depend-includes paths="port.includes"/>
+        <depend-selector rebuild-flag="port.includes.uptodate" id="port.depends.cpp"/>
+        <depend-selector rebuild-flag="port.includes.uptodate" type="c" id="port.depends.c"/>
+
+        <compile-asm>
+            <fileset id="port.asm" dir="${vm.home}/port/src">
+                <include name="atomic/win/*.asm" if="is.windows.x86_64"/>
+                <include name="atomic/linux_ipf/port_atomic_asm.asm" if="is.unix.ia64"/>
+            </fileset>
+        </compile-asm>
+        
+        <compile-cc>
+            <includepath refid="port.includes"/>
+
+            <defineset define="APR_DECLARE_EXPORT" />
+            <defineset define="BUILDING_VM" />
+
+            <compiler id="c.compiler" extends="common.c.compiler">
+                <fileset dir="${vm.home}/port/src" >
+                    <patternset refid="port.src"/>
+                    <selector refid="port.depends.c"/>
+                </fileset>
+            </compiler>
+
+            <compiler id="cpp.compiler" extends="common.cpp.compiler">
+                <fileset dir="${vm.home}/port/src">
+                    <selector refid="port.depends.cpp"/>
+                    <include name="logger/**.cpp" />
+                    <include name="tl/*.cpp" />
+                    <include name="time/*.cpp" />
+                </fileset>
+
+                <compilerarg value="/EHsc" if="is.windows"/>
+                <compilerarg value="-fexceptions" if="is.unix"/>
+            </compiler>
+        </compile-cc>
+        
+        <link-lib name="port" type="static"/>
+    </target>
+    
+    <target name="clean" >
+        <clean-native/>
+    </target>
+
+</project>

Propchange: harmony/enhanced/drlvm/trunk/make/vm/port.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml?rev=616241&view=auto
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml (added)
+++ harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml Tue Jan 29 02:34:12 2008
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<project name="vmcore" default="build" basedir="../..">
+
+    <property name="component" value="vmcore"/>
+    <import file="common-vm.xml"/>
+
+    <target name="fetch-depends" depends="fetch-depends-win">
+        <fetch dep="icuhdr"/>
+        <fetch dep="icudll"/>
+    </target>
+
+    <target name="fetch-depends-win" if="is.windows">
+        <fetch dep="zlib"/>
+    </target>
+
+    <target name="check-depends" depends="check-depends-win">
+        <check-one-file dest="${icuhdr}" src="${icuhdr.url}"/>
+        <check-one-file dest="${icudll}" src="${icudll.url}"/>
+    </target>
+
+    <target name="check-depends-win" if="is.windows">
+        <check-one-file dest="${zlib}" src="${zlib.url}"/>
+    </target>
+    
+    <target name="-check-setup">
+        <available file="${drlvm.include.dir}/unicode" property="icu4c.hdr.available"/>
+        <available file="${shlib.prefix}icuuc${shlib.suffix}" property="icu4c.lib.available"/>
+        <condition property="setup.complete">
+            <and>
+                <isset property="icu4c.hdr.available"/>
+                <isset property="icu4c.lib.available"/>
+            </and>
+        </condition>
+    </target>
+
+    <target name="setup" depends="-check-setup,-setup-win" unless="setup.complete">
+        <check-one-file dest="${icuhdr}" src="${icuhdr.url}"/>
+        <check-one-file dest="${icudll}" src="${icudll.url}"/>
+        <mkdir dir="${drlvm.include.dir}/unicode"/>
+        <unzip src="${icuhdr}" dest="${drlvm.include.dir}/unicode"/>
+        <unzip src="${icudll}" dest="${drlvm.bin.dir}">
+            <patternset> 
+                <exclude name="*${linklib.suffix}" unless="shlib.is.linklib"/>
+            </patternset>
+        </unzip>
+        <unzip src="${icudll}" dest="${drlvm.lib.dir}">
+            <patternset> 
+                <include name="*${linklib.suffix}" unless="shlib.is.linklib"/>
+            </patternset>
+        </unzip>
+        <check-one-link message="" src="${drlvm.shlib.dir}/${icuuc.linkname}"
+            dest="${drlvm.shlib.dir}/${shlib.prefix}icuuc${shlib.suffix}"/>
+    </target>
+
+    <target name="-check-setup-win" if="is.windows">
+        <available file="${drlvm.bin.dir}/zlib1.dll" property="zlib.available"/>
+        <condition property="win.setup.complete">
+            <isset property="zlib.available"/>
+        </condition>
+    </target>
+
+    <target name="-setup-win" depends="-check-setup-win"
+        if="is.windows" unless="win.setup.complete">
+        <check-one-file dest="${zlib}" src="${zlib.url}"/>
+        <unzip src="${zlib}" dest="${zlib.dir}">
+            <patternset includes="include/** lib/** zlib1.dll"/>
+        </unzip>
+        <copy file="${zlib.dir}/zlib1.dll" todir="${drlvm.bin.dir}"/>
+        <copy file="${zlib.dir}/lib/zdll.lib" todir="${drlvm.lib.dir}"/>
+        <copy todir="${drlvm.include.dir}">
+            <fileset dir="${zlib.dir}/include">
+                <include name="*.h" />
+            </fileset>
+        </copy>
+    </target>
+            
+    <target name="build" depends="setup,stamp-version,-common-vm">
+        <init-native component="vmcore"/>
+        
+        <compile-asm>
+            <fileset id="vmcore.asm" dir="${vm.home}/vmcore">
+                <include name="src/util/ipf/base/*.asm" if="is.unix.ia64"/>
+                <include name="src/util/win/em64t/*.asm" if="is.windows.x86_64"/>
+            </fileset>
+        </compile-asm>
+
+        <path id="vmcore.includes">
+            <pathelement location="${drlvm.include.dir}" />
+
+            <dirset dir="${vm.home}">
+                <include name="include" />
+                <include name="vmcore/include" />
+                <include name="port/include" />
+            
+                <include name="vmcore/src/util/win/include" if="is.windows"/>
+                <include name="vmcore/src/util/linux/include" if="is.unix"/>
+
+                <include name="vmcore/src/util/ipf/include" if="is.ia64"/>
+                <include name="vmcore/src/util/ipf/base_natives" if="is.ia64"/>
+                <include name="port/src/lil/ipf/pim/include" if="is.ia64"/>
+
+                <include name="vmcore/src/util/ia32/base_natives" if="is.x86"/>
+                <include name="port/src/encoder/ia32_em64t" if="is.x86"/>
+                <include name="port/src/lil/ia32/pim/include" if="is.x86"/>
+
+                <include name="vmcore/src/util/em64t/base_natives" if="is.x86_64"/>
+                <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
+                <include name="port/src/lil/em64t/pim/include" if="is.x86_64"/>
+            </dirset>
+        </path>
+        <depend-includes paths="vmcore.includes"/>
+        <depend-selector rebuild-flag="vmcore.includes.uptodate" id="vmcore.depends"/>
+
+        <compile-cc>
+        <compiler id="cpp.compiler" extends="common.cpp.compiler">
+            <includepath refid="vmcore.includes"/>
+            <fileset dir="${vm.home}/vmcore/src">
+                <selector refid="vmcore.depends"/>
+                <include name="class_support/*.cpp" />
+                <include name="exception/*.cpp" />
+                <include name="init/*.cpp" />
+                <include name="gc/*.cpp" />
+                <include name="interpreter/*.cpp" />
+                <include name="jit/*.cpp" />
+                <include name="jni/*.cpp" />
+                <include name="jvmti/*.cpp" />
+                <include name="ncai/*.cpp" />
+                <include name="object/*.cpp" />
+                <include name="reflection/*.cpp" />
+                <include name="stack/*.cpp" />
+                <include name="thread/*.cpp" />
+                <include name="thread/helpers/thread_helpers.cpp" />
+                <include name="thread/helpers/thread_helpers_ia32.cpp" if="is.x86"/>
+                <include name="thread/helpers/thread_helpers_em64t.cpp" if="is.x86_64"/>
+                <include name="thread/helpers/thread_helpers_ipf.cpp" if="is.ia64"/>
+                <include name="util/*.cpp" />
+                <include name="verifier/*.cpp" if="use_original_verifier"/>
+                <include name="verifier-3363/*/*.cpp" unless="use_original_verifier"/>
+            </fileset>
+
+            <fileset dir="${vm.home}/vmcore/src/kernel_classes/native">
+                <selector refid="vmcore.depends"/>
+                <include name="*.cpp" />
+                <exclude name="Runtime_win.cpp" if="is.unix"/>
+                <exclude name="System_win.cpp" if="is.unix"/>
+                <exclude name="Runtime_lnx.cpp" if="is.windows"/>
+                <exclude name="System_lnx.cpp" if="is.windows"/>
+            </fileset>
+
+            <fileset dir="${vm.home}">
+                <selector refid="vmcore.depends"/>
+                <include name="port/src/lil/*.cpp" />
+                <include name="port/src/lil/pim/*.cpp" />
+                <include name="vmstart/src/compmgr/*.cpp" />
+
+                <include name="port/src/lil/ipf/pim/*.cpp" if="is.ia64"/>
+                <include name="port/src/lil/ia32/pim/*.cpp" if="is.x86"/>
+                <include name="port/src/lil/em64t/pim/*.cpp" if="is.x86_64"/>
+            </fileset>
+
+            <fileset dir="${vm.home}/vmcore/src">
+                <selector refid="vmcore.depends"/>
+                <include name="thread/win/*.cpp" if="is.windows"/>
+                <include name="util/win/*.cpp" if="is.windows"/>
+                <include name="ncai/utils/*win.cpp" if="is.windows"/>
+
+                <include name="util/win/ia32/*.cpp" if="is.windows.x86"/>
+                <include name="util/win/em64t/*.cpp" if="is.windows.x86_64"/>
+                <include name="util/win/ia32_em64t/*.cpp" if="is.windows" unless="is.ia64"/>
+                <include name="util/win/ipf/*.cpp" if="is.windows.ia64"/>
+
+                <include name="util/ipf/**/*.cpp" if="is.ia64"/>
+                <include name="util/ia32/**/*.cpp" if="is.x86"/>
+                <include name="util/em64t/**/*.cpp" if="is.x86_64"/>
+
+                <include name="ncai/utils/*ipf.cpp" if="is.ia64"/>
+                <include name="ncai/utils/*ia32.cpp" if="is.x86"/>
+                <include name="ncai/utils/*em64t.cpp" if="is.x86_64"/>
+
+                <include name="thread/linux/*.cpp" if="is.unix"/>
+                <include name="util/linux/*.cpp" if="is.unix"/>
+                <include name="ncai/utils/*linux.cpp" if="is.unix"/>
+                <exclude name="util/linux/signals_ia32.cpp" unless="is.unix.x86"/>
+                <exclude name="util/linux/signals_em64t.cpp" unless="is.unix.x86_64"/>
+                <exclude name="util/linux/signals_ipf.cpp" unless="is.unix.ia64"/>
+                <include name="util/linux/ia32_em64t/*.cpp" if="is.unix" unless="is.ia64"/>
+            </fileset>
+
+            <compilerarg value="/Qwd94" if="is.icl"/>
+            <defineset define="BUILDING_VM,APR_DECLARE_STATIC" />
+        </compiler>
+        </compile-cc>
+        
+        <link-lib name="harmonyvm" type="shared">
+            <linker id="linker" extends="common.linker">
+                <libset libs="port,encoder,log4cxx,aprutil-1,apr-1"
+                    dir="${drlvm.lib.dir}" />
+                <libset libs="hythr" dir="${drlvm.shlib.dir}" />
+                <libset libs="icuuc" dir="${drlvm.shlib.dir}"/>
+                <libset libs="zdll" dir="${drlvm.lib.dir}" if="is.windows"/>
+    
+                <linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm64.def" if="is.windows.x86_64"/>
+                <linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm.def" if="is.windows.x86"/>
+                <linkerarg value="--version-script=${vm.home}/vmcore/build/vmcore.exp"
if="is.unix"/>
+                
+                <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread,gcc_s,rt" if="is.linux"/>
+                <syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/>

+                <libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
+                <linkerarg value="--export-dynamic" if="is.freebsd"/>
+            </linker>
+        </link-lib>        
+        
+        <echo message="Copying files for internationalization..."/>
+        <copy todir="${drlvm.bin.dir}" flatten="true" >
+            <fileset dir="${vm.home}/vmcore/src/init">
+                <include name="harmony*.properties" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="stamp-version" depends="-check-version,-copy-version"
+        if="svn.revision" unless="skip.svn.stamp">
+        <copy file="${vm.home}/vmcore/include/version_svn_tag_orig.h"
+              tofile="${vm.home}/vmcore/include/version_svn_tag.h" overwrite="true">
+            <filterset>
+                <filter token="svn.revision" value="${svn.revision}"/>
+            </filterset>
+        </copy>
+    </target>
+    
+    <target name="-check-version" if="svn.revision">
+        <uptodate property="skip.svn.stamp" 
+            srcfile="${vm.home}/.svn/entries" 
+            targetfile="${vm.home}/vmcore/include/version_svn_tag.h"/>
+    </target>
+
+    <target name="-copy-version" unless="svn.revision">
+        <copy file="${vm.home}/vmcore/include/version_svn_tag_orig.h"
+              tofile="${vm.home}/vmcore/include/version_svn_tag.h" overwrite="false">
+        </copy>
+    </target>
+
+    <target name="clean" >
+        <clean-native />
+    </target>
+
+</project>

Propchange: harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/make/vm/vmi.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/vmi.xml?rev=616241&view=auto
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/vmi.xml (added)
+++ harmony/enhanced/drlvm/trunk/make/vm/vmi.xml Tue Jan 29 02:34:12 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<project name="vmi" default="build" basedir="../..">
+    
+    <property name="component" value="vmi"/>
+    <import file="common-vm.xml"/>
+    
+    <target name="build" depends="-common-vm">        
+        <init-native/>
+        <make-native libname="vmi" type="shared">
+            <compiler id="cpp.compiler" extends="common.cpp.compiler">
+                <includepath>
+                    <pathelement location="${drlvm.include.dir}" />
+                    <path refid="vm.include"/>
+                    <dirset dir="${vm.home}">
+                        <include name="vmcore/include" />
+                        <include name="vmcore/src/util/win/include" if="is.windows"/>
+                        <include name="vmcore/src/util/linux/include" if="is.unix"/>
+                    </dirset>
+                    <pathelement location="${hy.hdk}/include" />
+                </includepath>
+
+                <fileset dir="${vm.home}/vmi/src" includes="*.cpp" />
+            </compiler>
+
+            <linker id="linker" extends="common.linker">
+                <linkerarg value="/export:VMI_GetVMIFromJavaVM" if="is.windows"/>
+                <linkerarg value="/export:VMI_GetVMIFromJNIEnv" if="is.windows"/>
+                <libset libs="harmonyvm" dir="${drlvm.lib.dir}" if="is.windows"/>
+
+                <linkerarg value="--version-script,${vm.home}/vmi/src/vmi.exp" if="is.unix"/>
+
+                <libset libs="hyzip, hypool" dir="${hy.hdk}/lib"/>
+                <libset libs="hyprt" dir="${hy.hdk.shlibs}"/>
+            </linker>
+        </make-native>
+    </target>
+    
+    <target name="clean" >
+        <clean-native />
+    </target>
+</project>

Propchange: harmony/enhanced/drlvm/trunk/make/vm/vmi.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message