Mercurial > jdk8-mips64-public > jaxws / changeset
changeset
Merge
Tue, 29 Jun 2010 22:31:40 -0700
- author
- lana
- date
- Tue, 29 Jun 2010 22:31:40 -0700
- changeset 126
- bd26d0ce0c3c
- parent 122
- 5bca7bc114a0
- parent 125
- db63f482182d
- child 127
- b55ce2744900
Merge
1.1 --- a/build-defs.xml Thu Jun 24 20:03:05 2010 -0700 1.2 +++ b/build-defs.xml Tue Jun 29 22:31:40 2010 -0700 1.3 @@ -55,9 +55,36 @@ 1.4 <drop-import name="jaxws_src"/> 1.5 <drop-import name="jaf_src"/> 1.6 <!-- <drop-import name="jaxws_tests"/> --> 1.7 + 1.8 + <!-- Fail and print helpful messages if source does not exist. --> 1.9 + <target name="-src-help"> 1.10 + <fail message="${failed.url.src.message}"> 1.11 + <condition> 1.12 + <and> 1.13 + <not> 1.14 + <and> 1.15 + <available file="${jaxws_src.src.dir}" type="dir"/> 1.16 + <available file="${jaf_src.src.dir}" type="dir"/> 1.17 + </and> 1.18 + </not> 1.19 + <istrue value="${allow.downloads}"/> 1.20 + </and> 1.21 + </condition> 1.22 + </fail> 1.23 + <fail message="${failed.nourl.src.message}"> 1.24 + <condition> 1.25 + <not> 1.26 + <and> 1.27 + <available file="${jaxws_src.src.dir}" type="dir"/> 1.28 + <available file="${jaf_src.src.dir}" type="dir"/> 1.29 + </and> 1.30 + </not> 1.31 + </condition> 1.32 + </fail> 1.33 + </target> 1.34 1.35 - <!-- Special build area preparation. --> 1.36 - <target name="-drop-build-prep" depends="init, -init-src-dirs"> 1.37 + <!-- Special build area setup. --> 1.38 + <target name="-drop-build-setup" depends="init, -init-src-dirs"> 1.39 <mkdir dir="${build.classes.dir}"/> 1.40 <copy todir="${build.classes.dir}"> 1.41 <fileset dir="${primary.src.dir}" 1.42 @@ -99,7 +126,7 @@ 1.43 1.44 <!-- Source directory selection. --> 1.45 <target name="-init-src-dirs" 1.46 - depends="init, -use-drop"> 1.47 + depends="init, -use-drop,-src-help"> 1.48 <echo message="Using primary.src.dir=${primary.src.dir}"/> 1.49 <pathconvert property="src.list.id" refid="src.dir.id"/> 1.50 <echo message="Using src.dir.id=${src.list.id}"/>
2.1 --- a/build-drop-template.xml Thu Jun 24 20:03:05 2010 -0700 2.2 +++ b/build-drop-template.xml Tue Jun 29 22:31:40 2010 -0700 2.3 @@ -75,6 +75,7 @@ 2.4 <target name="-@DROP@-url-should-be-used" unless="@DROP@.url.should.be.used"> 2.5 <condition property="@DROP@.url.should.be.used"> 2.6 <and> 2.7 + <istrue value="${allow.downloads}"/> 2.8 <not> 2.9 <isset property="@DROP@.master.bundle.copy.exists"/> 2.10 </not>
3.1 --- a/build.properties Thu Jun 24 20:03:05 2010 -0700 3.2 +++ b/build.properties Tue Jun 29 22:31:40 2010 -0700 3.3 @@ -104,4 +104,24 @@ 3.4 drops.dir=${drops.dir}${line.separator}\ 3.5 ${line.separator} 3.6 3.7 +# Failure messages when source cannot be found on the file system 3.8 +failed.nourl.src.message=\ 3.9 +ERROR: Cannot find source for project ${ant.project.name}.\ 3.10 +${line.separator}${line.separator}\ 3.11 +HINT: Try setting drops.dir to indicate where the bundles can be found, \ 3.12 +or try setting the ant property allow.downloads=true to download the bundle from the URL.\ 3.13 +${line.separator}\ 3.14 +e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \ 3.15 +${line.separator} 3.16 + 3.17 +# Failure message when source cannot be downloaded 3.18 +failed.url.src.message=\ 3.19 +ERROR: Cannot find source for project ${ant.project.name}.\ 3.20 +${line.separator}${line.separator}\ 3.21 +HINT: Try setting drops.dir to indicate where the bundles can be found, \ 3.22 +or try checking the URL with your browser.\ 3.23 +${line.separator}\ 3.24 +e.g. ant -Ddrops.dir=some_directory \ 3.25 +${line.separator} 3.26 + 3.27 #------------------------------------------------------------
4.1 --- a/build.xml Thu Jun 24 20:03:05 2010 -0700 4.2 +++ b/build.xml Tue Jun 29 22:31:40 2010 -0700 4.3 @@ -36,6 +36,11 @@ 4.4 javac.debug - true or false for debug classfiles 4.5 javac.target - classfile version target 4.6 javac.source - source version 4.7 + drops.dir - directory that holds source drop bundles 4.8 + allow.download - permit downloads from public url (default is false) 4.9 + (used if bundles not found in drops.dir) 4.10 + 4.11 + Run 'make help' for help using the Makefile. 4.12 </description> 4.13 4.14 <!-- Mac is special, need to downgrade these before build.properties. --> 4.15 @@ -106,13 +111,17 @@ 4.16 <jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/> 4.17 </target> 4.18 4.19 - <target name="-build-prep" 4.20 - depends="init, -init-src-dirs, -drop-build-prep"> 4.21 + <target name="-build-setup" 4.22 + depends="init, -init-src-dirs, -drop-build-setup"> 4.23 </target> 4.24 4.25 <!-- Build (compilation) of sources to class files. --> 4.26 <target name="build" 4.27 - depends="init, -init-src-dirs, -build-prep"> 4.28 + depends="compile, -build-setup"> 4.29 + </target> 4.30 + <target name="compile" 4.31 + depends="init, -init-src-dirs"> 4.32 + <mkdir dir="${build.classes.dir}"/> 4.33 <javac 4.34 includeAntRuntime="false" 4.35 classpath="${build.classes.dir}:${tools.jar}"
5.1 --- a/jaxws.properties Thu Jun 24 20:03:05 2010 -0700 5.2 +++ b/jaxws.properties Tue Jun 29 22:31:40 2010 -0700 5.3 @@ -24,19 +24,18 @@ 5.4 # 5.5 5.6 drops.master.copy.base=${drops.dir} 5.7 -drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download 5.8 5.9 -jaxws_src.bundle.name=jdk7-jaxws-2009_09_28.zip 5.10 -jaxws_src.bundle.md5.checksum=f5010ebf636db9f465a61a7a74944543 5.11 +jaxws_src.bundle.name=jdk7-jaxws-b100.zip 5.12 +jaxws_src.bundle.md5.checksum=e4fea255c6222b118bb1d0d3054d36e1 5.13 jaxws_src.master.bundle.dir=${drops.master.copy.base} 5.14 -#jaxws_src.bundle.url.base=https://jaxws.dev.java.net/files/documents/913/142147 5.15 -jaxws_src.master.bundle.url.base=${drops.master.url.base} 5.16 +jaxws_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/150896 5.17 5.18 jaf_src.bundle.name=jdk7-jaf-2009_08_28.zip 5.19 jaf_src.bundle.md5.checksum=eb8cb7a4a7f14e211fbe2354878a2472 5.20 jaf_src.master.bundle.dir=${drops.master.copy.base} 5.21 -jaf_src.master.bundle.url.base=${drops.master.url.base} 5.22 +jaf_src.master.bundle.url.base=http://kenai.com/projects/jdk7-drops/downloads/download 5.23 5.24 -jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip 5.25 -jaxws_tests.master.bundle.dir=${drops.master.copy.base} 5.26 -jaxws_tests.master.bundle.url.base=${drops.master.url.base} 5.27 +#jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip 5.28 +#jaxws_tests.master.bundle.dir=${drops.master.copy.base} 5.29 +#jaxws_tests.master.bundle.url.base=http://kenai.com/projects/jdk7-drops/downloads/download 5.30 +
6.1 --- a/make/Makefile Thu Jun 24 20:03:05 2010 -0700 6.2 +++ b/make/Makefile Tue Jun 29 22:31:40 2010 -0700 6.3 @@ -65,6 +65,11 @@ 6.4 endif 6.5 endif 6.6 6.7 +# If downloads are allowed 6.8 +ifeq ($(ALLOW_DOWNLOADS),true) 6.9 + ANT_OPTIONS += -Dallow.downloads=true 6.10 +endif 6.11 + 6.12 # Figure out the platform we are using 6.13 _SYSTEM_UNAME := $(shell uname) 6.14 _PLATFORM_KIND = unix 6.15 @@ -159,6 +164,8 @@ 6.16 @echo " $(ANT_TARGETS)" 6.17 @echo " " 6.18 @echo " Environment or command line variables (all optional):" 6.19 + $(call helpenvline, ALT_DROPS_DIR,\ 6.20 + "Directory that contains the drop source bundles i.e. drops.dir") 6.21 $(call helpenvline, ALT_BOOTDIR,\ 6.22 "JAVA_HOME to use when running ant") 6.23 $(call helpenvline, ALT_LANGTOOLS_DIST,\
