harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r573149 - in /harmony/enhanced: drlvm/trunk/build/make/build.xml drlvm/trunk/build/make/deploy.xml trunk/build.xml
Date Thu, 06 Sep 2007 05:04:41 GMT
Author: varlax
Date: Wed Sep  5 22:04:40 2007
New Revision: 573149

URL: http://svn.apache.org/viewvc?rev=573149&view=rev
Log:
include drlvm libs to hdk, to allow unit testing on snapshots

Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.xml
    harmony/enhanced/drlvm/trunk/build/make/deploy.xml
    harmony/enhanced/trunk/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?rev=573149&r1=573148&r2=573149&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Wed Sep  5 22:04:40 2007
@@ -514,7 +514,7 @@
                                            deploy.copy_classlib,
                                            deploy.antlr,
                                            deploy.vmmagic,
-                                           deploy.tweakname">
+                                           deploy-hdklibs">
         
         <!-- copy our hythr for the launcher to use -->
         
@@ -528,28 +528,27 @@
         
         <copy file="harmonyvm.properties" todir="${build.deploy.dir}/jdk/jre/bin/default"/>
 
-        <if>
-            <and>
-                <isset property="if.unix" />
-                <available type="dir" file="${build.deploy.dir}/jdk/jre/bin" />
-            </and>
-            <then>
-                <chmod perm="755">
-                    <fileset dir="${build.deploy.dir}/jdk/jre/bin">
-                        <include name="java" />
-                        <include name="*.so" />
-                        <include name="*.dylib" />
-                        <include name="*.so.*" />
-                    </fileset>
-                </chmod>
-            </then>
-        </if>
+        <chmod perm="755">
+            <fileset dir="${build.deploy.dir}/jdk/jre/bin">
+                <include name="java" />
+                <include name="*.so" />
+                <include name="*.dylib" />
+                <include name="*.so.*" />
+            </fileset>
+        </chmod>
         
     </target>
 
-    <!-- tweak the names of java -> java.exec and
-         java.sh -> java so typing "java" works -->
-    <target name="deploy.tweakname">
+    <target name="deploy-hdklibs">
+        <mkdir dir="${build.deploy.dir}/lib" />
+        <copy todir="${build.deploy.dir}/lib">
+            <fileset dir="${build.semi.dir}/vm">
+                <include name="**/*.lib"/>
+                <include name="**/*.exp"/>
+            </fileset>
+            <flattenmapper/>
+        </copy>
+
     </target>
 
     <!-- ==================================================================
@@ -563,6 +562,7 @@
         <mkdir dir="${canonical.deploy.dir}/jdk/lib" />
         <mkdir dir="${canonical.deploy.dir}/jdk/bin" />
         <mkdir dir="${canonical.deploy.dir}/jdk/include" />
+        <mkdir dir="${canonical.deploy.dir}/lib" />
 
         <copy todir="${canonical.deploy.dir}/jdk/jre">
             <fileset dir="${build.deploy.dir}/jdk/jre"/>
@@ -571,21 +571,19 @@
         <copy todir="${canonical.deploy.dir}/jdk/include">
             <fileset dir="${build.deploy.dir}/jdk/include"/>
         </copy>
+
+        <copy todir="${canonical.deploy.dir}/lib">
+            <fileset dir="${build.deploy.dir}/lib"/>
+        </copy>
         
-        <if>
-            <isset property="if.lnx"/>
-            <then>
-                <chmod perm="755">
-                    <fileset dir="${canonical.deploy.dir}/jdk/jre/bin">
-                        <include name="java" />
-                        <include name="javaw" />
-                        <include name="eclipse.sh" />
-                        <include name="*.so" />
-                        <include name="*.so.*" />
-                    </fileset>
-                </chmod>
-            </then>
-        </if>
+        <chmod perm="755">
+            <fileset dir="${canonical.deploy.dir}/jdk/jre/bin">
+                <include name="java" />
+                <include name="javaw" />
+                <include name="*.so" />
+                <include name="*.so.*" />
+            </fileset>
+        </chmod>
     </target>
 
     <target name="deploy.antlr">

Modified: harmony/enhanced/drlvm/trunk/build/make/deploy.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/deploy.xml?rev=573149&r1=573148&r2=573149&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/deploy.xml Wed Sep  5 22:04:40 2007
@@ -75,16 +75,6 @@
 
 
     <extra>
-<!--        <eclipse_script>
-            <select os="win">
-                <other>bin/default:eclipse.bat</other>
-            </select>
-
-            <select osfamily="unix">
-                <other>bin/default:eclipse.sh</other>
-            </select>
-        </eclipse_script>
--->
         <select os="win">
             <zlib>
                 <shared>bin/default:zlib1</shared>

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=573149&r1=573148&r2=573149&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Wed Sep  5 22:04:40 2007
@@ -242,9 +242,9 @@
             </fileset>
         </copy>
 
-        <!-- now copy the drlvm/build/deploy/jre -->
+        <!-- now copy the drlvm/build/deploy -->
         <copy todir="${target.dir}/hdk/jdk">
-            <fileset dir="working_vm/build/deploy/jdk">
+            <fileset dir="working_vm/build/deploy">
                 <exclude name="**/*.pdb" unless="copy.progdb" />
             </fileset>
         </copy>



Mime
View raw message