Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Davis2011-06-03 16:06:16 +0000
committerMatthew Davis2011-06-03 16:06:16 +0000
commitd39fa0a1655d373040ae321e143593d1c1fe51cf (patch)
treec484829d4d666f87bbb920353be39385dce9b0be
parent65a20f90f750fb6845cc8c3bd61ff3da9fc18aae (diff)
downloadorg.eclipse.stem-d39fa0a1655d373040ae321e143593d1c1fe51cf.tar.gz
org.eclipse.stem-d39fa0a1655d373040ae321e143593d1c1fe51cf.tar.xz
org.eclipse.stem-d39fa0a1655d373040ae321e143593d1c1fe51cf.zip
Updating build process
git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk@1957 92a21009-5b66-0410-b83a-dc787c41c6e9
-rw-r--r--org.eclipse.stem.releng/ConfigFeature/build.properties2
-rw-r--r--org.eclipse.stem.releng/ConfigFeature/customTargets.xml2
-rw-r--r--org.eclipse.stem.releng/buildProduct.sh2
-rw-r--r--org.eclipse.stem.releng/maps/stem.map1
4 files changed, 5 insertions, 2 deletions
diff --git a/org.eclipse.stem.releng/ConfigFeature/build.properties b/org.eclipse.stem.releng/ConfigFeature/build.properties
index c73a4b56e..56435a67c 100644
--- a/org.eclipse.stem.releng/ConfigFeature/build.properties
+++ b/org.eclipse.stem.releng/ConfigFeature/build.properties
@@ -21,7 +21,7 @@
#The type of the top level element we are building, generally "feature"
topLevelElementType = feature
#The id of the top level element we are building
-topLevelElementId = org.eclipse.stem.tests.feature
+topLevelElementId = org.eclipse.stem.feature
############# PRODUCT/PACKAGING CONTROL #############
#product=org.eclipse.stem.ui/stem.product
diff --git a/org.eclipse.stem.releng/ConfigFeature/customTargets.xml b/org.eclipse.stem.releng/ConfigFeature/customTargets.xml
index bef086dc4..6acc223cd 100644
--- a/org.eclipse.stem.releng/ConfigFeature/customTargets.xml
+++ b/org.eclipse.stem.releng/ConfigFeature/customTargets.xml
@@ -66,7 +66,7 @@
<!-- Fetch the UI plugin first because that's where the stem.product file is -->
<ant antfile="${genericTargets}" target="fetchElement">
<property name="type" value="feature"/>
- <property name="id" value="org.eclipse.stem.tests.feature"/>
+ <property name="id" value="org.eclipse.stem.feature"/>
</ant>
</target>
diff --git a/org.eclipse.stem.releng/buildProduct.sh b/org.eclipse.stem.releng/buildProduct.sh
index 81361459f..191d07594 100644
--- a/org.eclipse.stem.releng/buildProduct.sh
+++ b/org.eclipse.stem.releng/buildProduct.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+cp $BUILD_ROOT/../org.eclipse.stem.ui/stem.product $BUILD_ROOT/ConfigProduct/
+
# Product build
$JAVA_HOME/bin/java \
$JAVA_VM_ARGS \
diff --git a/org.eclipse.stem.releng/maps/stem.map b/org.eclipse.stem.releng/maps/stem.map
index 46ef79d7e..f02065e35 100644
--- a/org.eclipse.stem.releng/maps/stem.map
+++ b/org.eclipse.stem.releng/maps/stem.map
@@ -1,5 +1,6 @@
!********** FEATURES *********
feature@org.eclipse.stem.feature=COPY,${checkoutDir},org.eclipse.stem.feature
+feature@org.eclipse.stem.product.feature=COPY,${checkoutDir},org.eclipse.stem.product.feature
feature@org.eclipse.stem.core.feature=COPY,${checkoutDir},org.eclipse.stem.core.feature
feature@org.eclipse.stem.internal.data.feature=COPY,${checkoutDir},org.eclipse.stem.internal.data.feature
feature@org.eclipse.stem.analysis.feature=COPY,${checkoutDir},org.eclipse.stem.analysis.feature

Back to the top