You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2009/09/18 17:45:20 UTC
svn commit: r816680 - in /felix/trunk/sigil/bldcommon: common.xml
ivysettings.xml
Author: dsavage
Date: Fri Sep 18 15:45:19 2009
New Revision: 816680
URL: http://svn.apache.org/viewvc?rev=816680&view=rev
Log:
add ability to use groovy scripts in build
Modified:
felix/trunk/sigil/bldcommon/common.xml
felix/trunk/sigil/bldcommon/ivysettings.xml
Modified: felix/trunk/sigil/bldcommon/common.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/common.xml?rev=816680&r1=816679&r2=816680&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/common.xml (original)
+++ felix/trunk/sigil/bldcommon/common.xml Fri Sep 18 15:45:19 2009
@@ -18,7 +18,8 @@
under the License.
-->
<project name="bldcommon"
- xmlns:ivy="antlib:org.apache.ivy.ant">
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:groovy="antlib:org.codehaus.groovy">
<dirname property="common.dir" file="${ant.file.bldcommon}"/>
<property file="${common.dir}/sigil-defaults.properties" prefix="default."/>
@@ -51,10 +52,24 @@
target: load-ivy
================================= -->
<target name="load-ivy" depends="init-sigil">
- <echo message="Loading Ivy ... common.dir=${common.dir}"/>
+ <echo message="Loading Ivy ... ${common.dir}/ivysettings.xml"/>
<ivy:settings file="${common.dir}/ivysettings.xml" />
</target>
+ <target name="load-groovy">
+ <ivy:cachepath
+ organisation="org.codehaus.groovy"
+ module="groovy-all"
+ revision="1.6.4"
+ inline="true"
+ pathid="groovy.classpath"
+ transitive="false"
+ log="quiet"/>
+
+ <taskdef resource="org/codehaus/groovy/antlib.xml"
+ uri="antlib:org.codehaus.groovy" classpathref="groovy.classpath"/>
+ </target>
+
<!-- =================================
target: build (default target)
================================= -->
@@ -145,14 +160,6 @@
property="bundle.modified" />
</target>
- <!-- =================================
- target: install
- install-bin, install-etc deprecated in favour of single
- assemble/bin, assemble/etc dirs
- ================================= -->
- <target name="install"
- depends="install-lib"/>
-
<available file="bin" type="dir"
property="bin.dir.present"/>
<available file="etc" type="dir"
@@ -222,7 +229,7 @@
<!-- =================================
target: boot
================================= -->
- <target name="boot" depends="load-ivy">
+ <target name="boot" depends="load-ivy,load-groovy">
</target>
<!-- =================================
@@ -356,8 +363,6 @@
<fileset dir="${sigil.jar.dir}" includes="*.jar"/>
</path>
- <echo>Initialising sigil with ${sigil.jar.dir}</echo>
-
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant" classpathref="sigil.lib.path"/>
@@ -366,6 +371,7 @@
<taskdef name="sigil.bundle.info"
classname="org.apache.felix.sigil.ant.BundleInfoTask" classpathref="sigil.lib.path"/>
+
</target>
</project>
Modified: felix/trunk/sigil/bldcommon/ivysettings.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/ivysettings.xml?rev=816680&r1=816679&r2=816680&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/ivysettings.xml (original)
+++ felix/trunk/sigil/bldcommon/ivysettings.xml Fri Sep 18 15:45:19 2009
@@ -72,6 +72,7 @@
<url name="apache" m2compatible="true">
<artifact pattern="http://repo1.maven.org/maven2/[organisation]/[module]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+ <artifact pattern="http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
</url>
<url name="aQute" m2compatible="true">
@@ -91,5 +92,6 @@
<module organisation="org.apache" name="felix\.sigil.*" matcher="regexp" resolver="default"/>
<module organisation="org.apache" resolver="apache"/>
<module organisation="biz.aQute" resolver="aQute"/>
+ <module organisation="org.codehaus.groovy" resolver="apache" />
</modules>
</ivysettings>