Permalink
Browse files

Merge pull request #37 from rdeltour/bnd

use bnd to build calabash as an OSGi bundle
  • Loading branch information...
ndw committed Apr 4, 2012
2 parents a115352 + 5f8c811 commit 068a900f445b837cbfa10b9476b67e96131a7460
Showing with 25 additions and 25 deletions.
  1. +11 −25 build.xml
  2. BIN osgi/bnd.jar
  3. +14 −0 osgi/calabash.bnd
View
@@ -63,7 +63,7 @@
<target name="default" depends="jar"/>
- <target name="init" depends="saxon93,saxon94">
+ <target name="init" depends="saxon-version">
<mkdir dir="${build.dir}"/>
<property name="dist-version" value="${version}-${saxon-version}"/>
<property name="install.dir" value="${dist.dir}/calabash-${dist-version}"/>
@@ -90,18 +90,15 @@
</target>
<target name="jar" depends="compile">
- <jar destfile="calabash.jar">
- <manifest>
- <attribute name="Built-By" value="${built.by}"/>
- <attribute name="Implementation-Vendor" value="${implementation.vendor}"/>
- <attribute name="Implementation-Title" value="${implementation.title}"/>
- <attribute name="Implementation-Version" value="${dist-version}"/>
- <attribute name="Main-Class" value="com.xmlcalabash.drivers.Main"/>
- <attribute name="Class-Path" value="${run.classpath}"/>
- </manifest>
-
- <fileset dir="${build.dir}"/>
- </jar>
+ <taskdef resource="aQute/bnd/ant/taskdef.properties"
+ classpath="osgi/bnd.jar"/>
+ <bnd
+ classpath="${build.dir}"
+ eclipse="false"
+ failok="false"
+ exceptions="true"
+ files="osgi/calabash.bnd"
+ output="calabash.jar"/>
</target>
<target name="clean" depends="init">
@@ -351,18 +348,7 @@ java -Xmx1024m -jar %INSTALL_PATH/calabash.jar "$@"
<copy todir="${install.dir}">
<fileset file="docs/README"/>
</copy>
- <jar destfile="${install.dir}/calabash.jar">
- <manifest>
- <attribute name="Built-By" value="${built.by}"/>
- <attribute name="Implementation-Vendor" value="${implementation.vendor}"/>
- <attribute name="Implementation-Title" value="${implementation.title}"/>
- <attribute name="Implementation-Version" value="${dist-version}"/>
- <attribute name="Main-Class" value="com.xmlcalabash.drivers.Main"/>
- <attribute name="Class-Path" value="${run.classpath}"/>
- </manifest>
-
- <fileset dir="${build.dir}"/>
- </jar>
+ <copy todir="${install.dir}" file="calabash.jar"/>
<copy todir="${install.dir}/lib">
<fileset file="lib/commons*.jar"/>
View
Binary file not shown.
View
@@ -0,0 +1,14 @@
+Built-By: ${built.by}
+Implementation-Vendor: ${implementation.vendor}
+Implementation-Title: ${implementation.title}
+Implementation-Version: ${dist-version}
+Main-Class: com.xmlcalabash.drivers.Main
+Class-Path: ${run.classpath}
+Bundle-SymbolicName: com.xmlcalabash
+Bundle-Name: ${implementation.title}
+Bundle-Version: ${dist-version}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: *, etc
+Import-Package: \
+ net.sf.saxon.*;version=${if;${def;saxon94};9.4.0;9.3.0},\
+ *

0 comments on commit 068a900

Please sign in to comment.