Mercurial > hg > release > icedtea7-forest-2.5 > jaxp
changeset 162:e7b1b9d4349f
Merge
| author | andrew |
|---|---|
| date | Thu, 29 Jul 2010 18:07:36 +0100 |
| parents | e7150c6d11d4 (current diff) 15573625af97 (diff) |
| children | 0163ae9cb173 |
| files | .hgtags build.properties jaxp.properties make/Makefile |
| diffstat | 8 files changed, 127 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jul 29 03:14:19 2010 +0100 +++ b/.hgtags Thu Jul 29 18:07:36 2010 +0100 @@ -65,3 +65,16 @@ 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13 +d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 +c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 +b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 +e6a40e4bb10499fb6ee9db71ab5654e5a17ab75b jdk7-b92 +c725ca829c5aa4b50a8ed5728579ec8809fbfb1d jdk7-b93 +2de307cd3b4e71127e75dff70809c1b1fbc1a494 jdk7-b94 +07050840f98cda357aa6a8d416fdccbd03038d35 jdk7-b95 +9510ed0e1c7ab46a8b6659234e1dc7786407a72b jdk7-b96 +ca01ec32561fee1855630b68a2fcd0042257a8ef jdk7-b97 +d4adf4f2d14c7b79df0a81de884b6b57c6850802 jdk7-b98 +7ef8469021fbc824ac49d57c83a14b1bb08f1766 jdk7-b99 +d524be5ef62e8b8cb890c59a5d2c19ef0ab50d45 jdk7-b100 +17f62a566a2020fd908e77106ed885e0c4e7c14d jdk7-b101
--- a/build-defs.xml Thu Jul 29 03:14:19 2010 +0100 +++ b/build-defs.xml Thu Jul 29 18:07:36 2010 +0100 @@ -1,13 +1,13 @@ <?xml version="1.0"?> <!-- - Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 only, as - published by the Free Software Foundation. Sun designates this + published by the Free Software Foundation. Oracle designates this particular file as subject to the "Classpath" exception as provided - by Sun in the LICENSE file that accompanied this code. + by Oracle in the LICENSE file that accompanied this code. This code is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,9 +19,9 @@ 2 along with this work; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - CA 95054 USA or visit www.sun.com if you need additional information or - have any questions. + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + or visit www.oracle.com if you need additional information or have any + questions. --> <project name="jaxp_defs" default="all" basedir="."> @@ -55,9 +55,29 @@ <drop-import name="jaxp_src"/> <!-- <drop-import name="jaxp_tests"/> --> + <!-- Fail and print helpful messages if source does not exist. --> + <target name="-src-help"> + <fail message="${failed.url.src.message}"> + <condition> + <and> + <not> + <available file="${jaxp_src.src.dir}" type="dir"/> + </not> + <istrue value="${allow.downloads}"/> + </and> + </condition> + </fail> + <fail message="${failed.nourl.src.message}"> + <condition> + <not> + <available file="${jaxp_src.src.dir}" type="dir"/> + </not> + </condition> + </fail> + </target> - <!-- Special build area preparation. --> - <target name="-drop-build-prep" depends="init, -init-src-dirs"> + <!-- Special build area setup. --> + <target name="-drop-build-setup" depends="init, -init-src-dirs"> <mkdir dir="${build.classes.dir}"/> <copy todir="${build.classes.dir}"> <fileset dir="${primary.src.dir}" @@ -84,7 +104,7 @@ <!-- Source directory selection. --> <target name="-init-src-dirs" - depends="init, -use-drop"> + depends="init, -use-drop,-src-help"> <echo message="Using primary.src.dir=${primary.src.dir}"/> <pathconvert property="src.list.id" refid="src.dir.id"/> <echo message="Using src.dir.id=${src.list.id}"/>
--- a/build-drop-template.xml Thu Jul 29 03:14:19 2010 +0100 +++ b/build-drop-template.xml Thu Jul 29 18:07:36 2010 +0100 @@ -1,13 +1,13 @@ <?xml version="1.0"?> <!-- - Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 only, as - published by the Free Software Foundation. Sun designates this + published by the Free Software Foundation. Oracle designates this particular file as subject to the "Classpath" exception as provided - by Sun in the LICENSE file that accompanied this code. + by Oracle in the LICENSE file that accompanied this code. This code is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,9 +19,9 @@ 2 along with this work; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - CA 95054 USA or visit www.sun.com if you need additional information or - have any questions. + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + or visit www.oracle.com if you need additional information or have any + questions. --> <project name="@DROP@-drop" default="all" basedir="."> @@ -75,6 +75,7 @@ <target name="-@DROP@-url-should-be-used" unless="@DROP@.url.should.be.used"> <condition property="@DROP@.url.should.be.used"> <and> + <istrue value="${allow.downloads}"/> <not> <isset property="@DROP@.master.bundle.copy.exists"/> </not>
--- a/build.properties Thu Jul 29 03:14:19 2010 +0100 +++ b/build.properties Thu Jul 29 18:07:36 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 2 along with this work; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. # -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. # # Base locations where bundles are located @@ -104,4 +104,24 @@ drops.dir=${drops.dir}${line.separator}\ ${line.separator} +# Failure messages when source cannot be found on the file system +failed.nourl.src.message=\ +ERROR: Cannot find source for project ${ant.project.name}.\ +${line.separator}${line.separator}\ +HINT: Try setting drops.dir to indicate where the bundles can be found, \ +or try setting the ant property allow.downloads=true to download the bundle from the URL.\ +${line.separator}\ +e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \ +${line.separator} + +# Failure message when source cannot be downloaded +failed.url.src.message=\ +ERROR: Cannot find source for project ${ant.project.name}.\ +${line.separator}${line.separator}\ +HINT: Try setting drops.dir to indicate where the bundles can be found, \ +or try checking the URL with your browser.\ +${line.separator}\ +e.g. ant -Ddrops.dir=some_directory \ +${line.separator} + #------------------------------------------------------------
--- a/build.xml Thu Jul 29 03:14:19 2010 +0100 +++ b/build.xml Thu Jul 29 18:07:36 2010 +0100 @@ -1,13 +1,13 @@ <?xml version="1.0"?> <!-- - Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 only, as - published by the Free Software Foundation. Sun designates this + published by the Free Software Foundation. Oracle designates this particular file as subject to the "Classpath" exception as provided - by Sun in the LICENSE file that accompanied this code. + by Oracle in the LICENSE file that accompanied this code. This code is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,9 +19,9 @@ 2 along with this work; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - CA 95054 USA or visit www.sun.com if you need additional information or - have any questions. + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + or visit www.oracle.com if you need additional information or have any + questions. --> <project name="jaxp" default="all" basedir="."> @@ -36,6 +36,11 @@ javac.debug - true or false for debug classfiles javac.target - classfile version target javac.source - source version + drops.dir - directory that holds source drop bundles + allow.download - permit downloads from public url (default is false) + (used if bundles not found in drops.dir) + + Run 'make help' for help using the Makefile. </description> <!-- Mac is special, need to downgrade these before build.properties. --> @@ -106,16 +111,20 @@ <jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/> </target> - <target name="-build-prep" - depends="init, -init-src-dirs, -drop-build-prep"> + <target name="-build-setup" + depends="init, -init-src-dirs, -drop-build-setup"> </target> <!-- Build (compilation) of sources to class files. --> <target name="build" - depends="init, -init-src-dirs, -build-prep"> + depends="compile, -build-setup"> + </target> + <target name="compile" + depends="init, -init-src-dirs"> + <mkdir dir="${build.classes.dir}"/> <javac - includeAntRuntime="false" - classpath="${build.classes.dir}" + includeAntRuntime="false" + classpath="${build.classes.dir}:${tools.jar}" fork="true" destdir="${build.classes.dir}" memoryInitialSize="${javac.memoryInitialSize}"
--- a/jaxp.properties Thu Jul 29 03:14:19 2010 +0100 +++ b/jaxp.properties Thu Jul 29 18:07:36 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,19 +18,19 @@ # 2 along with this work; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. # -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. # drops.master.copy.base=${drops.dir} -drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/147490 -jaxp_src.bundle.name=jdk7-jaxp-m6.zip -jaxp_src.bundle.md5.checksum=080827d779c114365f8504bd79b34604 +jaxp_src.bundle.name=jdk7-jaxp-m7.zip +jaxp_src.bundle.md5.checksum=22e95fbdb9fb7d8b6b6fc0a1d76d1fbd jaxp_src.master.bundle.dir=${drops.master.copy.base} -jaxp_src.master.bundle.url.base=${drops.master.url.base} +jaxp_src.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/150785 -jaxp_tests.bundle.name=jdk7-jaxp-tests-2009_08_28.zip -jaxp_tests.master.bundle.dir=${drops.master.copy.base} -jaxp_tests.master.bundle.url.base=${drops.master.url.base} +#jaxp_tests.bundle.name=jdk7-jaxp-tests-2009_08_28.zip +#jaxp_tests.master.bundle.dir=${drops.master.copy.base} +#jaxp_tests.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/147490 +
--- a/make/Makefile Thu Jul 29 03:14:19 2010 +0100 +++ b/make/Makefile Thu Jul 29 18:07:36 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 2 along with this work; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. # -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. # # Makefile wrapper around Ant build.xml file @@ -65,6 +65,11 @@ endif endif +# If downloads are allowed +ifeq ($(ALLOW_DOWNLOADS),true) + ANT_OPTIONS += -Dallow.downloads=true +endif + # Figure out the platform we are using _SYSTEM_UNAME := $(shell uname) _PLATFORM_KIND = unix @@ -159,6 +164,8 @@ @echo " $(ANT_TARGETS)" @echo " " @echo " Environment or command line variables (all optional):" + $(call helpenvline, ALT_DROPS_DIR,\ + "Directory that contains the drop source bundles i.e. drops.dir") $(call helpenvline, ALT_BOOTDIR,\ "JAVA_HOME to use when running ant") $(call helpenvline, ALT_LANGTOOLS_DIST,\
--- a/make/jprt.properties Thu Jul 29 03:14:19 2010 +0100 +++ b/make/jprt.properties Thu Jul 29 18:07:36 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 2 along with this work; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. # -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. # # Properties for jprt