Merge
This commit is contained in:
commit
93603c443d
jaxws
@ -43,14 +43,6 @@
|
|||||||
Run 'make help' for help using the Makefile.
|
Run 'make help' for help using the Makefile.
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<!-- Mac is special, need to downgrade these before build.properties. -->
|
|
||||||
<condition property="javac.source" value="1.5">
|
|
||||||
<os family="mac"/>
|
|
||||||
</condition>
|
|
||||||
<condition property="javac.target" value="1.5">
|
|
||||||
<os family="mac"/>
|
|
||||||
</condition>
|
|
||||||
|
|
||||||
<!-- Project build properties. -->
|
<!-- Project build properties. -->
|
||||||
<property file="build.properties"/>
|
<property file="build.properties"/>
|
||||||
|
|
||||||
|
@ -25,21 +25,21 @@
|
|||||||
|
|
||||||
# Properties for jprt
|
# Properties for jprt
|
||||||
|
|
||||||
# The release to build
|
# Locked down to jdk8
|
||||||
jprt.tools.default.release=jdk8
|
jprt.tools.default.release=jdk8
|
||||||
|
|
||||||
# The different build flavors we want, we override here so we just get these 2
|
# The different build flavors we want, we override here so we just get these 2
|
||||||
jprt.build.flavors=product,fastdebug
|
jprt.build.flavors=product,fastdebug
|
||||||
|
|
||||||
# Standard list of jprt build targets for this source tree
|
# Standard list of jprt build targets for this source tree
|
||||||
jprt.build.targets= \
|
jprt.build.targets= \
|
||||||
solaris_sparc_5.10-{product|fastdebug}, \
|
solaris_sparc_5.10-{product|fastdebug}, \
|
||||||
solaris_sparcv9_5.10-{product|fastdebug}, \
|
solaris_sparcv9_5.10-{product|fastdebug}, \
|
||||||
solaris_i586_5.10-{product|fastdebug}, \
|
solaris_i586_5.10-{product|fastdebug}, \
|
||||||
solaris_x64_5.10-{product|fastdebug}, \
|
solaris_x64_5.10-{product|fastdebug}, \
|
||||||
linux_i586_2.6-{product|fastdebug}, \
|
linux_i586_2.6-{product|fastdebug}, \
|
||||||
linux_x64_2.6-{product|fastdebug}, \
|
linux_x64_2.6-{product|fastdebug}, \
|
||||||
windows_i586_5.1-{product|fastdebug}, \
|
windows_i586_5.1-{product|fastdebug}, \
|
||||||
windows_x64_5.2-{product|fastdebug}
|
windows_x64_5.2-{product|fastdebug}
|
||||||
|
|
||||||
# Directories to be excluded from the source bundles
|
# Directories to be excluded from the source bundles
|
||||||
|
Loading…
x
Reference in New Issue
Block a user