From: <aft...@us...> - 2007-06-18 13:05:42
|
Revision: 4337 http://svn.sourceforge.net/smartfrog/?rev=4337&view=rev Author: aftereight Date: 2007-06-18 06:05:39 -0700 (Mon, 18 Jun 2007) Log Message: ----------- build repaired Modified Paths: -------------- branches/core-branch-osgi/common.xml branches/core-branch-osgi/extras/osgi/build.xml branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/build.xml Modified: branches/core-branch-osgi/common.xml =================================================================== --- branches/core-branch-osgi/common.xml 2007-06-15 17:46:21 UTC (rev 4336) +++ branches/core-branch-osgi/common.xml 2007-06-18 13:05:39 UTC (rev 4337) @@ -1057,7 +1057,7 @@ <!-- target to get its dependencies right --> <!-- ========================================================== --> <target name="pre-compile" - depends="init,declare-classpaths,assert-smartfrog,assert-prerequisites"> + depends="init,init-common,declare-classpaths,assert-smartfrog,assert-prerequisites"> </target> <!-- ========================================================== --> Modified: branches/core-branch-osgi/extras/osgi/build.xml =================================================================== --- branches/core-branch-osgi/extras/osgi/build.xml 2007-06-15 17:46:21 UTC (rev 4336) +++ branches/core-branch-osgi/extras/osgi/build.xml 2007-06-18 13:05:39 UTC (rev 4337) @@ -1,18 +1,43 @@ <?xml version="1.0"?> <project name="Smartfrog-OSGi" default="all"> - <property name="smartfrog.home" value="../../smartfrog/"/> - <property name="javadoc.disabled" value="true"/> + <property file="build.properties" /> + + <target name="init"> + <fileset id="child.projects" dir="." > + <include name="*/build.xml" /> + </fileset> + </target> + <target name="all" depends="copyJarsAround"/> + + <target name="bundles" depends="smartfrog-dist"> + <subant target="dist" > + <fileset refid="child.projects" /> + <property name="javadocs.disabled" value="${javadoc.disabled}"/> + </subant> + </target> + + <target name="daemon-bundle" depends="smartfrog-dist"> - <ant dir="daemon-bundle" target="all" inheritall="false"/> + <subant target="dist" > + <fileset file="daemon-bundle/build.xml" /> + <property name="javadocs.disabled" value="${javadoc.disabled}"/> + </subant> </target> + <target name="test-bundle"> - <ant dir="test-bundle" target="all" inheritall="false"/> + <subant target="dist" inheritall="false"> + <fileset file="test-bundle/build.xml" /> + <property name="javadocs.disabled" value="${javadoc.disabled}"/> + </subant> </target> <target name="rmispi-bundle"> - <ant dir="rmiclassloading-extension-bundle" target="all" inheritall="false"/> + <subant target="dist" inheritall="false"> + <fileset file="rmiclassloading-extension-bundle/build.xml" /> + <property name="javadocs.disabled" value="${javadoc.disabled}"/> + </subant> </target> <target name="copyJarsAround" depends="daemon-bundle,test-bundle,rmispi-bundle"> @@ -28,15 +53,16 @@ </copy> </target> - <target name="clean"> - <ant dir="daemon-bundle" target="clean"/> - <ant dir="test-bundle" target="clean"/> - <ant dir="rmiclassloading-extension-bundle" target="clean"/> + <target name="clean" depends="init"> + <subant target="clean" > + <fileset refid="child.projects" /> + </subant> </target> - <target name="smartfrog-dist"> - <ant dir="${smartfrog.home}" target="published" inheritall="false"> + <target name="smartfrog-dist" depends="init"> + <subant target="published" > + <fileset file="${sf.home}/build.xml" /> <property name="javadocs.disabled" value="${javadoc.disabled}"/> - </ant> + </subant> </target> </project> \ No newline at end of file Modified: branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/build.xml =================================================================== --- branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/build.xml 2007-06-15 17:46:21 UTC (rev 4336) +++ branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/build.xml 2007-06-18 13:05:39 UTC (rev 4337) @@ -40,8 +40,7 @@ </target> <!-- This bundle has no additional sources, it's just a repackaging of the sf-rmi-spi.jar file --> - <target name="javadoc"/> - <target name="compile"/> + <target name="compile" depends="pre-compile"/> <!-- this is done so that the jarfile generated is bound to our project name with no -components suffix--> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |