ASSIGNED - bug 202466: Build installer for europa Java package
https://bugs.eclipse.org/bugs/show_bug.cgi?id=202466
added second call to cc-run.xml
diff --git a/releng/org.eclipse.epp.pde.build/build-package.xml b/releng/org.eclipse.epp.pde.build/build-package.xml
new file mode 100644
index 0000000..1102cca
--- /dev/null
+++ b/releng/org.eclipse.epp.pde.build/build-package.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ======================================================================
+ Aug 30, 2007 11:28:45 PM
+
+ epp
+ Build the the install files for the 5 standard eclipse packages
+
+ Mark Russell
+ ====================================================================== -->
+<project name="epp" default="package">
+ <description>
+ Build the the install files for the 5 standard eclipse packages
+ </description>
+
+ <import file="build-macros.xml"/>
+ <!-- ================================================= -->
+ <target name="set_recorder" if="recorder.file"
+ depends="read_build_properties">
+ <echo>recorder file ${build.root}/${recorder.file}</echo>
+ <mkdir dir="${build.root}"/>
+ <touch file="${build.root}/${recorder.file}"></touch>
+ <record name="${build.root}/${recorder.file}" loglevel="${recorder.level}"/>
+ <echoproperties format="text" destfile="${build.root}/properties.txt" />
+ </target>
+
+ <!-- =================================================
+ Read build properties
+ -->
+ <target name="read_build_properties">
+ <read_product_properties />
+ </target>
+
+ <target name="package" depends="init, read_build_properties, set_recorder"
+ description="--> Build the the install files for the 5 standard eclipse packages">
+ <echo message="package built" />
+ </target>
+
+ <target name="init">
+ <tstamp />
+ </target>
+</project>
+
diff --git a/releng/org.eclipse.epp.pde.build/build-pde.xml b/releng/org.eclipse.epp.pde.build/build-pde.xml
index 671a988..fa87150 100644
--- a/releng/org.eclipse.epp.pde.build/build-pde.xml
+++ b/releng/org.eclipse.epp.pde.build/build-pde.xml
@@ -2,20 +2,20 @@
<!-- ======================================================================
Aug 30, 2007 11:28:45 PM
- OpenArbor
- Build the open arbor project with the PDE build system
+ epp
+ Build the epp project plugins with the PDE build system
Mark Russell
====================================================================== -->
-<project name="OpenArbor" default="build">
+<project name="epp" default="build">
<description>
- Build the open arbor project with the PDE build system
+ Build the epp project plugins with the PDE build system
</description>
<!-- =================================
target: buils
================================= -->
- <target name="build" depends="init,cleanup,setup,copy" description="--> Build the open arbor project with the PDE build system">
+ <target name="build" depends="init,cleanup,setup,copy" description="--> Build the epp project plugins with the PDE build system">
<fileset dir="${eclipse.home}" id="eclipse.pde.build.fs">
<include name="plugins/org.eclipse.pde.build_*/scripts/build.xml" />
</fileset>
@@ -75,7 +75,7 @@
<!-- - - - - - - - - - - - - - - - - -
target: setup
- - - - - - - - - - - - - - - - - -->
- <target name="setup">
+ <target name="setup" unless="skip.unzip.eclipse">
<mkdir dir="${pde.build.properties.file.base}"/>
<unzip dest="${pde.build.properties.file.base}"
src="${eclipse.sdk.zip}" />
@@ -90,7 +90,7 @@
<!-- - - - - - - - - - - - - - - - - -
target: cleanup
- - - - - - - - - - - - - - - - - -->
- <target name="cleanup">
+ <target name="cleanup" unless="skip.unzip.eclipse">
<mkdir dir="${pde.build.properties.file.base}"/>
<delete includeemptydirs="true">
<fileset dir="${pde.build.properties.file.base}"/>
diff --git a/releng/org.eclipse.epp.pde.build/build-product.xml b/releng/org.eclipse.epp.pde.build/build-product.xml
index 5ae3548..2e53c5c 100644
--- a/releng/org.eclipse.epp.pde.build/build-product.xml
+++ b/releng/org.eclipse.epp.pde.build/build-product.xml
@@ -67,11 +67,13 @@
<ant antfile="build-pde.xml" />
- <mkdir dir="${build.out}/install-image"/>
- <mkdir dir="${build.out}/install-image/E-common/eclipse"/>
- <mkdir dir="${build.out}/install-image/E-3.3/eclipse"/>
- <mkdir dir="${build.out}/install-image/E-zip/eclipse"/>
-
+ <mkdir dir="${build.out}/load-image"/>
+ <mkdir dir="${build.out}/load-image/E-3.3"/>
+ <unzip dest="${build.out}/load-image/E-3.3">
+ <fileset dir="${build.out}">
+ <include name="org.eclipse.epp.installer*linux.gtk.x86.zip" />
+ </fileset>
+ </unzip>
<finalize_build_product/>
</target>
diff --git a/releng/org.eclipse.epp.pde.build/build-settings/Mark Russell.properties b/releng/org.eclipse.epp.pde.build/build-settings/Mark Russell.properties
index c1c71b5..92a5766 100644
--- a/releng/org.eclipse.epp.pde.build/build-settings/Mark Russell.properties
+++ b/releng/org.eclipse.epp.pde.build/build-settings/Mark Russell.properties
@@ -15,3 +15,4 @@
basearch=x86
plugins.dir=..
features.dir=..
+skip.unzip.eclipse=true
diff --git a/releng/org.eclipse.epp.pde.build/cc-macros.xml b/releng/org.eclipse.epp.pde.build/cc-macros.xml
index 3611222..266d836 100644
--- a/releng/org.eclipse.epp.pde.build/cc-macros.xml
+++ b/releng/org.eclipse.epp.pde.build/cc-macros.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="no-build-macros-default">
- <!-- $Id: cc-macros.xml,v 1.4 2007/09/06 13:59:32 mrussell Exp $ -->
+ <!-- $Id: cc-macros.xml,v 1.5 2007/09/06 16:53:21 mrussell Exp $ -->
<target name="no-build-macros-default">
<fail>This file does not contain a default target</fail>
</target>
@@ -103,8 +103,6 @@
<echo>deleting @{configuration}</echo>
<delete dir="@{configuration}" failonerror="false"/>
- <echo>deleting @{workspace}</echo>
- <delete dir="@{workspace}" failonerror="false"/>
<fileset dir="/opt/eclipses/@{eclipseDirName}/plugins" id="equinox.jar.fs"
includes="org.eclipse.equinox.launcher_*.jar"/>
diff --git a/releng/org.eclipse.epp.pde.build/cc-run.xml b/releng/org.eclipse.epp.pde.build/cc-run.xml
index e4561fa..cad4714 100644
--- a/releng/org.eclipse.epp.pde.build/cc-run.xml
+++ b/releng/org.eclipse.epp.pde.build/cc-run.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="run-cc">
- <!-- $Id: cc-run.xml,v 1.3 2007/09/06 13:59:32 mrussell Exp $ -->
+ <!-- $Id: cc-run.xml,v 1.4 2007/09/06 16:53:21 mrussell Exp $ -->
<import file="cc-macros.xml" />
<!-- ================================================= -->
@@ -8,7 +8,7 @@
<!--
<record name="/var/tmp/cc-run.log" loglevel="verbose" action="start"/>
-->
- <echo message="$Id: cc-run.xml,v 1.3 2007/09/06 13:59:32 mrussell Exp $"/>
+ <echo message="$Id: cc-run.xml,v 1.4 2007/09/06 16:53:21 mrussell Exp $"/>
<cc_init />
<!-- Build CodePro Ant -->
@@ -18,6 +18,13 @@
log="build-${product.name}.log"
eclipseDirName="eclipse_330"/>
+ <get_product_info product="epp"/>
+ <createLinkFile product="epp" eclipsedir="eclipse_330" eclipsetarget="3.3"/>
+
+ <cc_eclipse_ant buildfile="build-package.xml"
+ log="build-package-${product.name}.log"
+ eclipseDirName="eclipse_330"/>
+
<generateBuildDate/>
</target>
