Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrgronback2006-03-16 19:33:50 -0500
committerrgronback2006-03-16 19:33:50 -0500
commitfcf9c680cbdfcadfdb428b22089c69b62d14d328 (patch)
treef3413eef3cdf9453a6ac429b5bc97677e01beea2
parent69ec11a4674cc973545d949a61477759e647fe40 (diff)
downloadorg.eclipse.gmf-tooling-fcf9c680cbdfcadfdb428b22089c69b62d14d328.tar.gz
org.eclipse.gmf-tooling-fcf9c680cbdfcadfdb428b22089c69b62d14d328.tar.xz
org.eclipse.gmf-tooling-fcf9c680cbdfcadfdb428b22089c69b62d14d328.zip
Corrected improper use of 'product' property to allow 3.2M5 version of PDE build to work.
-rw-r--r--releng/org.eclipse.gmf.releng.builder/callisto/build.properties4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/doc/build.properties4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/examples/build.properties4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/runtime/build.properties4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/scripts/install.xml2
-rw-r--r--releng/org.eclipse.gmf.releng.builder/sdk/build.properties4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/tests/build.properties4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml2
10 files changed, 18 insertions, 18 deletions
diff --git a/releng/org.eclipse.gmf.releng.builder/callisto/build.properties b/releng/org.eclipse.gmf.releng.builder/callisto/build.properties
index 19fc5152e..e3056155d 100644
--- a/releng/org.eclipse.gmf.releng.builder/callisto/build.properties
+++ b/releng/org.eclipse.gmf.releng.builder/callisto/build.properties
@@ -19,8 +19,8 @@
# them on the command line (e.g., -DbaseLocation=d:/eclipse
############# PRODUCT/PACKAGING CONTROL #############
-product=org.eclipse.gmf.callisto
-runPackager=true
+#product=
+#runPackager=true
# The prefix that will be used in the generated archive.
archivePrefix=eclipse
diff --git a/releng/org.eclipse.gmf.releng.builder/doc/build.properties b/releng/org.eclipse.gmf.releng.builder/doc/build.properties
index 64c243835..d49bdf156 100644
--- a/releng/org.eclipse.gmf.releng.builder/doc/build.properties
+++ b/releng/org.eclipse.gmf.releng.builder/doc/build.properties
@@ -21,8 +21,8 @@
#skipTests=true
############# PRODUCT/PACKAGING CONTROL #############
-product=org.eclipse.gmf.doc
-runPackager=true
+#product=
+#runPackager=true
# The prefix that will be used in the generated archive.
archivePrefix=eclipse
diff --git a/releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml b/releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml
index 543efe7a2..acb875ed6 100644
--- a/releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml
+++ b/releng/org.eclipse.gmf.releng.builder/doc/customTargets.xml
@@ -8,7 +8,7 @@
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="${product}"/>
+ <property name="id" value="org.eclipse.gmf.doc"/>
</ant>
</target>
@@ -188,7 +188,7 @@
</target>
<target name="updateSiteExport">
- <ant antfile="build.xml" dir="${buildDirectory}/features/${product}/" target="build.update.jar">
+ <ant antfile="build.xml" dir="${buildDirectory}/features/org.eclipse.gmf.doc/" target="build.update.jar">
<property name="feature.destination" value="${buildUpdateSitePath}/features"/>
<property name="plugin.destination" value="${buildUpdateSitePath}/plugins"/>
<!-- Override the default temp.folder location, as it is too deep by default
diff --git a/releng/org.eclipse.gmf.releng.builder/examples/build.properties b/releng/org.eclipse.gmf.releng.builder/examples/build.properties
index e8b053364..e85fd9ed5 100644
--- a/releng/org.eclipse.gmf.releng.builder/examples/build.properties
+++ b/releng/org.eclipse.gmf.releng.builder/examples/build.properties
@@ -21,8 +21,8 @@
#skipTests=true
############# PRODUCT/PACKAGING CONTROL #############
-product=org.eclipse.gmf.examples
-runPackager=true
+#product=
+#runPackager=true
# The prefix that will be used in the generated archive.
archivePrefix=eclipse
diff --git a/releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml b/releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml
index 97dfc1854..20ceea45d 100644
--- a/releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml
+++ b/releng/org.eclipse.gmf.releng.builder/examples/customTargets.xml
@@ -8,7 +8,7 @@
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="${product}"/>
+ <property name="id" value="org.eclipse.gmf.examples"/>
</ant>
</target>
@@ -188,7 +188,7 @@
</target>
<target name="updateSiteExport">
- <ant antfile="build.xml" dir="${buildDirectory}/features/${product}/" target="build.update.jar">
+ <ant antfile="build.xml" dir="${buildDirectory}/features/org.eclipse.gmf.examples/" target="build.update.jar">
<property name="feature.destination" value="${buildUpdateSitePath}/features"/>
<property name="plugin.destination" value="${buildUpdateSitePath}/plugins"/>
<!-- Override the default temp.folder location, as it is too deep by default
diff --git a/releng/org.eclipse.gmf.releng.builder/runtime/build.properties b/releng/org.eclipse.gmf.releng.builder/runtime/build.properties
index a1409da0f..9ce0f6d26 100644
--- a/releng/org.eclipse.gmf.releng.builder/runtime/build.properties
+++ b/releng/org.eclipse.gmf.releng.builder/runtime/build.properties
@@ -19,8 +19,8 @@
# them on the command line (e.g., -DbaseLocation=d:/eclipse
############# PRODUCT/PACKAGING CONTROL #############
-product=org.eclipse.gmf
-runPackager=true
+#product=
+#runPackager=true
# The prefix that will be used in the generated archive.
archivePrefix=eclipse
diff --git a/releng/org.eclipse.gmf.releng.builder/scripts/install.xml b/releng/org.eclipse.gmf.releng.builder/scripts/install.xml
index d57131b5f..3e53454c8 100644
--- a/releng/org.eclipse.gmf.releng.builder/scripts/install.xml
+++ b/releng/org.eclipse.gmf.releng.builder/scripts/install.xml
@@ -78,7 +78,7 @@
</copy>
<property file="${buildRoot}/tests/featureVersions.properties"/>
<ant antfile="${scripts}/update.xml" target="install">
- <property name="featureId" value="${product}" />
+ <property name="featureId" value="org.eclipse.gmf" />
<property name="version" value="${gmfVersion}.${org.eclipse.gmf.tests}" />
</ant>
</target>
diff --git a/releng/org.eclipse.gmf.releng.builder/sdk/build.properties b/releng/org.eclipse.gmf.releng.builder/sdk/build.properties
index b402bee0d..e3056155d 100644
--- a/releng/org.eclipse.gmf.releng.builder/sdk/build.properties
+++ b/releng/org.eclipse.gmf.releng.builder/sdk/build.properties
@@ -19,8 +19,8 @@
# them on the command line (e.g., -DbaseLocation=d:/eclipse
############# PRODUCT/PACKAGING CONTROL #############
-product=org.eclipse.gmf.sdk
-runPackager=true
+#product=
+#runPackager=true
# The prefix that will be used in the generated archive.
archivePrefix=eclipse
diff --git a/releng/org.eclipse.gmf.releng.builder/tests/build.properties b/releng/org.eclipse.gmf.releng.builder/tests/build.properties
index 386a8a330..e85fd9ed5 100644
--- a/releng/org.eclipse.gmf.releng.builder/tests/build.properties
+++ b/releng/org.eclipse.gmf.releng.builder/tests/build.properties
@@ -21,8 +21,8 @@
#skipTests=true
############# PRODUCT/PACKAGING CONTROL #############
-product=org.eclipse.gmf.tests
-runPackager=true
+#product=
+#runPackager=true
# The prefix that will be used in the generated archive.
archivePrefix=eclipse
diff --git a/releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml b/releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml
index 5d7a5de82..4590795ec 100644
--- a/releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml
+++ b/releng/org.eclipse.gmf.releng.builder/tests/customTargets.xml
@@ -8,7 +8,7 @@
<target name="allElements">
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="${product}"/>
+ <property name="id" value="org.eclipse.gmf.tests"/>
</ant>
</target>

Back to the top