Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

partially re-enable ant build to assist with migration to gradle build

  • Loading branch information...
commit 6547b35b9560f97102e7ed7f070a0ea06575a08d 1 parent 11ff9ff
@paulk-asert paulk-asert authored
View
8 build.xml
@@ -529,7 +529,7 @@ $Date$
<fileset dir="${mainSourceDirectory}">
<include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/*/*.*"/>
</fileset>
- <fileset dir="${toolsSourceDirectory}">
+ <fileset dir="${docgeneratorSourceDirectory}/main/groovy">
<include name="org/codehaus/groovy/tools/groovy.ico"/>
</fileset>
</copy>
@@ -546,10 +546,13 @@ $Date$
excludes="*.groovy,**/package-info.class" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
<jar destfile="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" basedir="${mainSourceDirectory}">
<!-- TODO temp hack - remove once modules are in place -->
+ <fileset dir="${antSourceDirectory}/main/java"/>
+ <fileset dir="${antSourceDirectory}/main/groovy"/>
<fileset dir="${bsfSourceDirectory}/main/java"/>
<fileset dir="${jmxSourceDirectory}/main/java"/>
<fileset dir="${jmxSourceDirectory}/main/groovy"/>
<fileset dir="${jsr223SourceDirectory}/main/java"/>
+ <fileset dir="${templateSourceDirectory}/main/java"/>
<fileset dir="${groovyTestSourceDirectory}/main/java"/>
<fileset dir="${groovyTestSourceDirectory}/main/groovy"/>
</jar>
@@ -711,7 +714,7 @@ $Date$
<!-- icons -->
<copy toDir="${installDirectory}/bin" flatten="true">
<fileset dir="${sourceDirectory}/bin" includes="groovy.icns"/>
- <fileset dir="${toolsSourceDirectory}">
+ <fileset dir="${docgeneratorSourceDirectory}/main/groovy">
<include name="org/codehaus/groovy/tools/groovy.ico"/>
</fileset>
</copy>
@@ -792,6 +795,7 @@ $Date$
</classpath>
<fileset dir="${mainSourceDirectory}" includes="**/*.java"/>
<!-- TODO temp hack - remove once modules are in place -->
+ <fileset dir="${antSourceDirectory}/main/java" includes="**/*.java"/>
<fileset dir="${bsfSourceDirectory}/main/java" includes="**/*.java"/>
<fileset dir="${jmxSourceDirectory}/main/java" includes="**/*.java"/>
<fileset dir="${jsr223SourceDirectory}/main/java" includes="**/*.java"/>
View
12 config/ant/build-setup.xml
@@ -27,14 +27,20 @@ $Date: 2007-03-11 19:14:07 +1000 (Sun, 11 Mar 2007) $
<property name="testSourceDirectory" value="${sourceDirectory}/test"/>
<!-- TODO temp hack - remove once modules are in place -->
+ <property name="antSourceDirectory" location="subprojects/groovy-ant/src"/>
<property name="bsfSourceDirectory" location="subprojects/groovy-bsf/src"/>
+ <property name="bsfSourceDirectory" location="subprojects/groovy-bsf/src"/>
+ <property name="docgeneratorSourceDirectory" location="subprojects/groovy-docgenerator/src"/>
+ <property name="groovydocSourceDirectory" location="subprojects/groovy-groovydoc/src"/>
<property name="jmxSourceDirectory" location="subprojects/groovy-jmx/src"/>
<property name="jsr223SourceDirectory" location="subprojects/groovy-jsr223/src"/>
+ <property name="templateSourceDirectory" location="subprojects/groovy-templates/src"/>
+ <property name="xmlSourceDirectory" location="subprojects/groovy-xml/src"/>
<property name="groovyTestSourceDirectory" location="subprojects/groovy-test/src"/>
- <property name="mainSourcePath" value="${sourceDirectory}/main:${bsfSourceDirectory}/main/java:${jmxSourceDirectory}/main/java:${jmxSourceDirectory}/main/groovy:${jsr223SourceDirectory}/main/java:${groovyTestSourceDirectory}/main/java:${groovyTestSourceDirectory}/main/groovy"/>
- <property name="testSourcePath" value="${sourceDirectory}/test:${bsfSourceDirectory}/test/java:${jmxSourceDirectory}/test/java:${jmxSourceDirectory}/test/groovy:${jsr223SourceDirectory}/test/java:${jsr223SourceDirectory}/test/groovy:${groovyTestSourceDirectory}/test/groovy"/>
+ <property name="mainSourcePath" value="${sourceDirectory}/main:${antSourceDirectory}/main/java:${antSourceDirectory}/main/groovy:${bsfSourceDirectory}/main/java:${groovydocSourceDirectory}/main/java:${jmxSourceDirectory}/main/java:${jmxSourceDirectory}/main/groovy:${jsr223SourceDirectory}/main/java:${templateSourceDirectory}/main/java:${xmlSourceDirectory}/main/java:${xmlSourceDirectory}/main/groovy:${groovyTestSourceDirectory}/main/java:${groovyTestSourceDirectory}/main/groovy"/>
+ <property name="testSourcePath" value="${sourceDirectory}/test:${antSourceDirectory}/test/groovy:${bsfSourceDirectory}/test/java:${groovydocSourceDirectory}/test/groovy:${jmxSourceDirectory}/test/java:${jmxSourceDirectory}/test/groovy:${jsr223SourceDirectory}/test/java:${jsr223SourceDirectory}/test/groovy:${templateSourceDirectory}/test/java:${templateSourceDirectory}/test/groovy:${xmlSourceDirectory}/test/groovy:${groovyTestSourceDirectory}/test/groovy"/>
- <property name="toolsSourceDirectory" location="${sourceDirectory}/tools"/>
+ <!--<property name="toolsSourceDirectory" location="${sourceDirectory}/tools"/>-->
<property name="examplesSourceDirectory" location="${sourceDirectory}/examples"/>
<property name="targetDirectory" value="target"/>
View
4 src/main/groovy/grape/GrabAnnotationTransformation.java
@@ -424,9 +424,9 @@ private void checkForConvenienceForm(AnnotationNode node, boolean exclude) {
} else if (allstr.contains(":")) {
// assume gradle syntax
// see: http://www.gradle.org/latest/docs/userguide/dependency_management.html#sec:how_to_declare_your_dependencies
- Map<String, String> parts = GrapeUtil.getIvyParts(allstr);
+ Map<String, Object> parts = GrapeUtil.getIvyParts(allstr);
for (String key : parts.keySet()) {
- String value = parts.get(key);
+ String value = parts.get(key).toString();
if (!key.equals("version") || !value.equals("*") || !exclude) {
node.addMember(key, new ConstantExpression(value));
}
View
1  src/main/org/codehaus/groovy/tools/LoaderConfiguration.java
@@ -16,7 +16,6 @@
package org.codehaus.groovy.tools;
import groovy.grape.Grape;
-import groovy.grape.GrapeIvy;
import java.io.*;
import java.net.MalformedURLException;
Please sign in to comment.
Something went wrong with that request. Please try again.