1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
diff -ur groovy-1.6.3/build.xml groovy-1.6.3-new/build.xml
--- groovy-1.6.3/build.xml 2009-07-27 10:36:57.000000000 +0200
+++ groovy-1.6.3-new/build.xml 2009-07-27 10:45:48.000000000 +0200
@@ -55,6 +55,10 @@
<istrue value="${skipFetch}"/>
</condition>
+ <condition property="_skipEmbeddable_">
+ <istrue value="${skipEmbeddable}"/>
+ </condition>
+
<condition property="groovy.build.vm5">
<not>
<contains string="${ant.java.version}" substring="1.4"/>
@@ -551,7 +555,7 @@
tofile="${targetDistDirectory}/groovy-jdk14-${groovyVersion}-sources.jar"/>
</target>
- <target name="-jarjarInit">
+ <target name="-jarjarInit" unless="_skipEmbeddable_">
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask">
<classpath>
<fileset dir="${bootstrapDirectory}" includes="jarjar-*.jar"/>
@@ -559,7 +563,7 @@
</taskdef>
</target>
- <target name="-createEmbeddableJar" depends="-jarjarInit" unless="testFailed">
+ <target name="-createEmbeddableJar" depends="-jarjarInit" unless="_skipEmbeddable_">
<delete dir="${stagingDirectory}" quiet="true"/>
<mkdir dir="${stagingDirectory}"/>
<unzip dest="${stagingDirectory}">
@@ -839,6 +843,7 @@
<path id="groovydocpath">
<path path="${mainClassesDirectory}"/>
<path refid="runtimePath"/>
+ <path refid="toolsPath"/>
<path path="${java.class.path}"/>
</path>
<antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
diff -ur groovy-1.6.3/config/ant/build-maven.xml groovy-1.6.3-new/config/ant/build-maven.xml
--- groovy-1.6.3/config/ant/build-maven.xml 2009-07-27 10:36:57.000000000 +0200
+++ groovy-1.6.3-new/config/ant/build-maven.xml 2009-07-27 10:38:34.000000000 +0200
@@ -58,7 +58,7 @@
<target name="-mavenInit" depends="-mavenTaskdef,-mavenPomDefinitions"/>
- <target name="-mavenTaskdef">
+ <target name="-mavenTaskdef" unless="_skipFetch_">
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
<classpath>
<fileset dir="${bootstrapDirectory}" includes="maven-ant-tasks-*.jar"/>
@@ -66,7 +66,7 @@
</typedef>
</target>
- <target name="-mavenPomDefinitions">
+ <target name="-mavenPomDefinitions" unless="_skipFetch_">
<maven.pom file="pom.xml" id="groovy.pom"/>
<xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/>
<maven.pom file="${targetDirectory}/groovy-all.pom" id="groovy-all.pom"/>
@@ -84,7 +84,7 @@
<!--<maven.pom file="${targetDirectory}/groovy-all-jdk14.pom" id="groovy-all-jdk14.pom"/>-->
</target>
- <target name="-fetchDependencies" depends="-mavenFetchAllModules,-copyLibraries"/>
+ <target name="-fetchDependencies" depends="-mavenFetchAllModules,-copyLibraries,-definePathsWithoutCopyingLibraries"/>
<target name="-mavenFetchAllModules" depends="-mavenInit" unless="_skipFetch_">
<fetch.maven.all.modules/>
@@ -99,6 +99,27 @@
<definePath pathId="jdk14ExtrasPath" filesetId="fs.runtime.groovy-jdk14-extras" libdir="${extrasLibDirectory}"/>
</target>
+ <target name="-definePathsWithoutCopyingLibraries" if="_skipFetch_">
+ <path id="compilePath">
+ <fileset dir="${compileLibDirectory}" includes="**/*.jar"/>
+ </path>
+ <path id="runtimePath">
+ <fileset dir="${runtimeLibDirectory}" includes="**/*.jar"/>
+ </path>
+ <path id="testLibPath">
+ <fileset dir="${testLibDirectory}" includes="**/*.jar"/>
+ </path>
+ <path id="toolsPath">
+ <fileset dir="${toolsLibDirectory}" includes="**/*.jar"/>
+ </path>
+ <path id="examplesPath">
+ <fileset dir="${examplesLibDirectory}" includes="**/*.jar"/>
+ </path>
+ <path id="jdk14ExtrasPath">
+ <fileset dir="${extrasLibDirectory}" includes="**/*.jar"/>
+ </path>
+ </target>
+
<target name="-mavenDeployInit" depends="-mavenInit">
<artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/>
</target>
diff -ur groovy-1.6.3/config/ant/build-setup.xml groovy-1.6.3-new/config/ant/build-setup.xml
--- groovy-1.6.3/config/ant/build-setup.xml 2009-07-27 10:36:57.000000000 +0200
+++ groovy-1.6.3-new/config/ant/build-setup.xml 2009-07-27 10:35:08.000000000 +0200
@@ -66,7 +66,11 @@
<sequential>
<java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
<classpath refid="@{classpathref}"/>
+ <jvmarg value="-Duser.home=${user.home}" />
<arg value="@{target}"/>
+ <arg value="-DskipFetch=${skipFetch}"/>
+ <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/>
+ <arg value="-DtoolsLibDirectory=${toolsLibDirectory}" />
</java>
</sequential>
</macrodef>
|
GitWeb