harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r618261 - in /harmony/enhanced/drlvm/trunk: build.xml make/vm/verifier.xml make/vm/vmcore.xml
Date Mon, 04 Feb 2008 12:53:03 GMT
Author: varlax
Date: Mon Feb  4 04:53:03 2008
New Revision: 618261

URL: http://svn.apache.org/viewvc?rev=618261&view=rev
Log:
Fixed HARMONY-5421  [drlvm][build][verifier] build verifier as a static library

Added:
    harmony/enhanced/drlvm/trunk/make/vm/verifier.xml   (with props)
Modified:
    harmony/enhanced/drlvm/trunk/build.xml
    harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml

Modified: harmony/enhanced/drlvm/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build.xml?rev=618261&r1=618260&r2=618261&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build.xml Mon Feb  4 04:53:03 2008
@@ -129,7 +129,11 @@
         <ant antfile="make/vm/hythr.xml"/>
     </target>
 
-    <target name="vmcore" depends="encoder, port, hythr">
+    <target name="verifier">
+        <ant antfile="make/vm/verifier.xml"/>
+    </target>
+
+    <target name="vmcore" depends="encoder, port, hythr, verifier">
         <ant antfile="make/vm/vmcore.xml"/>
     </target>
 

Added: harmony/enhanced/drlvm/trunk/make/vm/verifier.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/verifier.xml?rev=618261&view=auto
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/verifier.xml (added)
+++ harmony/enhanced/drlvm/trunk/make/vm/verifier.xml Mon Feb  4 04:53:03 2008
@@ -0,0 +1,45 @@
+<?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="verifier" default="build" basedir="../..">
+    
+    <property name="component" value="verifier"/>
+    <import file="common-vm.xml"/>
+    
+    <target name="build" depends="-common-vm">        
+        <init-native/>
+        <make-native libname="verifier" type="static">
+            <includepath>
+                <pathelement location="${drlvm.include.dir}" />
+                <pathelement location="${vm.home}/vmcore/include" />
+                <pathelement location="${vm.home}/include" />
+            </includepath>
+            <compiler extends="common.cpp.compiler">
+                <fileset dir="${vm.home}/vmcore/src">
+                    <include name="verifier/*.cpp" if="use_original_verifier"/>
+                    <include name="verifier-3363/*/*.cpp" unless="use_original_verifier"/>
+                </fileset>
+            </compiler>
+        </make-native>
+    </target>
+    
+    <target name="clean" >
+        <clean-native/>
+    </target>
+    
+</project>

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

Modified: harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml?rev=618261&r1=618260&r2=618261&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml Mon Feb  4 04:53:03 2008
@@ -152,8 +152,6 @@
                 <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">
@@ -211,7 +209,7 @@
         
         <link-lib name="harmonyvm" type="shared">
             <linker id="linker" extends="common.linker">
-                <libset libs="port,encoder,log4cxx,aprutil-1,apr-1"
+                <libset libs="port,encoder,verifier,log4cxx,aprutil-1,apr-1"
                     dir="${drlvm.lib.dir}" />
                 <libset libs="hythr" dir="${drlvm.shlib.dir}" />
                 <libset libs="icuuc" dir="${drlvm.shlib.dir}"/>



Mime
View raw message