diff options
| author | Stephan Herrmann | 2015-06-09 12:51:36 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2015-06-09 12:51:36 +0000 |
| commit | f82b3e763571ad9190936704fbc4099231a575b0 (patch) | |
| tree | fba723be57a669b8e286dc0bbc226cb9574bb4f1 /releng/build-scripts | |
| parent | a2d6e189c9840170fe734606b5fe5567f27c2fda (diff) | |
| download | org.eclipse.objectteams-f82b3e763571ad9190936704fbc4099231a575b0.tar.gz org.eclipse.objectteams-f82b3e763571ad9190936704fbc4099231a575b0.tar.xz org.eclipse.objectteams-f82b3e763571ad9190936704fbc4099231a575b0.zip | |
Bug 460529: Update site should not contain version of otdt.core.patch
from build phase 1 (the compiler compiler)
- attempt by using disting updateSites per phase
Diffstat (limited to 'releng/build-scripts')
| -rw-r--r-- | releng/build-scripts/build/run.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml index 504ec9aac..75470cc33 100644 --- a/releng/build-scripts/build/run.xml +++ b/releng/build-scripts/build/run.xml @@ -59,6 +59,7 @@ directory for tempory files during testing: <property name="test.eclipseDir" value="${test.root.dir}/eclipse" /> <!-- directories for update sites: --> + <property name="compilerUpdatesDir" value="${user.dir}/updateSiteCompiler"/> <property name="otdtUpdatesDir" value="${user.dir}/updateSite"/> <property name="testsUpdatesDirBase" value="${user.dir}/updateSiteTests"/> <!-- will have sub directories "eclipse" and "otdt" --> @@ -235,7 +236,7 @@ directory for tempory files during testing: <arg value="-Dbuilder=${builder-otcompiler}"/> <arg value="-D${installmode}=true"/> <!-- <- obsolete? --> <arg value="-Dcomponent.short=OT-Compiler"/> - <arg value="-DotdtUpdatesDir=${otdtUpdatesDir}"/> + <arg value="-DotdtUpdatesDir=${compilerUpdatesDir}"/> <arg value="-Dconfigs=*,*,*"/> <arg value="-Dbaseos=${os}"/> <arg value="-Dbasews=${ws}"/> @@ -252,7 +253,7 @@ directory for tempory files during testing: <!-- Now we should have an update site with the patch feature, time to install it into base: --> <ant antfile="${OTScriptDir}/p2helper.xml" target="installFeature" dir="${baseLocation}"> <property name="feature" value="org.eclipse.objectteams.otdt.core.patch.feature.group"/> - <property name="sourceUpdatesDir" value="${otdtUpdatesDir}"/> + <property name="sourceUpdatesDir" value="${compilerUpdatesDir}"/> <property name="targetEclipseDir" value="${baseLocation}"/> </ant> </target> |