- Revision
- 739
- Author
- mauro
- Date
- 2007-07-10 03:28:15 -0500 (Tue, 10 Jul 2007)
Log Message
Added build.properties to enable easy configurability of lauch properties - which have changed from Eclipse 3.2 to 3.3.
Modified Paths
Added Paths
Diff
Modified: trunk/plugins/eclipse/build-eclipse.xml (738 => 739)
--- trunk/plugins/eclipse/build-eclipse.xml 2007-06-16 08:48:51 UTC (rev 738) +++ trunk/plugins/eclipse/build-eclipse.xml 2007-07-10 08:28:15 UTC (rev 739) @@ -1,49 +1,39 @@ <project name="jbehave-eclipse" default="generate-scripts"> <target name="generate-scripts"> - - - <property name="feature" value="org.jbehave.plugin.eclipse.feature"/> - <property name="elements" value="[EMAIL PROTECTED]"/> - - - <mkdir dir="build"/> - <eclipse.fetch elements="${elements}" - buildDirectory="." - - directory="directory.txt" - fetchTag="COPY"/> - - - <ant antfile="fetch_${feature}.xml"> - <property name="featureAndPlugins" value="X"/> - <property name="featureOnly" value="X"/> - <property name="buildDirectory" value="build"/> - </ant> + + <echo>Feature - ${feature}</echo> + <property name="feature" value="org.jbehave.plugin.eclipse.feature" /> + <property name="elements" value="[EMAIL PROTECTED]" /> + <mkdir dir="build" /> + <eclipse.fetch elements="${elements}" buildDirectory="." directory="directory.txt" fetchTag="COPY" /> - <xslt extension="properties" style="extract-feature-version.xslt" in="build/features/${feature}/feature.xml" out="version.xml"/> - <xmlproperty file="version.xml"/> - + <ant antfile="fetch_${feature}.xml"> + <property name="featureAndPlugins" value="X" /> + <property name="featureOnly" value="X" /> + <property name="buildDirectory" value="build" /> + </ant> - <eclipse.buildScript elements="${elements}" children="true" buildDirectory="build" baseLocation="${eclipse.home}" /> - <mkdir dir="build/site/features" /> - <mkdir dir="build/site/plugins" /> - - - <ant dir="build/features/${feature}" antfile="build.xml" target="build.update.jar" > - <property name="feature.destination" value="../../site/features"/> - <property name="plugin.destination" value="../../site/plugins"/> - </ant> + <xslt extension="properties" style="extract-feature-version.xslt" in="build/features/${feature}/feature.xml" out="version.xml" /> + <xmlproperty file="version.xml" /> - <ant dir="build/features/${feature}" antfile="build.xml" target="zip.distribution" /> - <!--<ant antfile="build/assemble.${feature}.all.xml"/> --> + <echo>Using Eclipse Home: ${eclipse.home}</echo> + <eclipse.buildScript elements="${elements}" children="true" buildDirectory="build" baseLocation="${eclipse.home}" /> + <mkdir dir="build/site/features" /> + <mkdir dir="build/site/plugins" /> - - - - <xslt style="site.xslt" in="version.xml" out="build/site/site.xml"/> - + + <ant dir="build/features/${feature}" antfile="build.xml" target="build.update.jar"> + <property name="feature.destination" value="../../site/features" /> + <property name="plugin.destination" value="../../site/plugins" /> + </ant> + + <ant dir="build/features/${feature}" antfile="build.xml" target="zip.distribution" /> + <!--<ant antfile="build/assemble.${feature}.all.xml"/> --> + + <xslt style="site.xslt" in="version.xml" out="build/site/site.xml" /> + </target> - </project> +</project>
Added: trunk/plugins/eclipse/build.properties (0 => 739)
--- trunk/plugins/eclipse/build.properties (rev 0) +++ trunk/plugins/eclipse/build.properties 2007-07-10 08:28:15 UTC (rev 739) @@ -0,0 +1,5 @@ +# Eclipse plugin build properties +eclipseDir=C:/Program Files/eclipse +eclipseLauncherCP=${eclipseDir}/plugins/org.eclipse.equinox.launcher_1.0.0.v20070606.jar +eclipseLauncherMain=org.eclipse.core.launcher.Main +label=20070710 \ No newline at end of file
Modified: trunk/plugins/eclipse/build.xml (738 => 739)
--- trunk/plugins/eclipse/build.xml 2007-06-16 08:48:51 UTC (rev 738) +++ trunk/plugins/eclipse/build.xml 2007-07-10 08:28:15 UTC (rev 739) @@ -1,15 +1,13 @@ <project name="cc-build-jbehave-eclipse" default="build" basedir=""> <!-- Usage: - ant -DeclipseDir=<yourEclipseFolder> - --> - <target name="build" > - <condition property="eclipseDir" value="C:/Program Files/eclipse"> - <not> - <isset property="eclipseDir"></isset> - </not> - </condition> - <java fork="true" classname="org.eclipse.core.launcher.Main" classpath="${eclipseDir}/startup.jar" failonerror="true"> + ant -DeclipseDir=<eclipseInstallDir> + --> + <!-- Load build.properties --> + <property file="build.properties"/> + + <target name="build" > + <java fork="true" classname="${eclipseLauncherMain}" classpath="${eclipseLauncherCP}" failonerror="true"> <arg line="-application org.eclipse.ant.core.antRunner -buildfile build-eclipse.xml -DjavacFailOnError=true -DbuildLabel=${label}" /> </java> </target>
To unsubscribe from this list please visit:
