View | Details | Raw Unified | Return to bug 34938
Collapse All | Expand All

(-)build.bat (-2 / +1 lines)
Lines 31-38 Link Here
31
:: ----- Set Up The Runtime Classpath -----------------------------------------
31
:: ----- Set Up The Runtime Classpath -----------------------------------------
32
32
33
33
34
set CP=%JAVA_HOME%\lib\tools.jar;lib\build\ant_1_4_1.jar;.\lib\build\crimson-ant.jar;.\lib\build\jaxp.jar
34
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
35
 
36
35
37
:: ----- Execute The Requested Build ------------------------------------------
36
:: ----- Execute The Requested Build ------------------------------------------
38
37
(-)build.sh (-1 / +1 lines)
Lines 44-50 Link Here
44
44
45
# ----- Set Up The Runtime Classpath ------------------------------------------
45
# ----- Set Up The Runtime Classpath ------------------------------------------
46
46
47
CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/build/ant_1_4_1.jar:./lib/build/crimson-ant.jar:./lib/build/jaxp.jar
47
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
48
48
49
if $cygwin; then
49
if $cygwin; then
50
  JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
50
  JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
(-)build.xml (-6 / +21 lines)
Lines 114-119 Link Here
114
    <property name="test-reports"       value="test-reports" />
114
    <property name="test-reports"       value="test-reports" />
115
    <property name="test-references"    value="test-references" />
115
    <property name="test-references"    value="test-references" />
116
    <property name="test-resources"     value="test-resources" />
116
    <property name="test-resources"     value="test-resources" />
117
    
118
    <property name="javac.source"       value="1.2"/>
119
    <property name="javac.target"       value="1.1"/>
120
    <condition property="javac.endorsed" value="">
121
      <or>
122
        <equals arg1="${ant.java.version}" arg2="1.1"/>
123
        <equals arg1="${ant.java.version}" arg2="1.2"/>
124
        <equals arg1="${ant.java.version}" arg2="1.3"/>
125
        <equals arg1="${ant.java.version}" arg2="1.4"/>
126
      </or>
127
	</condition>
128
    <property name="javac.endorsed" value="-endorseddirs lib"/>
117
129
118
    <available property="rhino.present" classname="org.mozilla.javascript.Context">
130
    <available property="rhino.present" classname="org.mozilla.javascript.Context">
119
      <classpath refid="libs-classpath"/>
131
      <classpath refid="libs-classpath"/>
Lines 161-168 Link Here
161
      <include name="xml-apis.jar"/>
173
      <include name="xml-apis.jar"/>
162
    </fileset>
174
    </fileset>
163
  </path>
175
  </path>
164
176
  
165
166
  <!-- Help ............................................................... -->
177
  <!-- Help ............................................................... -->
167
  <target name       ="help"
178
  <target name       ="help"
168
          depends    ="init"
179
          depends    ="init"
Lines 296-303 Link Here
296
307
297
    <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
308
    <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
298
309
299
    <javac srcdir="${testsrc}" destdir="${dest}"  deprecation="${deprecation}" 
310
    <javac source="${javac.source}" target="${javac.target}" srcdir="${testsrc}" destdir="${dest}"  deprecation="${deprecation}" 
300
           debug="${debug}" optimize="${optimize}" >
311
           debug="${debug}" optimize="${optimize}" >
312
      <compilerarg line="${javac.endorsed}"/>
301
      <classpath>
313
      <classpath>
302
        <pathelement location="${dest}" />
314
        <pathelement location="${dest}" />
303
        <path refid="libs-classpath"/>
315
        <path refid="libs-classpath"/>
Lines 321-328 Link Here
321
333
322
    <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
334
    <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
323
335
324
    <javac srcdir="${samples}/tests/resources/java/sources" destdir="${samples}/tests/resources/java/classes"  deprecation="${deprecation}" 
336
    <javac source="${javac.source}" target="${javac.target}" srcdir="${samples}/tests/resources/java/sources" destdir="${samples}/tests/resources/java/classes"  deprecation="${deprecation}" 
325
           debug="${debug}" optimize="${optimize}" >
337
           debug="${debug}" optimize="${optimize}" >
338
      <compilerarg line="${javac.endorsed}"/>
326
      <classpath>
339
      <classpath>
327
        <pathelement location="${dest}" />
340
        <pathelement location="${dest}" />
328
        <pathelement location="${samples}/tests/resources/java/classes" />
341
        <pathelement location="${samples}/tests/resources/java/classes" />
Lines 331-338 Link Here
331
      </classpath>
344
      </classpath>
332
    </javac>
345
    </javac>
333
346
334
    <javac srcdir="${testresources}" destdir="${testresources}/classes"  deprecation="${deprecation}" 
347
    <javac source="${javac.source}" target="${javac.target}" srcdir="${testresources}" destdir="${testresources}/classes"  deprecation="${deprecation}" 
335
           debug="${debug}" optimize="${optimize}" >
348
           debug="${debug}" optimize="${optimize}" >
349
      <compilerarg line="${javac.endorsed}"/>
336
      <classpath>
350
      <classpath>
337
        <pathelement location="${dest}" />
351
        <pathelement location="${dest}" />
338
        <pathelement location="${testresources}/classes" />
352
        <pathelement location="${testresources}/classes" />
Lines 402-409 Link Here
402
          description="Compiles the source files">
416
          description="Compiles the source files">
403
    <mkdir dir="${dest}"/>
417
    <mkdir dir="${dest}"/>
404
    <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
418
    <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
405
    <javac srcdir="${src}" destdir="${dest}" deprecation="${deprecation}" 
419
    <javac source="${javac.source}" target="${javac.target}" srcdir="${src}" destdir="${dest}" deprecation="${deprecation}" 
406
           debug="${debug}" optimize="${optimize}">
420
           debug="${debug}" optimize="${optimize}">
421
      <compilerarg line="${javac.endorsed}"/>
407
      <classpath refid="libs-classpath"/>
422
      <classpath refid="libs-classpath"/>
408
      <exclude name="**/*.html"/>
423
      <exclude name="**/*.html"/>
409
      <exclude name="**/rhino/*" unless="rhino.present"/>      
424
      <exclude name="**/rhino/*" unless="rhino.present"/>      
(-)contrib/rasterizertask/build.bat (-1 / +1 lines)
Lines 38-44 Link Here
38
38
39
REM ----- Set up classpath ---------------------------------------------------
39
REM ----- Set up classpath ---------------------------------------------------
40
40
41
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
41
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
42
SET CP=%CP%;%BATIK_HOME%\classes
42
SET CP=%CP%;%BATIK_HOME%\classes
43
43
44
44
(-)contrib/rasterizertask/build.sh (-1 / +1 lines)
Lines 39-45 Link Here
39
39
40
# ----- Set up classpath ---------------------------------------------------
40
# ----- Set up classpath ---------------------------------------------------
41
41
42
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
42
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
43
43
44
CP=$CP:$BATIK_HOME/classes
44
CP=$CP:$BATIK_HOME/classes
45
45
(-)lib/build/LICENSE.ant_1_4_1.txt (-2 lines)
Removed Link Here
1
The ant_1_4_1.jar file is under Apache license found in the xml-batik root 
2
directory in the LICENSE file.
(-)lib/build/LICENSE.ant-1.6.2.txt (+203 lines)
Added Link Here
1
/*
2
 *                                 Apache License
3
 *                           Version 2.0, January 2004
4
 *                        http://www.apache.org/licenses/
5
 *
6
 *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
 *
8
 *   1. Definitions.
9
 *
10
 *      "License" shall mean the terms and conditions for use, reproduction,
11
 *      and distribution as defined by Sections 1 through 9 of this document.
12
 *
13
 *      "Licensor" shall mean the copyright owner or entity authorized by
14
 *      the copyright owner that is granting the License.
15
 *
16
 *      "Legal Entity" shall mean the union of the acting entity and all
17
 *      other entities that control, are controlled by, or are under common
18
 *      control with that entity. For the purposes of this definition,
19
 *      "control" means (i) the power, direct or indirect, to cause the
20
 *      direction or management of such entity, whether by contract or
21
 *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
 *      outstanding shares, or (iii) beneficial ownership of such entity.
23
 *
24
 *      "You" (or "Your") shall mean an individual or Legal Entity
25
 *      exercising permissions granted by this License.
26
 *
27
 *      "Source" form shall mean the preferred form for making modifications,
28
 *      including but not limited to software source code, documentation
29
 *      source, and configuration files.
30
 *
31
 *      "Object" form shall mean any form resulting from mechanical
32
 *      transformation or translation of a Source form, including but
33
 *      not limited to compiled object code, generated documentation,
34
 *      and conversions to other media types.
35
 *
36
 *      "Work" shall mean the work of authorship, whether in Source or
37
 *      Object form, made available under the License, as indicated by a
38
 *      copyright notice that is included in or attached to the work
39
 *      (an example is provided in the Appendix below).
40
 *
41
 *      "Derivative Works" shall mean any work, whether in Source or Object
42
 *      form, that is based on (or derived from) the Work and for which the
43
 *      editorial revisions, annotations, elaborations, or other modifications
44
 *      represent, as a whole, an original work of authorship. For the purposes
45
 *      of this License, Derivative Works shall not include works that remain
46
 *      separable from, or merely link (or bind by name) to the interfaces of,
47
 *      the Work and Derivative Works thereof.
48
 *
49
 *      "Contribution" shall mean any work of authorship, including
50
 *      the original version of the Work and any modifications or additions
51
 *      to that Work or Derivative Works thereof, that is intentionally
52
 *      submitted to Licensor for inclusion in the Work by the copyright owner
53
 *      or by an individual or Legal Entity authorized to submit on behalf of
54
 *      the copyright owner. For the purposes of this definition, "submitted"
55
 *      means any form of electronic, verbal, or written communication sent
56
 *      to the Licensor or its representatives, including but not limited to
57
 *      communication on electronic mailing lists, source code control systems,
58
 *      and issue tracking systems that are managed by, or on behalf of, the
59
 *      Licensor for the purpose of discussing and improving the Work, but
60
 *      excluding communication that is conspicuously marked or otherwise
61
 *      designated in writing by the copyright owner as "Not a Contribution."
62
 *
63
 *      "Contributor" shall mean Licensor and any individual or Legal Entity
64
 *      on behalf of whom a Contribution has been received by Licensor and
65
 *      subsequently incorporated within the Work.
66
 *
67
 *   2. Grant of Copyright License. Subject to the terms and conditions of
68
 *      this License, each Contributor hereby grants to You a perpetual,
69
 *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
 *      copyright license to reproduce, prepare Derivative Works of,
71
 *      publicly display, publicly perform, sublicense, and distribute the
72
 *      Work and such Derivative Works in Source or Object form.
73
 *
74
 *   3. Grant of Patent License. Subject to the terms and conditions of
75
 *      this License, each Contributor hereby grants to You a perpetual,
76
 *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
 *      (except as stated in this section) patent license to make, have made,
78
 *      use, offer to sell, sell, import, and otherwise transfer the Work,
79
 *      where such license applies only to those patent claims licensable
80
 *      by such Contributor that are necessarily infringed by their
81
 *      Contribution(s) alone or by combination of their Contribution(s)
82
 *      with the Work to which such Contribution(s) was submitted. If You
83
 *      institute patent litigation against any entity (including a
84
 *      cross-claim or counterclaim in a lawsuit) alleging that the Work
85
 *      or a Contribution incorporated within the Work constitutes direct
86
 *      or contributory patent infringement, then any patent licenses
87
 *      granted to You under this License for that Work shall terminate
88
 *      as of the date such litigation is filed.
89
 *
90
 *   4. Redistribution. You may reproduce and distribute copies of the
91
 *      Work or Derivative Works thereof in any medium, with or without
92
 *      modifications, and in Source or Object form, provided that You
93
 *      meet the following conditions:
94
 *
95
 *      (a) You must give any other recipients of the Work or
96
 *          Derivative Works a copy of this License; and
97
 *
98
 *      (b) You must cause any modified files to carry prominent notices
99
 *          stating that You changed the files; and
100
 *
101
 *      (c) You must retain, in the Source form of any Derivative Works
102
 *          that You distribute, all copyright, patent, trademark, and
103
 *          attribution notices from the Source form of the Work,
104
 *          excluding those notices that do not pertain to any part of
105
 *          the Derivative Works; and
106
 *
107
 *      (d) If the Work includes a "NOTICE" text file as part of its
108
 *          distribution, then any Derivative Works that You distribute must
109
 *          include a readable copy of the attribution notices contained
110
 *          within such NOTICE file, excluding those notices that do not
111
 *          pertain to any part of the Derivative Works, in at least one
112
 *          of the following places: within a NOTICE text file distributed
113
 *          as part of the Derivative Works; within the Source form or
114
 *          documentation, if provided along with the Derivative Works; or,
115
 *          within a display generated by the Derivative Works, if and
116
 *          wherever such third-party notices normally appear. The contents
117
 *          of the NOTICE file are for informational purposes only and
118
 *          do not modify the License. You may add Your own attribution
119
 *          notices within Derivative Works that You distribute, alongside
120
 *          or as an addendum to the NOTICE text from the Work, provided
121
 *          that such additional attribution notices cannot be construed
122
 *          as modifying the License.
123
 *
124
 *      You may add Your own copyright statement to Your modifications and
125
 *      may provide additional or different license terms and conditions
126
 *      for use, reproduction, or distribution of Your modifications, or
127
 *      for any such Derivative Works as a whole, provided Your use,
128
 *      reproduction, and distribution of the Work otherwise complies with
129
 *      the conditions stated in this License.
130
 *
131
 *   5. Submission of Contributions. Unless You explicitly state otherwise,
132
 *      any Contribution intentionally submitted for inclusion in the Work
133
 *      by You to the Licensor shall be under the terms and conditions of
134
 *      this License, without any additional terms or conditions.
135
 *      Notwithstanding the above, nothing herein shall supersede or modify
136
 *      the terms of any separate license agreement you may have executed
137
 *      with Licensor regarding such Contributions.
138
 *
139
 *   6. Trademarks. This License does not grant permission to use the trade
140
 *      names, trademarks, service marks, or product names of the Licensor,
141
 *      except as required for reasonable and customary use in describing the
142
 *      origin of the Work and reproducing the content of the NOTICE file.
143
 *
144
 *   7. Disclaimer of Warranty. Unless required by applicable law or
145
 *      agreed to in writing, Licensor provides the Work (and each
146
 *      Contributor provides its Contributions) on an "AS IS" BASIS,
147
 *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
 *      implied, including, without limitation, any warranties or conditions
149
 *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
 *      PARTICULAR PURPOSE. You are solely responsible for determining the
151
 *      appropriateness of using or redistributing the Work and assume any
152
 *      risks associated with Your exercise of permissions under this License.
153
 *
154
 *   8. Limitation of Liability. In no event and under no legal theory,
155
 *      whether in tort (including negligence), contract, or otherwise,
156
 *      unless required by applicable law (such as deliberate and grossly
157
 *      negligent acts) or agreed to in writing, shall any Contributor be
158
 *      liable to You for damages, including any direct, indirect, special,
159
 *      incidental, or consequential damages of any character arising as a
160
 *      result of this License or out of the use or inability to use the
161
 *      Work (including but not limited to damages for loss of goodwill,
162
 *      work stoppage, computer failure or malfunction, or any and all
163
 *      other commercial damages or losses), even if such Contributor
164
 *      has been advised of the possibility of such damages.
165
 *
166
 *   9. Accepting Warranty or Additional Liability. While redistributing
167
 *      the Work or Derivative Works thereof, You may choose to offer,
168
 *      and charge a fee for, acceptance of support, warranty, indemnity,
169
 *      or other liability obligations and/or rights consistent with this
170
 *      License. However, in accepting such obligations, You may act only
171
 *      on Your own behalf and on Your sole responsibility, not on behalf
172
 *      of any other Contributor, and only if You agree to indemnify,
173
 *      defend, and hold each Contributor harmless for any liability
174
 *      incurred by, or claims asserted against, such Contributor by reason
175
 *      of your accepting any such warranty or additional liability.
176
 *
177
 *   END OF TERMS AND CONDITIONS
178
 *
179
 *   APPENDIX: How to apply the Apache License to your work.
180
 *
181
 *      To apply the Apache License to your work, attach the following
182
 *      boilerplate notice, with the fields enclosed by brackets "[]"
183
 *      replaced with your own identifying information. (Don't include
184
 *      the brackets!)  The text should be enclosed in the appropriate
185
 *      comment syntax for the file format. We also recommend that a
186
 *      file or class name and description of purpose be included on the
187
 *      same "printed page" as the copyright notice for easier
188
 *      identification within third-party archives.
189
 *
190
 *   Copyright [yyyy] [name of copyright owner]
191
 *
192
 *   Licensed under the Apache License, Version 2.0 (the "License");
193
 *   you may not use this file except in compliance with the License.
194
 *   You may obtain a copy of the License at
195
 *
196
 *       http://www.apache.org/licenses/LICENSE-2.0
197
 *
198
 *   Unless required by applicable law or agreed to in writing, software
199
 *   distributed under the License is distributed on an "AS IS" BASIS,
200
 *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
 *   See the License for the specific language governing permissions and
202
 *   limitations under the License.
203
 */
(-)lib/build/README.ant-1.6.2.txt (+70 lines)
Added Link Here
1
2
                                 A     N     T
3
 
4
5
  What is it? 
6
  -----------
7
  
8
  Ant is a Java based build tool. In theory it is kind of like "make" 
9
  without makes wrinkles and with the full portability of pure java code.
10
11
  
12
  Why?
13
  ----
14
  
15
  Why another build tool when there is already make, gnumake, nmake, jam, 
16
  and others? Because all of those tools have limitations that its original 
17
  author couldn't live with when developing software across multiple platforms. 
18
  
19
  Make-like tools are inherently shell based. They evaluate a set of 
20
  dependencies and then execute commands not unlike what you would issue on a 
21
  shell. This means that you can easily extend these tools by using or writing 
22
  any program for the OS that you are working on. However, this also means that 
23
  you limit yourself to the OS, or at least the OS type such as Unix, that you 
24
  are working on.
25
  
26
  Makefiles are inherently evil as well. Anybody who has worked on them for any 
27
  time has run into the dreaded tab problem. "Is my command not executing 
28
  because I have a space in front of my tab!!!" said the original author of Ant 
29
  way too many times. Tools like Jam took care of this to a great degree, but 
30
  still use yet another format to use and remember.
31
  
32
  Ant is different. Instead a model where it is extended with shell based 
33
  commands, it is extended using Java classes. Instead of writing shell 
34
  commands, the configuration files are XML based calling out a target tree 
35
  where various tasks get executed. Each task is run by an object which 
36
  implements a particular Task interface.
37
  
38
  Granted, this removes some of the expressive power that is inherent by being 
39
  able to construct a shell command such as `find . -name foo -exec rm {}` but 
40
  it gives you the ability to be cross platform. To work anywhere and 
41
  everywhere. And hey, if you really need to execute a shell command, Ant has 
42
  an exec rule that allows different commands to be executed based on the OS 
43
  that it is executing on.
44
45
  The Latest Version
46
  ------------------
47
48
  Details of the latest version can be found on the Apache Ant
49
  Project web site <http://ant.apache.org/>.
50
51
52
  Documentation
53
  -------------
54
55
  Documentation is available in HTML format, in the docs/ directory.
56
  For information about building and installing Ant, see
57
  docs/manual/index.html
58
59
60
  Licensing
61
  ---------
62
63
  This software is licensed under the terms you may find in the file 
64
  named "LICENSE" in this directory.
65
  
66
67
  Thanks for using Ant.
68
69
                                          The Apache Ant Project
70
                                         <http://ant.apache.org/>

Return to bug 34938