You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2010/03/26 15:02:27 UTC
svn commit: r927855 - in /felix/trunk: build.xml pom.xml
Author: gnodet
Date: Fri Mar 26 14:02:26 2010
New Revision: 927855
URL: http://svn.apache.org/viewvc?rev=927855&view=rev
Log:
Try to fix the build from the whole trunk
Modified:
felix/trunk/build.xml
felix/trunk/pom.xml
Modified: felix/trunk/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/build.xml?rev=927855&r1=927854&r2=927855&view=diff
==============================================================================
--- felix/trunk/build.xml (original)
+++ felix/trunk/build.xml Fri Mar 26 14:02:26 2010
@@ -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">
Modified: felix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/pom.xml?rev=927855&r1=927854&r2=927855&view=diff
==============================================================================
--- felix/trunk/pom.xml (original)
+++ felix/trunk/pom.xml Fri Mar 26 14:02:26 2010
@@ -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>