[258606] Builds
diff --git a/build.properties b/build.properties index 926cb16..68fae3b 100644 --- a/build.properties +++ b/build.properties
@@ -133,7 +133,7 @@ # in most RCP app or a plug-in, the baseLocation should be the location of a previously # installed Eclipse against which the application or plug-in code will be compiled and the RCP delta pack. -base=/cygdrive/d/eclipse/ +#base=/cygdrive/d/eclipse/ baseLocation=${base}/eclipse #Os/Ws/Arch/nl of the eclipse specified by baseLocation baseos=win32 @@ -228,3 +228,10 @@ # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties. javacTarget=1.5 +#p2 +generate.p2.metadata=true +p2.metadata.repo=file:${buildDirectory}/repository +p2.artifact.repo=file:${buildDirectory}/repository +p2.metadata.repo.name="Accessibility Tools Framework Update Site" +p2.artifact.repo.name="Accessibility Tools Framework Artifacts" +
diff --git a/build.sh b/build.sh index 63043da..5c6fc51 100644 --- a/build.sh +++ b/build.sh
@@ -14,19 +14,21 @@ if [ -f /opt/ibm/java2-ppc-50/bin/java ]; then # We're running on the build server. Configure the environment for there. java=/opt/ibm/java2-ppc-50/bin/java - base=${HOME}/build/base/eclipse-SDK-3.4.1-win32 + sharedDir=/shared/technology/actf + base=${sharedDir}/base/eclipse-SDK-3.4.1-win32 eclipseRoot=${base}/eclipse configurationFolder=${HOME}/build/org.eclipse.actf.visualization.releng buildRoot=${HOME}/build/root - updateSite=${buildRoot}/updates + updateSite=${buildRoot}/repository else # running on Desktop. java=java + sharedDir=${HOME} base=${HOME} eclipseRoot=${base}/eclipse configurationFolder=${HOME}/build/org.eclipse.actf.visualization.releng buildRoot=${HOME}/eclipse.actf.build - updateSite=${buildRoot}/updates + updateSite=${buildRoot}/repository fi # Find the launcher JAR and PDE Build Plugin directory for the current platform. @@ -35,6 +37,7 @@ tempDir=${buildRoot}/temp buildDirectory=${buildRoot}/workspace +prereqDir=/pre-req # What feature are we building? featureId=org.eclipse.actf.visualization @@ -52,5 +55,5 @@ -DtempDir=${tempDir} \ -DfeatureId=${featureId} \ -DlauncherJar=${launcherJar} \ - -DOOO_HOME=${HOME}/pre-req/OOo + -DOOO_HOME=${prereqDir}/OOo