diff options
| author | Eike Stepper | 2013-07-27 15:06:48 +0000 |
|---|---|---|
| committer | Eike Stepper | 2013-07-30 10:44:58 +0000 |
| commit | 2f296b838c79ca48a60823208739d60b17aa304d (patch) | |
| tree | 38930dc3667e04b4e723e1f9f695a868c2e7616f | |
| parent | b0722673e3a609ce983f82a7a490c638d48d4e78 (diff) | |
| download | cdo-2f296b838c79ca48a60823208739d60b17aa304d.tar.gz cdo-2f296b838c79ca48a60823208739d60b17aa304d.tar.xz cdo-2f296b838c79ca48a60823208739d60b17aa304d.zip | |
[413807] [Releng] Adjust for JDK 1.7
https://bugs.eclipse.org/bugs/show_bug.cgi?id=413807
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.releng/build.xml | 117 |
1 files changed, 42 insertions, 75 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml index e4acb0a5fe..340703a3e2 100644 --- a/plugins/org.eclipse.emf.cdo.releng/build.xml +++ b/plugins/org.eclipse.emf.cdo.releng/build.xml @@ -81,7 +81,7 @@ </sequential> </macrodef> - <macrodef name="generate.product"> + <macrodef name="generate.product.platform"> <attribute name="id" /> <attribute name="profile" /> <attribute name="platform" /> @@ -163,6 +163,35 @@ </sequential> </macrodef> + <macrodef name="generate.product"> + <attribute name="id" /> + <attribute name="profile" /> + <attribute name="priority" /> + <sequential> + <generate.product.platform id="@{id}" + profile="@{profile}" + platform="Windows" + os="win32" + ws="win32" + arch="x86_64" + priority="@{priority}50" /> + <generate.product.platform id="@{id}" + profile="@{profile}" + platform="Linux" + os="linux" + ws="gtk" + arch="x86_64" + priority="@{priority}40" /> + <generate.product.platform id="@{id}" + profile="@{profile}" + platform="Mac" + os="macosx" + ws="cocoa" + arch="x86_64" + priority="@{priority}30" /> + </sequential> + </macrodef> + <!-- =============== --> <!-- Init Properties --> <!-- =============== --> @@ -451,11 +480,20 @@ <mkdir dir="${tp}" /> <move file="${releng}/hudson/target.xml" tofile="${releng}/hudson/cdo.target" /> <move file="${releng}/hudson/api_baseline.xml" tofile="${releng}/hudson/api_baseline.target" /> + <buckminster command="setpref"> <cmdargs> <arg value="maxParallelResolutions=1" /> </cmdargs> </buckminster> + + <buckminster command="installJRE"> + <cmdargs> + <arg value="--location" /> + <arg value="/opt/public/common/jdk1.7.0-latest" /> + </cmdargs> + </buckminster> + <buckminster command="import"> <cmdargs> <arg value="-B" /> @@ -726,80 +764,9 @@ </delete> <mkdir dir="${temp.products}" /> - <!-- Windows --> - <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2" - profile="CDOServer" - platform="Windows" - os="win32" - ws="win32" - arch="x86_64" - priority="450" /> - - <generate.product id="org.eclipse.emf.cdo.explorer.product" - profile="CDOExplorer" - platform="Windows" - os="win32" - ws="win32" - arch="x86_64" - priority="350" /> - - <generate.product id="org.eclipse.emf.cdo.releng.setup.product.ide" - profile="Setup" - platform="Windows" - os="win32" - ws="win32" - arch="x86_64" - priority="250" /> - - <!-- Linux --> - <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2" - profile="CDOServer" - platform="Linux" - os="linux" - ws="gtk" - arch="x86" - priority="440" /> - - <generate.product id="org.eclipse.emf.cdo.explorer.product" - profile="CDOExplorer" - platform="Linux" - os="linux" - ws="gtk" - arch="x86" - priority="340" /> - - <generate.product id="org.eclipse.emf.cdo.releng.setup.product.ide" - profile="Setup" - platform="Linux" - os="linux" - ws="gtk" - arch="x86" - priority="240" /> - - <!-- Mac --> - <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2" - profile="CDOServer" - platform="Mac" - os="macosx" - ws="cocoa" - arch="x86" - priority="430" /> - - <generate.product id="org.eclipse.emf.cdo.explorer.product" - profile="CDOExplorer" - platform="Mac" - os="macosx" - ws="cocoa" - arch="x86" - priority="330" /> - - <generate.product id="org.eclipse.emf.cdo.releng.setup.product.ide" - profile="Setup" - platform="Mac" - os="macosx" - ws="cocoa" - arch="x86" - priority="230" /> + <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2" profile="CDOServer" priority="4" /> + <generate.product id="org.eclipse.emf.cdo.explorer.product" profile="CDOExplorer" priority="3" /> + <generate.product id="org.eclipse.emf.cdo.releng.setup.product.ide" profile="Setup" priority="2" /> </target> </project> |