Permalink
Browse files

Started using Import-Template and some of the shortcuts bundlor provides

  • Loading branch information...
1 parent 0b320ef commit 9f67a1d936cd284fb4426afefb31930a0557a4fd @graemerocher graemerocher committed Nov 18, 2009
Showing with 32 additions and 36 deletions.
  1. +12 −13 ant/build/bundle.xml
  2. +7 −9 build.properties
  3. 0 maven/bundlor.properties
  4. +13 −0 maven/grails-bootstrap.mf
  5. +0 −14 maven/grails-bootstrap.mf.in
View
@@ -59,26 +59,25 @@
</target>
- <property name="bundlor.version" value="1.0.0.M6" />
+ <property name="bundlor.version" value="1.0.0.CI-230" />
<property name="bundlor.home" location="${user.home}/.grails/bundlor-${bundlor.version}" />
<available file="${bundlor.home}" property="bundlor.installed" />
- <target name="--bundlor-jar" depends="bundlor.init" unless="disable.bundlor">
- <copy file="${basedir}/maven/grails-${bundle.name}.mf.in" tofile="${grails.target}/grails-${bundle.name}.mf" overwrite="true" />
- <replace file="${grails.target}/grails-${bundle.name}.mf" token="@grails.version@" value="${grails.version}" />
- <bundlor:bundlor bundlePath="${jar.file}"
+
+ <target name="--bundlor-jar" depends="bundlor.init" unless="disable.bundlor">
+ <bundlor:bundlor inputPath="${jar.file}"
outputPath="${jar.file}"
bundleVersion="${grails.version}"
- manifestTemplatePath="${grails.target}/grails-${bundle.name}.mf"
- failOnWarnings="false">
- <!--<propertyset refid="bundlor.properties"/>-->
- <propertyset>
- <propertyref builtin="all"/>
- </propertyset>
+ manifestTemplatePath="${basedir}/maven/grails-${bundle.name}.mf"
+ failOnWarnings="true">
+ <propertyset>
+ <propertyref prefix="bundlor."/>
+ <mapper type="glob" from="bundlor.*" to="*" />
+ </propertyset>
</bundlor:bundlor>
</target>
- <target name="bundlor.init">
+ <target name="bundlor.init" depends="bundlor.download">
<taskdef resource="com/springsource/bundlor/ant/antlib.xml"
uri="antlib:com.springsource.bundlor.ant">
<classpath id="bundlor.classpath">
@@ -89,7 +88,7 @@
</target>
<target name="bundlor.download" unless="bundlor.installed">
- <get src="http://s3.amazonaws.com/dist.springframework.org/milestone/BNDLR/bundlor-${bundlor.version}.zip"
+ <get src="http://s3.amazonaws.com/dist.springframework.org/snapshot/BNDLR/bundlor-${bundlor.version}.zip"
dest="${user.home}/.grails/bundlor.zip"
usetimestamp="true"/>
View
@@ -2,14 +2,18 @@ grails.version=1.2.0.SNAPSHOT
grails.src.commons=src/commons
grails.src.groovy=src/groovy
+# Bundlor dependency versions
+bundlor.groovy.version=1.6.5
+bundlor.spring.version=3.0.0.RC2
+bundlor.ant.version=1.7.1
+bundlor.ivy.version=2.0.0
+bundlor.gant.version=1.6.0
+
grails.src=src/java
grails.test=src/test
grails.src.jar=src/jar
grails.src.web=src/web
grails.src.war=src/war
-grails.src.persistence=src/persistence
-grails.src.scaffolding=src/scaffolding
-grails.src.tiger=src/tiger
grails.src.jsp21=src/jsp21
grails.src.config=src/config
grails.src.codecs=src/grails/grails-app/utils
@@ -18,12 +22,6 @@ grails.build=${grails.target}/classes
grails.stubs=${grails.target}/stubs
grails.lib=lib
grails.lib.hibernate=lib/hibernate
-grails.test.src.tiger=test/tiger
-grails.test.src.groovy=test/groovy
-grails.test.src.commons=test/commons
-grails.test.src.web=test/web
-grails.test.src.persistence=test/persistence
-grails.test.src.scaffolding=test/scaffolding
grails.test.build=${grails.target}/test-classes
grails.test.reports=${grails.target}/test-reports
grails.test.html.reports=${grails.test.reports}/html
View
No changes.
View
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Grails
+Bundle-Vendor: SpringSource Inc.
+Bundle-SymbolicName: org.grails.bootstrap
+Import-Template:
+ gant.*;version="${gant.version:[=.=.=, +1.0.0)}",
+ org.codehaus.gant.*;version="${gant.version:[=.=.=, +1.0.0)}",
+ groovy.*;version="${groovy.version:[=.=.=, +1.0.0)}",
+ org.apache.ivy.*;version="${ivy.version:[=.=.=, +1.0.0)}",
+ org.apache.tools.ant.*;version="${ant.version:[=.=.=, +1.0.0)}",
+ org.codehaus.groovy.*;version="${groovy.version:[=.=.=, +1.0.0)}",
+ org.springframework.*;version="${spring.version:[=.=.=, +1.0.0)}"
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Grails
-Bundle-Vendor: SpringSource Inc.
-Bundle-SymbolicName: org.grails.bootstrap
-Bundle-Version: @grails.version@
-Import-Package:
- org.apache.ant;version="[1.7.1, inf)"
-Export-Package:
- grails.util;version="@grails.version@",
- grails.ant;version="@grails.version@",
- org.codehaus.groovy.grails.cli;version="@grails.version@",
- org.codehaus.groovy.grails.cli.support;version="@grails.version@",
- org.codehaus.groovy.grails.resolve;version="@grails.version@"

0 comments on commit 9f67a1d

Please sign in to comment.