Permalink
Browse files

Try to fix the build from the whole trunk

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@927855 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 291842c commit 9c0996ace9624ba33b314c878a45fbbc578f1089 @gnodet gnodet committed Mar 26, 2010
Showing with 23 additions and 4 deletions.
  1. +9 −0 build.xml
  2. +14 −4 pom.xml
View
@@ -29,6 +29,9 @@
</target>
<target name="clean" depends="init">
<exec executable="${mvn}" failonerror="true">
+ <arg line="-Dpackaging=obr clean" />
+ </exec>
+ <exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=plugins clean" />
</exec>
<exec executable="${mvn}" failonerror="true">
@@ -46,6 +49,9 @@
</target>
<target name="install" depends="init">
<exec executable="${mvn}" failonerror="true">
+ <arg line="-Dpackaging=obr install" />
+ </exec>
+ <exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=plugins install" />
</exec>
<exec executable="${mvn}" failonerror="true">
@@ -66,6 +72,9 @@
</target>
<target name="all" depends="init">
<exec executable="${mvn}" failonerror="true">
+ <arg line="-Dpackaging=obr clean install" />
+ </exec>
+ <exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=plugins clean install" />
</exec>
<exec executable="${mvn}" failonerror="true">
View
@@ -54,6 +54,20 @@
<profiles>
<profile>
+ <id>packaging-obr</id>
+ <activation>
+ <property>
+ <name>packaging</name>
+ <value>obr</value>
+ </property>
+ </activation>
+ <modules>
+ <module>utils</module>
+ <module>bundlerepository</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>packaging-plugins</id>
<activation>
<property>
@@ -63,8 +77,6 @@
</activation>
<modules>
<module>maven-obr-plugin</module>
- <module>utils</module>
- <module>bundlerepository</module>
<module>bundleplugin</module>
<module>scr-annotations</module>
<module>scrplugin</module>
@@ -107,8 +119,6 @@
<module>shell.gui.plugin</module>
<module>shell.remote</module>
<module>org.osgi.service.obr</module>
- <module>utils</module>
- <module>bundlerepository</module>
<module>log</module>
<module>eventadmin</module>
<module>http</module>

0 comments on commit 9c0996a

Please sign in to comment.