harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r530063 - in /harmony/enhanced/jdktools/trunk: make/build-native.xml make/defines.mak make/properties.xml modules/jpda/build.xml modules/launcher/build.xml modules/samsa/build.xml
Date Wed, 18 Apr 2007 15:30:29 GMT
Author: gshimansky
Date: Wed Apr 18 08:30:28 2007
New Revision: 530063

URL: http://svn.apache.org/viewvc?view=rev&rev=530063
Log:
Applied HARMONY-3699 [jdktools][build] Copy pdb files on windows to deploy directory


Modified:
    harmony/enhanced/jdktools/trunk/make/build-native.xml
    harmony/enhanced/jdktools/trunk/make/defines.mak
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
    harmony/enhanced/jdktools/trunk/modules/samsa/build.xml

Modified: harmony/enhanced/jdktools/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-native.xml?view=diff&rev=530063&r1=530062&r2=530063
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-native.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-native.xml Wed Apr 18 08:30:28 2007
@@ -92,6 +92,7 @@
                 <include name="**/bin/java${exe.suffix}" />
                 <include name="**/bin/javaw${exe.suffix}" />
                 <include name="**/bin/*${shlib.suffix}*" />
+                <include name="**/bin/*${progdb.suffix}*" />
             	<include name="**/bin/harmony*.properties" />
             </fileset>
         </delete>

Modified: harmony/enhanced/jdktools/trunk/make/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/defines.mak?view=diff&rev=530063&r1=530062&r2=530063
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/defines.mak (original)
+++ harmony/enhanced/jdktools/trunk/make/defines.mak Wed Apr 18 08:30:28 2007
@@ -38,18 +38,18 @@
 !ENDIF
 
 HYCOMMONCFLAGS = \
-  -GF -Gs -MD -Zm400 \
+  $(WARNING_LEVEL) -GF -Gs -Zm400 \
   -D_DLL -D_MT -D_WINSOCKAPI_ $(PLATFORM_64) \
   -I$(HY_HDK)\include -I$(HY_HDK)\jdk\include -I.
 
 !ifndef HYDEBUGCFLAGS
 HYDEBUGCFLAGS = \
-  -Zi -Od -D_DEBUG
+  -Zi -Od -MDd -D_DEBUG
 !endif
 
 !ifndef HYRELEASECFLAGS  
 HYRELEASECFLAGS = \
-  -Ogityb1 -DNDEBUG
+  -Ogityb1 -MD -DNDEBUG
 !endif
 
 !IF "$(HY_CFG)" == "debug"

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?view=diff&rev=530063&r1=530062&r2=530063
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Wed Apr 18 08:30:28 2007
@@ -150,6 +150,14 @@
     </condition>
     <property name="shlib.suffix" value=".so" />
 
+    <condition property="progdb.suffix" value=".pdb">
+        <isset property="is.windows" />
+    </condition>
+
+    <condition property="manifest.suffix" value=".manifest">
+        <isset property="is.windows" />
+    </condition>
+
     <condition property="linklib.suffix" value=".lib">
         <isset property="is.windows"/>
     </condition>

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?view=diff&rev=530063&r1=530062&r2=530063
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Wed Apr 18 08:30:28 2007
@@ -64,7 +64,8 @@
         <!-- copy to our local jdk skeleton -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.jpda.src.main.native}/jdwp/${hy.os}">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}"/>
+                <include name="*${progdb.suffix}" if="is.windows" />
             </fileset>
         </copy>
     </target>

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/build.xml?view=diff&rev=530063&r1=530062&r2=530063
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/build.xml Wed Apr 18 08:30:28 2007
@@ -53,15 +53,17 @@
         <!-- Copy across the built executables -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.luni.src.main.native}/launcher">
-                <patternset includes="java${exe.suffix}" />
-                <patternset includes="javaw${exe.suffix}" />
+                <include name="java${exe.suffix}" />
+                <include name="javaw${exe.suffix}" if="is.windows" />
+                <include name="java${progdb.suffix}" if="is.windows" />
+                <include name="javaw${progdb.suffix}" if="is.windows" />
             </fileset>
         </copy>
 
         <!-- Make sure the Linux launcher has execute permission -->
         <chmod file="${hy.jdk}/jre/bin/java${exe.suffix}" perm="ugo+x" />
 
-      </target>
+    </target>
 
     <target name="prepare-exclude">
         <echo message="LAUNCER exclude list: ${launcher.exclude.file}" />
@@ -85,17 +87,10 @@
       </target>
 
     <!-- Clean natives -->
-    <target name="clean-native" depends="clean-jre">
+    <target name="clean-native">
         <echo message="Cleaning LAUNCHER natives" />
         <make dir="${hy.luni.src.main.native}/launcher/${hy.os}"
               target="clean" />
-    </target>
-
-    <target name="clean-jre" unless="is.hdk-build">
-        <delete includeEmptyDirs="true" failonerror="false">
-            <fileset dir="${hy.jdk}/jre/bin" includes="**/*" />
-            <fileset dir="${hy.jdk}/jre/lib" />
-        </delete>
     </target>
 
 </project>

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?view=diff&rev=530063&r1=530062&r2=530063
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Wed Apr 18 08:30:28 2007
@@ -41,42 +41,60 @@
     <target name="build-tests" />
     <target name="test-module" depends="prepare-exclude, run-tests" />
 
-    <target name="build-native" >
+    <target name="build-native" depends="-compile-native, -copy-native-exe, -copy-native-progdb,
-copy-native-data" />
+
+    <!-- compile universal samsa binary -->
+    <target name="-compile-native" >
 
         <echo message="Compiling SAMSA natives" />
         <echo message="hy.drlvm=${hy.drlvm}" />
         <echo message="harmony.jdktools=${harmony.jdktools}" />
             
-        <!-- Build launcher executables -->
         <make dir="${hy.samsa.src.main.native}/samsa/${hy.os}" />
 
-        <!-- Copy across the built executables -->
-        <copy todir="${hy.jdk}/bin" overwrite="yes">
-            <fileset dir="${hy.samsa.src.main.native}/samsa/${hy.os}">
-                <patternset includes="samsa${exe.suffix}" />
-            </fileset>
-        </copy>
+    </target>
 
-        <!-- now make copies for the tools -->
-            
-        <copy file="${hy.jdk}/bin/samsa${exe.suffix}" tofile="${hy.jdk}/bin/javac${exe.suffix}"
/>
+    <!-- copy samsa executable for different tools -->
+    <target name="-copy-native-exe" >
+
+        <property name="hy.samsa.exe" location="${hy.samsa.src.main.native}/samsa/${hy.os}/samsa${exe.suffix}"
/>
+
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javac${exe.suffix}" />
         <chmod file="${hy.jdk}/bin/javac${exe.suffix}" perm="ugo+x" />
-        <copy file="${hy.jdk}/bin/samsa${exe.suffix}" tofile="${hy.jdk}/bin/javah${exe.suffix}"
/>
+
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javah${exe.suffix}" />
         <chmod file="${hy.jdk}/bin/javah${exe.suffix}" perm="ugo+x" />
-        <copy file="${hy.jdk}/bin/samsa${exe.suffix}" tofile="${hy.jdk}/bin/java${exe.suffix}"
/>
+
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/java${exe.suffix}" />
         <chmod file="${hy.jdk}/bin/java${exe.suffix}" perm="ugo+x" />
-        <copy file="${hy.jdk}/bin/samsa${exe.suffix}" tofile="${hy.jdk}/bin/keytool${exe.suffix}"
/>
+
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/keytool${exe.suffix}" />
         <chmod file="${hy.jdk}/bin/keytool${exe.suffix}" perm="ugo+x" />
-        <copy file="${hy.jdk}/bin/samsa${exe.suffix}" tofile="${hy.jdk}/bin/jarsigner${exe.suffix}"
/>
-        <chmod file="${hy.jdk}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
 
-        <delete file="${hy.jdk}/bin/samsa${exe.suffix}"/>
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/jarsigner${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
         
-        <!-- copy the tool data -->
+    </target>
+
+    <!-- copy samsa symbol info for different tools -->
+    <target name="-copy-native-progdb" if="is.windows" >
+
+        <property name="hy.samsa.progdb" location="${hy.samsa.src.main.native}/samsa/${hy.os}/samsa${progdb.suffix}"
/>
+
+        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javac${progdb.suffix}" />
+        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javah${progdb.suffix}" />
+        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/java${progdb.suffix}" />
+        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/keytool${progdb.suffix}"
/>
+        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/jarsigner${progdb.suffix}"
/>
+
+    </target>
+
+    <!-- copy samsa configuration data for different tools -->
+    <target name="-copy-native-data" >
 
         <copy todir="${hy.jdk}/bin/data" overwrite="yes">
             <fileset dir="${hy.samsa.src.main.resources}/data/">
-                <patternset includes="*.dat" />
+                <include name="*.dat" />
             </fileset>
         </copy>
 



Mime
View raw message