blob: 8e36886911508e33f602e91037e8f7fec9a1d110 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
diff -Nru openjdk-boot.orig/jaxws/build.properties openjdk-boot/jaxws/build.properties
--- openjdk-boot.orig/jaxws/build.properties 2012-06-11 14:30:27.904723311 +0100
+++ openjdk-boot/jaxws/build.properties 2012-06-11 14:38:13.847981281 +0100
@@ -62,6 +62,10 @@
# JAXP built files
jaxp.classes.dir=${output.dir}/../jaxp/build/classes
+# JDK sources
+
+jdk.sources=${jdk.topdir}/src/share/classes:${jdk.topdir}/src/solaris/classes
+
# Distributed results
dist.dir=${output.dir}/dist
dist.lib.dir=${dist.dir}/lib
@@ -92,6 +96,7 @@
output.dir=${output.dir}${line.separator}\
build.dir=${build.dir}${line.separator}\
dist.dir=${dist.dir}${line.separator}\
+ jdk.topdir=${jdk.topdir}${line.separator}\
${line.separator}
#------------------------------------------------------------
diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
--- openjdk-boot.orig/jaxws/build.xml 2012-06-11 14:30:27.904723311 +0100
+++ openjdk-boot/jaxws/build.xml 2012-06-11 14:36:04.005990816 +0100
@@ -138,6 +138,7 @@
<javac
includeAntRuntime="false"
classpath="${jaxp.classes.dir}:${build.classes.dir}:${langtools.jar}"
+ sourcepath="${jdk.sources}"
fork="true"
destdir="${build.classes.dir}"
memoryInitialSize="${javac.memoryInitialSize}"
diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
--- openjdk-boot.orig/jaxws/make/Makefile 2012-06-11 14:30:27.904723311 +0100
+++ openjdk-boot/jaxws/make/Makefile 2012-06-11 14:36:04.005990816 +0100
@@ -123,6 +123,10 @@
endif
endif
+ifdef JDK_TOPDIR
+ ANT_OPTIONS += -Djdk.topdir=$(JDK_TOPDIR)
+endif
+
# Default target and expected 'do everything' target
default: all
|
