Update the builder to work reliably
diff --git a/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/build.properties b/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/build.properties index 86cb9b0..6c41100 100644 --- a/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/build.properties +++ b/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/build.properties
@@ -174,11 +174,11 @@ #The value to be used for the qualifier of a plugin or feature when you want to override the value computed by pde. #The value will only be applied to plugin or features indicating build.properties, qualifier = context -#forceContextQualifier=<the value for the qualifier> +forceContextQualifier=v20130423-0900 #Enable / disable the generation of a suffix for the features that use .qualifier. #The generated suffix is computed according to the content of the feature -#generateFeatureVersionSuffix=true +generateFeatureVersionSuffix=true ############# BASE CONTROL ############# # Settings for the base Eclipse components and Java class libraries
diff --git a/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/customTargets.xml b/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/customTargets.xml index 7a8fe57..b75d7c4 100644 --- a/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/customTargets.xml +++ b/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/customTargets.xml
@@ -1,10 +1,15 @@ <project name="customTargets.template"> <import file="${eclipse.pdebuild.templates}/headless-build/customTargets.xml" /> + <property name="emfRepo" value="http://download.eclipse.org/modeling/emf/emf/updates/2.8milestones/"/> <property name="eclipsePlatformRepo" value="http://build.eclipse.org/eclipse/builds/pwebster/R4_2_maintenance/repo422+20130419072111"/> <target name="preProcessRepos"> - <p2.mirror source="${eclipsePlatformRepo}" destination="${repoBaseLocation}/launchers"> - <!--iu id="org.eclipse.equinox.executable.feature.group" version=""/> - <iu id="org.eclipse.rcp.feature.group" version="" /--> + <p2.mirror source="${emfRepo}" destination="${repoBaseLocation}/emf"> + <iu id="org.eclipse.emf.common.feature.group" version=""/> + <iu id="org.eclipse.emf.ecore.feature.group" version="" /> + </p2.mirror> + <p2.mirror source="${eclipsePlatformRepo}" destination="${repoBaseLocation}/rcp"> + <iu id="org.eclipse.equinox.executable.feature.group" version=""/> + <iu id="org.eclipse.rcp.feature.group" version="" /> </p2.mirror> <p2.mirror source="http://download.eclipse.org/eclipse/updates/license" destination="${repoBaseLocation}/license"> <!--iu id="org.eclipse.equinox.executable.feature.group" version=""/>
diff --git a/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/runbuild.sh b/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/runbuild.sh index 2ff2652..10d33fa 100755 --- a/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/runbuild.sh +++ b/examples/featurePatch/org.eclipse.e4.rcp.r422.builder/runbuild.sh
@@ -3,9 +3,22 @@ ECLIPSE_BASE=/opt/local/e4-self/R422/eclipse +BUILDER=$(pwd) +BASE=$( dirname $BUILDER ) +mkdir $BASE/eclipse +LOG=$BASE/log_$( date +%Y%m%d%H%M%S ).txt +exec >>$LOG 2>&1 + +echo BASE=$BASE +echo BUILDER=$BUILDER + +mkdir -p $BASE/features +rm -rf $BASE/features/org.eclipse.e4.rcp.r422.feature +cp -r $BASE/org.eclipse.e4.rcp.r422.feature $BASE/features + $ECLIPSE_BASE/eclipse -noSplash \ -application org.eclipse.ant.core.antRunner \ -buildfile $ECLIPSE_BASE/plugins/org.eclipse.pde.build_3.8.2.v20121114-140810/scripts/build.xml \ --Dbuilder=$(pwd) \ --Dbase=$( dirname $(pwd) ) +-Dbuilder=$BUILDER \ +-Dbase=$BASE