[patch] Path for the build files

patch.txt (text/plain), 22.41 KB, created by Jochen Kuhnle on 2005-05-16 17:20:53 UTC

(hide)

Description: Path for the build files

Filename:

MIME Type:

Creator: Jochen Kuhnle

Created: 2005-05-16 17:20:53 UTC

Size: 22.41 KB

patch

obsolete

>Index: build.bat >=================================================================== >RCS file: /home/cvspublic/xml-batik/build.bat,v >retrieving revision 1.12 >diff -u -r1.12 build.bat >--- build.bat 18 Aug 2004 07:11:27 -0000 1.12 >+++ build.bat 16 May 2005 15:10:00 -0000 >@@ -31,8 +31,7 @@ > :: ----- Set Up The Runtime Classpath ----------------------------------------- > > >-set CP=%JAVA_HOME%\lib\tools.jar;lib\build\ant_1_4_1.jar;.\lib\build\crimson-ant.jar;.\lib\build\jaxp.jar >- >+set CP=%JAVA_HOME%\lib\tools.jar;lib\build\ant-1.6.2.jar;lib\build\ant-launcher-1.6.2.jar;.\lib\build\crimson-ant.jar;.\lib\build\jaxp.jar > > :: ----- Execute The Requested Build ------------------------------------------ > >Index: build.sh >=================================================================== >RCS file: /home/cvspublic/xml-batik/build.sh,v >retrieving revision 1.14 >diff -u -r1.14 build.sh >--- build.sh 18 Aug 2004 07:11:27 -0000 1.14 >+++ build.sh 16 May 2005 15:10:00 -0000 >@@ -44,7 +44,7 @@ > > # ----- Set Up The Runtime Classpath ------------------------------------------ > >-CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/build/ant_1_4_1.jar:./lib/build/crimson-ant.jar:./lib/build/jaxp.jar >+CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/build/ant-1.6.2.jar:$ANT_HOME/lib/build/ant-launcher-1.6.2.jar:./lib/build/crimson-ant.jar:./lib/build/jaxp.jar > > if $cygwin; then > JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` >Index: build.xml >=================================================================== >RCS file: /home/cvspublic/xml-batik/build.xml,v >retrieving revision 1.165 >diff -u -r1.165 build.xml >--- build.xml 10 Apr 2005 13:37:48 -0000 1.165 >+++ build.xml 16 May 2005 15:10:10 -0000 >@@ -114,6 +114,18 @@ > <property name="test-reports" value="test-reports" /> > <property name="test-references" value="test-references" /> > <property name="test-resources" value="test-resources" /> >+ >+ <property name="javac.source" value="1.2"/> >+ <property name="javac.target" value="1.1"/> >+ <condition property="javac.endorsed" value=""> >+ <or> >+ <equals arg1="${ant.java.version}" arg2="1.1"/> >+ <equals arg1="${ant.java.version}" arg2="1.2"/> >+ <equals arg1="${ant.java.version}" arg2="1.3"/> >+ <equals arg1="${ant.java.version}" arg2="1.4"/> >+ </or> >+ </condition> >+ <property name="javac.endorsed" value="-endorseddirs lib"/> > > <available property="rhino.present" classname="org.mozilla.javascript.Context"> > <classpath refid="libs-classpath"/> >@@ -161,8 +173,7 @@ > <include name="xml-apis.jar"/> > </fileset> > </path> >- >- >+ > <!-- Help ............................................................... --> > <target name ="help" > depends ="init" >@@ -296,8 +307,9 @@ > > <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/> > >- <javac srcdir="${testsrc}" destdir="${dest}" deprecation="${deprecation}" >+ <javac source="${javac.source}" target="${javac.target}" srcdir="${testsrc}" destdir="${dest}" deprecation="${deprecation}" > debug="${debug}" optimize="${optimize}" > >+ <compilerarg line="${javac.endorsed}"/> > <classpath> > <pathelement location="${dest}" /> > <path refid="libs-classpath"/> >@@ -321,8 +333,9 @@ > > <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/> > >- <javac srcdir="${samples}/tests/resources/java/sources" destdir="${samples}/tests/resources/java/classes" deprecation="${deprecation}" >+ <javac source="${javac.source}" target="${javac.target}" srcdir="${samples}/tests/resources/java/sources" destdir="${samples}/tests/resources/java/classes" deprecation="${deprecation}" > debug="${debug}" optimize="${optimize}" > >+ <compilerarg line="${javac.endorsed}"/> > <classpath> > <pathelement location="${dest}" /> > <pathelement location="${samples}/tests/resources/java/classes" /> >@@ -331,8 +344,9 @@ > </classpath> > </javac> > >- <javac srcdir="${testresources}" destdir="${testresources}/classes" deprecation="${deprecation}" >+ <javac source="${javac.source}" target="${javac.target}" srcdir="${testresources}" destdir="${testresources}/classes" deprecation="${deprecation}" > debug="${debug}" optimize="${optimize}" > >+ <compilerarg line="${javac.endorsed}"/> > <classpath> > <pathelement location="${dest}" /> > <pathelement location="${testresources}/classes" /> >@@ -402,8 +416,9 @@ > description="Compiles the source files"> > <mkdir dir="${dest}"/> > <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/> >- <javac srcdir="${src}" destdir="${dest}" deprecation="${deprecation}" >+ <javac source="${javac.source}" target="${javac.target}" srcdir="${src}" destdir="${dest}" deprecation="${deprecation}" > debug="${debug}" optimize="${optimize}"> >+ <compilerarg line="${javac.endorsed}"/> > <classpath refid="libs-classpath"/> > <exclude name="**/*.html"/> > <exclude name="**/rhino/*" unless="rhino.present"/> >Index: contrib/rasterizertask/build.bat >=================================================================== >RCS file: /home/cvspublic/xml-batik/contrib/rasterizertask/build.bat,v >retrieving revision 1.2 >diff -u -r1.2 build.bat >--- contrib/rasterizertask/build.bat 18 Aug 2004 07:11:28 -0000 1.2 >+++ contrib/rasterizertask/build.bat 16 May 2005 15:10:10 -0000 >@@ -38,7 +38,7 @@ > > REM ----- Set up classpath --------------------------------------------------- > >-SET CP=%JAVA_HOME%\lib\tools.jar;%ANT_HOME%\lib\build\ant_1_4_1.jar;%BATIK_HOME%\lib\build\crimson-ant.jar;%BATIK_HOME%\lib\build\jaxp.jar >+SET CP=%JAVA_HOME%\lib\tools.jar;%ANT_HOME%\lib\build\ant-1.6.2.jar;%ANT_HOME%\lib\build\ant-launcher-1.6.2.jar;%BATIK_HOME%\lib\build\crimson-ant.jar;%BATIK_HOME%\lib\build\jaxp.jar > SET CP=%CP%;%BATIK_HOME%\classes > > >Index: contrib/rasterizertask/build.sh >=================================================================== >RCS file: /home/cvspublic/xml-batik/contrib/rasterizertask/build.sh,v >retrieving revision 1.2 >diff -u -r1.2 build.sh >--- contrib/rasterizertask/build.sh 18 Aug 2004 07:11:28 -0000 1.2 >+++ contrib/rasterizertask/build.sh 16 May 2005 15:10:10 -0000 >@@ -39,7 +39,7 @@ > > # ----- Set up classpath --------------------------------------------------- > >-CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/build/ant_1_4_1.jar:$BATIK_HOME/lib/build/crimson-ant.jar:$BATIK_HOME/lib/build/jaxp.jar >+CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/build/ant-1.6.2.jar:$ANT_HOME/lib/build/ant-launcher-1.6.2.jar:$BATIK_HOME/lib/build/crimson-ant.jar:$BATIK_HOME/lib/build/jaxp.jar > > CP=$CP:$BATIK_HOME/classes > >Index: lib/build/LICENSE.ant_1_4_1.txt >=================================================================== >RCS file: lib/build/LICENSE.ant_1_4_1.txt >diff -N lib/build/LICENSE.ant_1_4_1.txt >--- lib/build/LICENSE.ant_1_4_1.txt 23 Feb 2002 16:24:42 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,2 +0,0 @@ >-The ant_1_4_1.jar file is under Apache license found in the xml-batik root >-directory in the LICENSE file. >Index: lib/build/LICENSE.ant-1.6.2.txt >=================================================================== >RCS file: lib/build/LICENSE.ant-1.6.2.txt >diff -N lib/build/LICENSE.ant-1.6.2.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ lib/build/LICENSE.ant-1.6.2.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,203 @@ >+/* >+ * Apache License >+ * Version 2.0, January 2004 >+ * http://www.apache.org/licenses/ >+ * >+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION >+ * >+ * 1. Definitions. >+ * >+ * "License" shall mean the terms and conditions for use, reproduction, >+ * and distribution as defined by Sections 1 through 9 of this document. >+ * >+ * "Licensor" shall mean the copyright owner or entity authorized by >+ * the copyright owner that is granting the License. >+ * >+ * "Legal Entity" shall mean the union of the acting entity and all >+ * other entities that control, are controlled by, or are under common >+ * control with that entity. For the purposes of this definition, >+ * "control" means (i) the power, direct or indirect, to cause the >+ * direction or management of such entity, whether by contract or >+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the >+ * outstanding shares, or (iii) beneficial ownership of such entity. >+ * >+ * "You" (or "Your") shall mean an individual or Legal Entity >+ * exercising permissions granted by this License. >+ * >+ * "Source" form shall mean the preferred form for making modifications, >+ * including but not limited to software source code, documentation >+ * source, and configuration files. >+ * >+ * "Object" form shall mean any form resulting from mechanical >+ * transformation or translation of a Source form, including but >+ * not limited to compiled object code, generated documentation, >+ * and conversions to other media types. >+ * >+ * "Work" shall mean the work of authorship, whether in Source or >+ * Object form, made available under the License, as indicated by a >+ * copyright notice that is included in or attached to the work >+ * (an example is provided in the Appendix below). >+ * >+ * "Derivative Works" shall mean any work, whether in Source or Object >+ * form, that is based on (or derived from) the Work and for which the >+ * editorial revisions, annotations, elaborations, or other modifications >+ * represent, as a whole, an original work of authorship. For the purposes >+ * of this License, Derivative Works shall not include works that remain >+ * separable from, or merely link (or bind by name) to the interfaces of, >+ * the Work and Derivative Works thereof. >+ * >+ * "Contribution" shall mean any work of authorship, including >+ * the original version of the Work and any modifications or additions >+ * to that Work or Derivative Works thereof, that is intentionally >+ * submitted to Licensor for inclusion in the Work by the copyright owner >+ * or by an individual or Legal Entity authorized to submit on behalf of >+ * the copyright owner. For the purposes of this definition, "submitted" >+ * means any form of electronic, verbal, or written communication sent >+ * to the Licensor or its representatives, including but not limited to >+ * communication on electronic mailing lists, source code control systems, >+ * and issue tracking systems that are managed by, or on behalf of, the >+ * Licensor for the purpose of discussing and improving the Work, but >+ * excluding communication that is conspicuously marked or otherwise >+ * designated in writing by the copyright owner as "Not a Contribution." >+ * >+ * "Contributor" shall mean Licensor and any individual or Legal Entity >+ * on behalf of whom a Contribution has been received by Licensor and >+ * subsequently incorporated within the Work. >+ * >+ * 2. Grant of Copyright License. Subject to the terms and conditions of >+ * this License, each Contributor hereby grants to You a perpetual, >+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable >+ * copyright license to reproduce, prepare Derivative Works of, >+ * publicly display, publicly perform, sublicense, and distribute the >+ * Work and such Derivative Works in Source or Object form. >+ * >+ * 3. Grant of Patent License. Subject to the terms and conditions of >+ * this License, each Contributor hereby grants to You a perpetual, >+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable >+ * (except as stated in this section) patent license to make, have made, >+ * use, offer to sell, sell, import, and otherwise transfer the Work, >+ * where such license applies only to those patent claims licensable >+ * by such Contributor that are necessarily infringed by their >+ * Contribution(s) alone or by combination of their Contribution(s) >+ * with the Work to which such Contribution(s) was submitted. If You >+ * institute patent litigation against any entity (including a >+ * cross-claim or counterclaim in a lawsuit) alleging that the Work >+ * or a Contribution incorporated within the Work constitutes direct >+ * or contributory patent infringement, then any patent licenses >+ * granted to You under this License for that Work shall terminate >+ * as of the date such litigation is filed. >+ * >+ * 4. Redistribution. You may reproduce and distribute copies of the >+ * Work or Derivative Works thereof in any medium, with or without >+ * modifications, and in Source or Object form, provided that You >+ * meet the following conditions: >+ * >+ * (a) You must give any other recipients of the Work or >+ * Derivative Works a copy of this License; and >+ * >+ * (b) You must cause any modified files to carry prominent notices >+ * stating that You changed the files; and >+ * >+ * (c) You must retain, in the Source form of any Derivative Works >+ * that You distribute, all copyright, patent, trademark, and >+ * attribution notices from the Source form of the Work, >+ * excluding those notices that do not pertain to any part of >+ * the Derivative Works; and >+ * >+ * (d) If the Work includes a "NOTICE" text file as part of its >+ * distribution, then any Derivative Works that You distribute must >+ * include a readable copy of the attribution notices contained >+ * within such NOTICE file, excluding those notices that do not >+ * pertain to any part of the Derivative Works, in at least one >+ * of the following places: within a NOTICE text file distributed >+ * as part of the Derivative Works; within the Source form or >+ * documentation, if provided along with the Derivative Works; or, >+ * within a display generated by the Derivative Works, if and >+ * wherever such third-party notices normally appear. The contents >+ * of the NOTICE file are for informational purposes only and >+ * do not modify the License. You may add Your own attribution >+ * notices within Derivative Works that You distribute, alongside >+ * or as an addendum to the NOTICE text from the Work, provided >+ * that such additional attribution notices cannot be construed >+ * as modifying the License. >+ * >+ * You may add Your own copyright statement to Your modifications and >+ * may provide additional or different license terms and conditions >+ * for use, reproduction, or distribution of Your modifications, or >+ * for any such Derivative Works as a whole, provided Your use, >+ * reproduction, and distribution of the Work otherwise complies with >+ * the conditions stated in this License. >+ * >+ * 5. Submission of Contributions. Unless You explicitly state otherwise, >+ * any Contribution intentionally submitted for inclusion in the Work >+ * by You to the Licensor shall be under the terms and conditions of >+ * this License, without any additional terms or conditions. >+ * Notwithstanding the above, nothing herein shall supersede or modify >+ * the terms of any separate license agreement you may have executed >+ * with Licensor regarding such Contributions. >+ * >+ * 6. Trademarks. This License does not grant permission to use the trade >+ * names, trademarks, service marks, or product names of the Licensor, >+ * except as required for reasonable and customary use in describing the >+ * origin of the Work and reproducing the content of the NOTICE file. >+ * >+ * 7. Disclaimer of Warranty. Unless required by applicable law or >+ * agreed to in writing, Licensor provides the Work (and each >+ * Contributor provides its Contributions) on an "AS IS" BASIS, >+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or >+ * implied, including, without limitation, any warranties or conditions >+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A >+ * PARTICULAR PURPOSE. You are solely responsible for determining the >+ * appropriateness of using or redistributing the Work and assume any >+ * risks associated with Your exercise of permissions under this License. >+ * >+ * 8. Limitation of Liability. In no event and under no legal theory, >+ * whether in tort (including negligence), contract, or otherwise, >+ * unless required by applicable law (such as deliberate and grossly >+ * negligent acts) or agreed to in writing, shall any Contributor be >+ * liable to You for damages, including any direct, indirect, special, >+ * incidental, or consequential damages of any character arising as a >+ * result of this License or out of the use or inability to use the >+ * Work (including but not limited to damages for loss of goodwill, >+ * work stoppage, computer failure or malfunction, or any and all >+ * other commercial damages or losses), even if such Contributor >+ * has been advised of the possibility of such damages. >+ * >+ * 9. Accepting Warranty or Additional Liability. While redistributing >+ * the Work or Derivative Works thereof, You may choose to offer, >+ * and charge a fee for, acceptance of support, warranty, indemnity, >+ * or other liability obligations and/or rights consistent with this >+ * License. However, in accepting such obligations, You may act only >+ * on Your own behalf and on Your sole responsibility, not on behalf >+ * of any other Contributor, and only if You agree to indemnify, >+ * defend, and hold each Contributor harmless for any liability >+ * incurred by, or claims asserted against, such Contributor by reason >+ * of your accepting any such warranty or additional liability. >+ * >+ * END OF TERMS AND CONDITIONS >+ * >+ * APPENDIX: How to apply the Apache License to your work. >+ * >+ * To apply the Apache License to your work, attach the following >+ * boilerplate notice, with the fields enclosed by brackets "[]" >+ * replaced with your own identifying information. (Don't include >+ * the brackets!) The text should be enclosed in the appropriate >+ * comment syntax for the file format. We also recommend that a >+ * file or class name and description of purpose be included on the >+ * same "printed page" as the copyright notice for easier >+ * identification within third-party archives. >+ * >+ * Copyright [yyyy] [name of copyright owner] >+ * >+ * Licensed under the Apache License, Version 2.0 (the "License"); >+ * you may not use this file except in compliance with the License. >+ * You may obtain a copy of the License at >+ * >+ * http://www.apache.org/licenses/LICENSE-2.0 >+ * >+ * Unless required by applicable law or agreed to in writing, software >+ * distributed under the License is distributed on an "AS IS" BASIS, >+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. >+ * See the License for the specific language governing permissions and >+ * limitations under the License. >+ */ >Index: lib/build/README.ant-1.6.2.txt >=================================================================== >RCS file: lib/build/README.ant-1.6.2.txt >diff -N lib/build/README.ant-1.6.2.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ lib/build/README.ant-1.6.2.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,70 @@ >+ >+ A N T >+ >+ >+ What is it? >+ ----------- >+ >+ Ant is a Java based build tool. In theory it is kind of like "make" >+ without makes wrinkles and with the full portability of pure java code. >+ >+ >+ Why? >+ ---- >+ >+ Why another build tool when there is already make, gnumake, nmake, jam, >+ and others? Because all of those tools have limitations that its original >+ author couldn't live with when developing software across multiple platforms. >+ >+ Make-like tools are inherently shell based. They evaluate a set of >+ dependencies and then execute commands not unlike what you would issue on a >+ shell. This means that you can easily extend these tools by using or writing >+ any program for the OS that you are working on. However, this also means that >+ you limit yourself to the OS, or at least the OS type such as Unix, that you >+ are working on. >+ >+ Makefiles are inherently evil as well. Anybody who has worked on them for any >+ time has run into the dreaded tab problem. "Is my command not executing >+ because I have a space in front of my tab!!!" said the original author of Ant >+ way too many times. Tools like Jam took care of this to a great degree, but >+ still use yet another format to use and remember. >+ >+ Ant is different. Instead a model where it is extended with shell based >+ commands, it is extended using Java classes. Instead of writing shell >+ commands, the configuration files are XML based calling out a target tree >+ where various tasks get executed. Each task is run by an object which >+ implements a particular Task interface. >+ >+ Granted, this removes some of the expressive power that is inherent by being >+ able to construct a shell command such as `find . -name foo -exec rm {}` but >+ it gives you the ability to be cross platform. To work anywhere and >+ everywhere. And hey, if you really need to execute a shell command, Ant has >+ an exec rule that allows different commands to be executed based on the OS >+ that it is executing on. >+ >+ The Latest Version >+ ------------------ >+ >+ Details of the latest version can be found on the Apache Ant >+ Project web site <http://ant.apache.org/>. >+ >+ >+ Documentation >+ ------------- >+ >+ Documentation is available in HTML format, in the docs/ directory. >+ For information about building and installing Ant, see >+ docs/manual/index.html >+ >+ >+ Licensing >+ --------- >+ >+ This software is licensed under the terms you may find in the file >+ named "LICENSE" in this directory. >+ >+ >+ Thanks for using Ant. >+ >+ The Apache Ant Project >+ <http://ant.apache.org/> View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]