svn commit: r17722 - trunk/src: argouml-app argouml-core-diagrams-sequence2 argouml-core-infra argouml-core-model argouml-core-model-mdr argouml-core-umlpropertypanels
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2010-01-02 13:39:37-0800
New Revision: 17722
Modified:
trunk/src/argouml-app/build.xml
trunk/src/argouml-core-diagrams-sequence2/build.xml
trunk/src/argouml-core-infra/build.xml
trunk/src/argouml-core-model-mdr/build.xml
trunk/src/argouml-core-model/build.xml
trunk/src/argouml-core-umlpropertypanels/build.xml
Log:
Build updates for Eclipse PDE p2 publisher
Modified: trunk/src/argouml-app/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/build.xml?view=diff&pathrev=17722&r1=17721&r2=17722
==============================================================================
--- trunk/src/argouml-app/build.xml (original)
+++ trunk/src/argouml-app/build.xml 2010-01-02 13:39:37-0800
@@ -123,7 +123,7 @@
<include name="lib/**/*.jar" />
</fileset>
</path>
-
+
</target>
@@ -644,10 +644,12 @@
<!-- Eclipse PDE targets from here to end of file -->
<!-- =================================================================== -->
<!--
- Required targets (called in this order) are:
+ Required targets for non-P2 build (called in this order) are:
build.jars
gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
gather.logs
+ If p2.gathering = true in build.properties:
+ publish.bin.parts target replaces gather.bin.parts
-->
<target name="pde-properties" if="eclipse.running">
@@ -659,9 +661,10 @@
<property name="bundleId" value="org.argouml.app" />
<!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336"/>
+ <property name="version.suffix" value="0.29.3.201001020415"/>
<property name="bundleVersion" value="${version.suffix}" />
-
+ <property name="full.name" value="${bundleId}_${version.suffix}" />
+
<!-- Compiler settings. -->
<condition property="dir_bootclasspath" value="${java.home}/../Classes">
<os family="mac" />
@@ -683,7 +686,10 @@
<isset property="buildTempFolder" />
</condition>
<property name="build.result.folder" value="${basedir}" />
- <property name="plugin.destination" value="${basedir}" />
+ <property name="plugin.destination" value="${basedir}" />
+ <condition property="p2.publish.parts" value="true">
+ <istrue value="${p2.gathering}"/>
+ </condition>
</target>
<target name="pde-clean" depends="pde-init">
@@ -727,8 +733,35 @@
</copy>
<eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
- </target>
+ <!-- Generate API baseline - unused currently - uncomment to enable
+ <antcall target="apitools.generation">
+ <param name="target.folder" value="${build.result.folder}"/>
+ <param name="projectLocation" value="${basedir}"/>
+ <param name="binary.folders" value="${build.result.folder}/@dot"/>
+ <param name="projectName" value="${bundleId}_${bundleVersion}"/>
+ </antcall>
+ -->
+ </target>
+
+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+
+ <!-- First call old target to gather binaries -->
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${build.result.folder}"/>
+ </antcall>
+
+ <eclipse.versionReplacer path="${build.result.folder}" version="${bundleVersion}" />
+
+ <!-- Now use P2 publishing tools to publish to our build repository -->
+ <eclipse.gatherBundle
+ metadataRepository="${p2.build.repo}"
+ artifactRepository="${p2.build.repo}"
+ buildResultFolder="${build.result.folder}"
+ baseDirectory="${basedir}"
+ />
+ </target>
+
<target name="gather.logs" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
<copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
Modified: trunk/src/argouml-core-diagrams-sequence2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/build.xml?view=diff&pathrev=17722&r1=17721&r2=17722
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/build.xml (original)
+++ trunk/src/argouml-core-diagrams-sequence2/build.xml 2010-01-02 13:39:37-0800
@@ -227,7 +227,8 @@
</target>
<target name="tests" depends="tests-xml"
- description="Run all the tests."/>
+ description="Run all the tests."
+ />
<!-- =================================================================== -->
<!-- Eclipse PDE targets from here to end of file -->
@@ -237,6 +238,8 @@
build.jars
gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
gather.logs
+ If p2.gathering = true in build.properties:
+ publish.bin.parts target replaces gather.bin.parts
-->
<target name="pde-properties" if="eclipse.running">
@@ -248,7 +251,7 @@
<property name="bundleId" value="org.argouml.sequence2" />
<!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336"/>
+ <property name="version.suffix" value="0.29.3.201001020415"/>
<property name="bundleVersion" value="${version.suffix}" />
<!-- Compiler settings. -->
@@ -273,6 +276,9 @@
</condition>
<property name="build.result.folder" value="${basedir}" />
<property name="plugin.destination" value="${basedir}" />
+ <condition property="p2.publish.parts" value="true">
+ <istrue value="${p2.gathering}"/>
+ </condition>
</target>
<target name="pde-clean" depends="pde-init">
@@ -304,6 +310,25 @@
<eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
</target>
+
+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+
+ <!-- First call old target to gather binaries -->
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${build.result.folder}"/>
+ </antcall>
+
+ <eclipse.versionReplacer path="${build.result.folder}" version="${bundleVersion}" />
+
+ <!-- Now use P2 publishing tools to publish to our build repository -->
+ <eclipse.gatherBundle
+ metadataRepository="${p2.build.repo}"
+ artifactRepository="${p2.build.repo}"
+ buildResultFolder="${build.result.folder}"
+ baseDirectory="${basedir}"
+ />
+ </target>
+
<target name="gather.logs" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
<copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
Modified: trunk/src/argouml-core-infra/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-infra/build.xml?view=diff&pathrev=17722&r1=17721&r2=17722
==============================================================================
--- trunk/src/argouml-core-infra/build.xml (original)
+++ trunk/src/argouml-core-infra/build.xml 2010-01-02 13:39:37-0800
@@ -30,9 +30,11 @@
<!-- =================================================================== -->
<!--
Required targets (called in this order) are:
- build.jars
- gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
- gather.logs
+ build.jars
+ gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
+ gather.logs
+ If p2.gathering = true in build.properties:
+ publish.bin.parts target replaces gather.bin.parts
-->
<target name="pde-init">
@@ -40,7 +42,7 @@
<property name="bundleId" value="org.argouml.core.infra" />
<!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336" />
+ <property name="version.suffix" value="0.29.3.201001020415" />
<property name="bundleVersion" value="${version.suffix}" />
<condition property="pluginTemp" value="${buildTempFolder}/plugins">
@@ -52,6 +54,9 @@
</condition>
<property name="build.result.folder" value="${basedir}" />
<property name="plugin.destination" value="${basedir}" />
+ <condition property="p2.publish.parts" value="true">
+ <istrue value="${p2.gathering}"/>
+ </condition>
</target>
<target name="pde-clean" depends="pde-init">
@@ -85,6 +90,24 @@
<eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
</target>
+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+
+ <!-- First call old target to gather binaries -->
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${build.result.folder}"/>
+ </antcall>
+
+ <eclipse.versionReplacer path="${build.result.folder}" version="${bundleVersion}" />
+
+ <!-- Now use P2 publishing tools to publish to our build repository -->
+ <eclipse.gatherBundle
+ metadataRepository="${p2.build.repo}"
+ artifactRepository="${p2.build.repo}"
+ buildResultFolder="${build.result.folder}"
+ baseDirectory="${basedir}"
+ />
+ </target>
+
<target name="gather.logs">
</target>
Modified: trunk/src/argouml-core-model-mdr/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/build.xml?view=diff&pathrev=17722&r1=17721&r2=17722
==============================================================================
--- trunk/src/argouml-core-model-mdr/build.xml (original)
+++ trunk/src/argouml-core-model-mdr/build.xml 2010-01-02 13:39:37-0800
@@ -141,7 +141,6 @@
<path refid="ant.optional.classpath"/>
</classpath>
</taskdef>
-
</target>
@@ -404,6 +403,8 @@
build.jars
gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
gather.logs
+ If p2.gathering = true in build.properties:
+ publish.bin.parts target replaces gather.bin.parts
-->
<target name="pde-properties" if="eclipse.running">
@@ -415,7 +416,7 @@
<property name="bundleId" value="org.argouml.core.model.mdr" />
<!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336"/>
+ <property name="version.suffix" value="0.29.3.201001020415"/>
<property name="bundleVersion" value="${version.suffix}" />
<!-- Compiler settings. -->
@@ -439,7 +440,10 @@
<isset property="buildTempFolder" />
</condition>
<property name="build.result.folder" value="${basedir}" />
- <property name="plugin.destination" value="${basedir}" />
+ <property name="plugin.destination" value="${basedir}" />
+ <condition property="p2.publish.parts" value="true">
+ <istrue value="${p2.gathering}"/>
+ </condition>
</target>
<target name="pde-clean" depends="pde-init">
@@ -482,6 +486,24 @@
<eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
</target>
+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+
+ <!-- First call old target to gather binaries -->
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${build.result.folder}"/>
+ </antcall>
+
+ <eclipse.versionReplacer path="${build.result.folder}" version="${bundleVersion}" />
+
+ <!-- Now use P2 publishing tools to publish to our build repository -->
+ <eclipse.gatherBundle
+ metadataRepository="${p2.build.repo}"
+ artifactRepository="${p2.build.repo}"
+ buildResultFolder="${build.result.folder}"
+ baseDirectory="${basedir}"
+ />
+ </target>
+
<target name="gather.logs" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
<copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
Modified: trunk/src/argouml-core-model/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/build.xml?view=diff&pathrev=17722&r1=17721&r2=17722
==============================================================================
--- trunk/src/argouml-core-model/build.xml (original)
+++ trunk/src/argouml-core-model/build.xml 2010-01-02 13:39:37-0800
@@ -87,6 +87,8 @@
build.jars
gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
gather.logs
+ If p2.gathering = true in build.properties:
+ publish.bin.parts target replaces gather.bin.parts
-->
<target name="pde-properties" if="eclipse.running">
@@ -98,7 +100,7 @@
<property name="bundleId" value="org.argouml.core.model" />
<!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336"/>
+ <property name="version.suffix" value="0.29.3.201001020415"/>
<property name="bundleVersion" value="${version.suffix}" />
<!-- Compiler settings. -->
@@ -122,7 +124,10 @@
<isset property="buildTempFolder" />
</condition>
<property name="build.result.folder" value="${basedir}" />
- <property name="plugin.destination" value="${basedir}" />
+ <property name="plugin.destination" value="${basedir}" />
+ <condition property="p2.publish.parts" value="true">
+ <istrue value="${p2.gathering}"/>
+ </condition>
</target>
<target name="pde-clean" depends="pde-init">
@@ -154,6 +159,24 @@
<eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
</target>
+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+
+ <!-- First call old target to gather binaries -->
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${build.result.folder}"/>
+ </antcall>
+
+ <eclipse.versionReplacer path="${build.result.folder}" version="${bundleVersion}" />
+
+ <!-- Now use P2 publishing tools to publish to our build repository -->
+ <eclipse.gatherBundle
+ metadataRepository="${p2.build.repo}"
+ artifactRepository="${p2.build.repo}"
+ buildResultFolder="${build.result.folder}"
+ baseDirectory="${basedir}"
+ />
+ </target>
+
<target name="gather.logs" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
<copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
Modified: trunk/src/argouml-core-umlpropertypanels/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/build.xml?view=diff&pathrev=17722&r1=17721&r2=17722
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/build.xml (original)
+++ trunk/src/argouml-core-umlpropertypanels/build.xml 2010-01-02 13:39:37-0800
@@ -83,7 +83,6 @@
<pathelement location="build/tests/classes"/>
<path refid="tests.run.classpath"/>
</path>
-
</target>
<!-- =================================================================== -->
@@ -238,6 +237,8 @@
build.jars
gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
gather.logs
+ If p2.gathering = true in build.properties:
+ publish.bin.parts target replaces gather.bin.parts
-->
<target name="pde-properties" if="eclipse.running">
@@ -274,6 +275,9 @@
</condition>
<property name="build.result.folder" value="${basedir}" />
<property name="plugin.destination" value="${basedir}" />
+ <condition property="p2.publish.parts" value="true">
+ <istrue value="${p2.gathering}"/>
+ </condition>
</target>
<target name="pde-clean" depends="pde-init">
@@ -305,6 +309,24 @@
<eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
</target>
+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+
+ <!-- First call old target to gather binaries -->
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${build.result.folder}"/>
+ </antcall>
+
+ <eclipse.versionReplacer path="${build.result.folder}" version="${bundleVersion}" />
+
+ <!-- Now use P2 publishing tools to publish to our build repository -->
+ <eclipse.gatherBundle
+ metadataRepository="${p2.build.repo}"
+ artifactRepository="${p2.build.repo}"
+ buildResultFolder="${build.result.folder}"
+ baseDirectory="${basedir}"
+ />
+ </target>
+
<target name="gather.logs" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
<copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2434253
To unsubscribe from this discussion, e-mail: [[email protected]].