Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormfeldman2006-03-15 11:59:34 -0500
committermfeldman2006-03-15 11:59:34 -0500
commit3bf370ef34d9cbc25297e89e053863ef4c524f9d (patch)
tree6f5fbf4eafe2cc99351ec8f9de5f3e1c38200f37
parent81928f96f6fc16af3d433ca41de548cc6103c8e6 (diff)
downloadorg.eclipse.gmf-tooling-3bf370ef34d9cbc25297e89e053863ef4c524f9d.tar.gz
org.eclipse.gmf-tooling-3bf370ef34d9cbc25297e89e053863ef4c524f9d.tar.xz
org.eclipse.gmf-tooling-3bf370ef34d9cbc25297e89e053863ef4c524f9d.zip
Target configuration build.cfg moved to org.eclipse.gmf.releng.target
-rw-r--r--releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml9
-rw-r--r--releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml7
-rw-r--r--releng/org.eclipse.gmf.releng.builder/sdk/customTargets.xml9
-rw-r--r--releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml5
4 files changed, 21 insertions, 9 deletions
diff --git a/releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml b/releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml
index 03cac4f3f..543efe7a2 100644
--- a/releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml
+++ b/releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml
@@ -31,6 +31,9 @@
<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
<property name="mapsCheckoutTag" value="HEAD" />
<cvs command="checkout -d org.eclipse.gmf.releng" cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
+ <!-- Check out target platform config -->
+ <property name="targetConfigTag" value="HEAD" />
+ <cvs command="checkout -d org.eclipse.gmf.releng.target" cvsRoot="${mapsRepo}" package="${mapsRoot}.target" dest="${buildDirectory}/maps" tag="${targetConfigTag}" />
</target>
<target name="checkLocalMaps">
@@ -77,7 +80,7 @@
<!-- ===================================================================== -->
<target name="postSetup">
<!-- Load build.cfg properties -->
- <property file="${buildDirectory}/maps/org.eclipse.gmf.releng/maps/build.cfg"/>
+ <property file="${buildDirectory}/maps/org.eclipse.gmf.releng.target/build.cfg"/>
<ant antfile="${scripts}/install.xml" target="installBase" />
<ant antfile="${scripts}/install.xml" target="installGEF" />
<ant antfile="${scripts}/install.xml" target="installEMF" />
@@ -126,7 +129,7 @@
<ant antfile="${buildDirectory}/org.eclipse.gmf/doc/org.eclipse.gmf.runtime.doclet/build.xml"
target="build.jar"
dir="${buildDirectory}/org.eclipse.gmf/doc/org.eclipse.gmf.runtime.doclet" />
- <property file="${buildDirectory}/maps/org.eclipse.gmf.releng/maps/build.cfg"/>
+ <property file="${buildDirectory}/maps/org.eclipse.gmf.releng.target/build.cfg"/>
<ant antfile="${buildDirectory}/plugins/org.eclipse.gmf.doc/buildDoc.xml" />
</target>
@@ -164,7 +167,7 @@
<!-- Steps to do after the build is done. -->
<!-- ===================================================================== -->
<target name="postBuild">
- <property file="${buildDirectory}/maps/org.eclipse.gmf.releng/maps/build.cfg"/>
+ <property file="${buildDirectory}/maps/org.eclipse.gmf.releng.target/build.cfg"/>
<antcall target="gatherLogs" />
<antcall target="publish"/>
<antcall target="generateUpdateSite"/>
diff --git a/releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml b/releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml
index 8d559fd22..97dfc1854 100644
--- a/releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml
+++ b/releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml
@@ -31,6 +31,9 @@
<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
<property name="mapsCheckoutTag" value="HEAD" />
<cvs command="checkout -d org.eclipse.gmf.releng" cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
+ <!-- Check out target platform config -->
+ <property name="targetConfigTag" value="HEAD" />
+ <cvs command="checkout -d org.eclipse.gmf.releng.target" cvsRoot="${mapsRepo}" package="${mapsRoot}.target" dest="${buildDirectory}/maps" tag="${targetConfigTag}" />
</target>
<target name="checkLocalMaps">
@@ -77,7 +80,7 @@
<!-- ===================================================================== -->
<target name="postSetup">
<!-- Load build.cfg properties -->
- <property file="${buildDirectory}/maps/org.eclipse.gmf.releng/maps/build.cfg"/>
+ <property file="${buildDirectory}/maps/org.eclipse.gmf.releng.target/build.cfg"/>
<ant antfile="${scripts}/install.xml" target="installBase" />
<ant antfile="${scripts}/install.xml" target="installGEF" />
<ant antfile="${scripts}/install.xml" target="installEMF" />
@@ -155,7 +158,7 @@
<!-- Steps to do after the build is done. -->
<!-- ===================================================================== -->
<target name="postBuild">
- <property file="${buildDirectory}/maps/org.eclipse.gmf.releng/maps/build.cfg"/>
+ <property file="${buildDirectory}/maps/org.eclipse.gmf.releng.target/build.cfg"/>
<antcall target="gatherLogs" />
<!-- A temporary directory leftover? -->
<delete dir="${buildDirectory}/org.eclipse.gmf" failonerror="false"/>
diff --git a/releng/org.eclipse.gmf.releng.builder/sdk/customTargets.xml b/releng/org.eclipse.gmf.releng.builder/sdk/customTargets.xml
index 7dd1682f5..b4412cc69 100644
--- a/releng/org.eclipse.gmf.releng.builder/sdk/customTargets.xml
+++ b/releng/org.eclipse.gmf.releng.builder/sdk/customTargets.xml
@@ -32,6 +32,9 @@
<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
<property name="mapsCheckoutTag" value="HEAD" />
<cvs command="checkout -d org.eclipse.gmf.releng" cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
+ <!-- Check out target platform config -->
+ <property name="targetConfigTag" value="HEAD" />
+ <cvs command="checkout -d org.eclipse.gmf.releng.target" cvsRoot="${mapsRepo}" package="${mapsRoot}.target" dest="${buildDirectory}/maps" tag="${targetConfigTag}" />
</target>
<target name="checkLocalMaps">
@@ -78,7 +81,7 @@
<!-- ===================================================================== -->
<target name="postSetup">
<!-- Load build.cfg properties -->
- <property file="${buildDirectory}/maps/org.eclipse.gmf.releng/maps/build.cfg"/>
+ <property file="${buildDirectory}/maps/org.eclipse.gmf.releng.target/build.cfg"/>
<ant antfile="${scripts}/install.xml" target="installBase" />
<ant antfile="${scripts}/install.xml" target="installGEF" />
<ant antfile="${scripts}/install.xml" target="installEMF" />
@@ -141,7 +144,7 @@
<!-- Steps to do before running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
<target name="preProcess">
- <property file="${buildDirectory}/maps/org.eclipse.gmf.releng/maps/build.cfg"/>
+ <property file="${buildDirectory}/maps/org.eclipse.gmf.releng.target/build.cfg"/>
<!-- TODO: Remove when dependency gone -->
<available file="${buildDirectory}/plugins/antlr/lib/antlr.jar" property="antlrExists" />
<ant antfile="${scripts}/install.xml" target="installAntlr" />
@@ -157,7 +160,7 @@
<ant antfile="${buildDirectory}/org.eclipse.gmf/doc/org.eclipse.gmf.runtime.doclet/build.xml"
target="build.jar"
dir="${buildDirectory}/org.eclipse.gmf/doc/org.eclipse.gmf.runtime.doclet" />
- <property file="${buildDirectory}/maps/org.eclipse.gmf.releng/maps/build.cfg"/>
+ <property file="${buildDirectory}/maps/org.eclipse.gmf.releng.target/build.cfg"/>
<ant antfile="${buildDirectory}/plugins/org.eclipse.gmf.doc/buildDoc.xml" />
</target>
diff --git a/releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml b/releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml
index 239c8b546..5d7a5de82 100644
--- a/releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml
+++ b/releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml
@@ -1,5 +1,5 @@
<project name="Build specific targets and properties" default="noDefault">
- <property file="${buildDirectory}/maps/org.eclipse.gmf.releng/maps/build.cfg"/>
+ <property file="${buildDirectory}/maps/org.eclipse.gmf.releng.target/build.cfg"/>
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
@@ -31,6 +31,9 @@
<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
<property name="mapsCheckoutTag" value="HEAD" />
<cvs command="checkout -d org.eclipse.gmf.releng" cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
+ <!-- Check out target platform config -->
+ <property name="targetConfigTag" value="HEAD" />
+ <cvs command="checkout -d org.eclipse.gmf.releng.target" cvsRoot="${mapsRepo}" package="${mapsRoot}.target" dest="${buildDirectory}/maps" tag="${targetConfigTag}" />
</target>
<target name="checkLocalMaps">

Back to the top