Author: pwang
Date: 2009-07-09 14:11:53 -0700 (Thu, 09 Jul 2009)
New Revision: 17305
Modified:
csplugins/trunk/ucsd/pwang/cyprovision/headless_build/headless_build_feature/build.xml
csplugins/trunk/ucsd/pwang/cyprovision/headless_build/headless_build_feature/build_cy3_feature.xml
Log:
Clean up
Modified:
csplugins/trunk/ucsd/pwang/cyprovision/headless_build/headless_build_feature/build.xml
===================================================================
---
csplugins/trunk/ucsd/pwang/cyprovision/headless_build/headless_build_feature/build.xml
2009-07-09 21:03:10 UTC (rev 17304)
+++
csplugins/trunk/ucsd/pwang/cyprovision/headless_build/headless_build_feature/build.xml
2009-07-09 21:11:53 UTC (rev 17305)
@@ -7,8 +7,11 @@
<property name="base" location="c:/eclipse35" />
<!-- parent of base location-->
<property name="baseLocation" location="${base}/eclipse" />
- <property name="buildDirectory" location="${builder}/build" />
+ <property name="buildDirectory" location="${builder}/build_feature" />
+ <!-- Define the location of cytoscape bundles and rootfiles -->
+ <property name="cy3bundleDirectory" location="./cy3bundles" />
+ <property name="rootfilesDirectory" location="./rootfiles" />
<pathconvert property="equinoxLauncher">
<path>
@@ -17,19 +20,11 @@
<regexpmapper
from="(org\.eclipse\.equinox\.launcher)(_)(.*)\.jar" to="\0" />
</pathconvert>
-
- <pathconvert property="pdeBuild">
- <path>
- <fileset dir="${baseLocation}/plugins"
includes="**/*productBuild.xml" />
- </path>
- <regexpmapper from="(org\.eclipse\.pde\.build)(_)(.*)" to="\0"
/>
- </pathconvert>
-
<!--
This target actually executes the PDE Build process by
launching the
Eclipse antRunner application.
-->
- <target name="feature-build">
+ <target name="feature-build" depends="init">
<java classname="org.eclipse.equinox.launcher.Main" fork="true"
failonerror="true" >
<arg value="-application" />
@@ -42,5 +37,34 @@
</java>
</target>
+
+ <target name="init">
+
+ <delete dir="${buildDirectory}" />
+ <mkdir dir="${buildDirectory}" />
+
+ <record name="${buildDirectory}/cytoscape-feature-build.log"
+ loglevel="verbose" />
+ <echoproperties />
+ <mkdir
dir="${buildDirectory}/features/cytoscape_product_feature" />
+ <copy
todir="${buildDirectory}/features/cytoscape_product_feature" file="feature.xml"
/>
+ <copyfile src="feature_build.properties"
dest="${buildDirectory}/features/cytoscape_product_feature/build.properties" />
+
+ <mkdir dir="${buildDirectory}/plugins" />
+ <copy todir="${buildDirectory}/plugins" >
+ <fileset dir="${cy3bundleDirectory}">
+ <include name="**" />
+ </fileset>
+ </copy>
+
+ <mkdir dir="${buildDirectory}/rootfiles" />
+ <copy todir="${buildDirectory}/rootfiles" >
+ <fileset dir="${rootfilesDirectory}">
+ <include name="**" />
+ </fileset>
+ </copy>
+
+ </target>
+
</project>
\ No newline at end of file
Modified:
csplugins/trunk/ucsd/pwang/cyprovision/headless_build/headless_build_feature/build_cy3_feature.xml
===================================================================
---
csplugins/trunk/ucsd/pwang/cyprovision/headless_build/headless_build_feature/build_cy3_feature.xml
2009-07-09 21:03:10 UTC (rev 17304)
+++
csplugins/trunk/ucsd/pwang/cyprovision/headless_build/headless_build_feature/build_cy3_feature.xml
2009-07-09 21:11:53 UTC (rev 17305)
@@ -1,62 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Build cytoscape feature" default="runBuild">
+<project name="Definition of feature build properties" default="runBuild">
<!-- Define the location of Eclipse -->
<property name="base" location="c:/eclipse35" />
<property name="baseLocation" location="${base}/eclipse" />
-
- <!-- Define the location of cytoscape bundles and rootfiles -->
- <property name="cy3bundleDirectory" location="./cy3bundles" />
- <property name="rootfilesDirectory" location="./rootfiles" />
-
+ <!-- Identifier for the feature being built-->
+ <property name="topLevelElementId" value="cytoscape_product_feature" />
+ <property name="archivePrefix" value="cytoscape" />
+ <property name="buildId" value="featureBuild" />
+
<!-- Do not change the following settings -->
<property name="builder" location="." />
<property name="buildDirectory" location="${builder}/build_feature" />
- <!-- Identifier for the feature being built-->
- <property name="topLevelElementId" value="cytoscape_product_feature" />
- <property name="archivePrefix" value="cytoscape" />
-
<pathconvert property="pdeBuild">
<path>
<fileset dir="${baseLocation}/plugins" includes="**/*build.xml" />
</path>
<regexpmapper from="(org\.eclipse\.pde\.build)(_)(.*)" to="\0" />
</pathconvert>
-
<import file= "${baseLocation}/plugins/${pdeBuild}"/>
- <target name="runBuild" depends="init,main" />
-
- <target name="init">
-
- <delete dir="${buildDirectory}" />
- <mkdir dir="${buildDirectory}" />
+ <target name="runBuild" depends="main" />
- <record name="${buildDirectory}/${topLevelElementId}-build.log"
- loglevel="verbose" />
- <echoproperties />
-
- <mkdir
dir="${buildDirectory}/features/cytoscape_product_feature" />
- <copy
todir="${buildDirectory}/features/cytoscape_product_feature" file="feature.xml"
/>
- <copyfile src="feature_build.properties"
dest="${buildDirectory}/features/cytoscape_product_feature/build.properties" />
-
- <mkdir dir="${buildDirectory}/plugins" />
- <copy todir="${buildDirectory}/plugins" >
- <fileset dir="${cy3bundleDirectory}">
- <include name="**" />
- </fileset>
- </copy>
-
- <mkdir dir="${buildDirectory}/rootfiles" />
- <copy todir="${buildDirectory}/rootfiles" >
- <fileset dir="${rootfilesDirectory}">
- <include name="**" />
- </fileset>
- </copy>
-
- </target>
-
</project>
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---
