changeset 780:3f7212cae6eb tip

Merge PPC port
author andrew
date Thu, 30 Jan 2014 19:01:55 +0000
parents a840edf95760 919c657684b6
children
files .hgtags build.properties build.xml
diffstat 3 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jan 22 17:33:40 2014 +0000
+++ b/.hgtags	Thu Jan 30 19:01:55 2014 +0000
@@ -192,6 +192,9 @@
 c08f88f5ae98917254cd38e204393adac22823a6 jdk7u6-b10
 a37ad8f90c7bd215d11996480e37f03eb2776ce2 jdk7u6-b11
 95a96a879b8c974707a7ddb94e4fcd00e93d469c jdk7u6-b12
+4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b01
+4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b02
+4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b03
 e0a71584b8d84d28feac9594d7bb1a981d862d7c jdk7u6-b13
 9ae31559fcce636b8c219180e5db1d54556db5d9 jdk7u6-b14
 f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15
@@ -271,6 +274,7 @@
 40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12
 4fe9a362c3277cd4c7a5149853e5cf59dbba7cb7 jdk7u14-b13
 a2b2e716637acdb9884d21fc4b9aef3c8b59e702 jdk7u14-b14
+53bd8e6a5ffabdc878a312509cf84a72020ddf9a ppc-aix-port-b04
 b5c8ac5253ef735e5aa770b7325843ec89b56633 jdk7u14-b15
 abcaebcead605f89cd0919add20d8ac16637ddc2 jdk7u15-b01
 62f9e7f5eb644fedd93dd93bd36bcf817a8d9c8a jdk7u15-b02
@@ -389,6 +393,7 @@
 65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18
 c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30
 6802a1c098c48b2c8336e06f1565254759025bab jdk7u45-b31
+cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
 e040abab3625fbced33b30cba7c0307236268211 jdk7u45-b33
 e7df5d6b23c64509672d262187f51cde14db4e66 jdk7u45-b34
 5524cced32d3959d95ed414add230273bc10c38d jdk7u51-b00
--- a/build.properties	Wed Jan 22 17:33:40 2014 +0000
+++ b/build.properties	Thu Jan 30 19:01:55 2014 +0000
@@ -58,6 +58,9 @@
 build.dir=${output.dir}/build
 build.classes.dir=${build.dir}/classes
 
+# JAXP built files
+jaxp.classes.dir=${output.dir}/../jaxp/build/classes
+
 # Distributed results
 dist.dir=${output.dir}/dist
 dist.lib.dir=${dist.dir}/lib
--- a/build.xml	Wed Jan 22 17:33:40 2014 +0000
+++ b/build.xml	Thu Jan 30 19:01:55 2014 +0000
@@ -135,9 +135,15 @@
     <target name="compile"
 	    depends="init">
         <mkdir dir="${build.classes.dir}"/>
-        <javac 
-	     includeAntRuntime="false" 
-	     classpath="${build.classes.dir}:${tools.jar}"
+	<!-- 
+	  It seems that the 'includeAntRuntime' and 'includeJavaRuntime' arguments are ignored if 
+	  we use fork=true. This leads to the problem that we end up using classes from the botstrapping
+	  JDK's class path which may be incompatible with the JAXP/JAXWS classes we are currently building. 
+	  To fix this problem we prepend the newly created JAXP/JAXWS classes to javac's boot class path
+	-->
+        <javac
+	     includeAntRuntime="false"
+	     classpath="${jaxp.classes.dir}:${build.classes.dir}:${tools.jar}"
 	     fork="true"
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
@@ -145,7 +151,7 @@
              source="${javac.source}"
 	     debug="${javac.debug}"
              target="${javac.target}">
-            <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
+            <compilerarg value="-J-Xbootclasspath/p:${javac.jar}:${jaxp.classes.dir}:${build.classes.dir}"/>
             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
             <src refid="src.dir.id"/>
         </javac>