ASSIGNED - bug 202361: Create PDE build for the Epp Plugins.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=202361
diff --git a/releng/org.eclipse.epp.pde.build/build-macros.xml b/releng/org.eclipse.epp.pde.build/build-macros.xml
index 26793c3..c323292 100644
--- a/releng/org.eclipse.epp.pde.build/build-macros.xml
+++ b/releng/org.eclipse.epp.pde.build/build-macros.xml
@@ -65,6 +65,10 @@
location="${build.root}/${build.temp.name}" />
<property name="log.dir" location="@{build.root}/logs" />
<property name="build.num" value="local.build" />
+ <mkdir dir="${build.out}"/>
+ <mkdir dir="${build.out.root}"/>
+ <mkdir dir="${build.temp}"/>
+ <mkdir dir="${log.dir}"/>
</sequential>
</macrodef>
@@ -153,5 +157,116 @@
</sequential>
</macrodef>
+ <!-- = = = = = = = = = = = = = = = = =
+ macrodef: finalize_build_product
+ = = = = = = = = = = = = = = = = = -->
+ <macrodef name="finalize_build_product">
+ <attribute name="productVersion" default="${product.version}" />
+ <attribute name="productId" default="${product.id}" />
+ <attribute name="cleanBuildTagFileName" default=".clean_build"/>
+ <attribute name="cleanBuildTagFile" default="${build.out}/@{cleanBuildTagFileName}"/>
+ <attribute name="cleanBuildTagFileLog" default="${log.dir}/@{cleanBuildTagFileName}"/>
+ <sequential>
+ <echo message="finalize_build_product" />
+ <echo message="finalize_build_product productVersion = @{productVersion}" />
+ <echo message="finalize_build_product productId = @{productId}" />
+ <echo message="finalize_build_product cleanBuildTagFile = @{cleanBuildTagFile}" />
+ <generateBuildDate/>
+ <!-- Write the head file -->
+ <basename file="${build.out}" property="head.dir.name" />
+ <echo file="${build.out}/../head.properties">head=${head.dir.name}</echo>
+ <echo file="${build.out}/product.properties">version=@{productVersion}
+id=@{productId}</echo>
+ <echo message="touching @{cleanBuildTagFile}" />
+ <touch file="@{cleanBuildTagFile}" />
+ <touch file="@{cleanBuildTagFileLog}" />
+ <buildLinks/>
+ </sequential>
+ </macrodef>
+
+ <!-- = = = = = = = = = = = = = = = = =
+ macrodef: cc_build_latest
+ === required Parameters:
+
+ none
+
+ === optional Parameters:
+
+ buildout - the directory the docs are build to
+ (default ${build.out})
+
+ === Properties defined:
+
+ cc.build.latest.link - the link file to be created
+
+ none
+ = = = = = = = = = = = = = = = = = -->
+ <macrodef name="buildLinks">
+ <attribute name="buildout" default="${build.out}" />
+ <sequential>
+ <antcall target="create_links" inheritall="false">
+ <param name="buildout" value="@{buildout}"/>
+ <param name="logdir" value="${log.dir}"/>
+ <param name="project.name" value="${product.name}"/>
+ </antcall>
+ </sequential>
+ </macrodef>
+ <!-- = = = = = = = = = = = = = = = = =
+ macrodef: generateBuildDate
+ = = = = = = = = = = = = = = = = = -->
+ <macrodef name="generateBuildDate">
+ <attribute name="dateFormat" default="yyyy.MM.dd" />
+ <sequential>
+ <tstamp>
+ <format property="build.date" pattern="yyyy.MM.dd"/>
+ </tstamp>
+ <echo file="${build.out}/build-date.html"><html><body>
+<p style="font-family: Helvetica, Arial,sans-serif; font-size:80%; color: #333333; background-color: #efefef;line-height: 1.15; margin: 0px; padding: 0px;">
+${build.date}</p></body></html></echo>
+
+ </sequential>
+ </macrodef>
+
+ <!-- - - - - -
+ create the latest project link and the link to the project set if one exists
+ - - - - - - - -->
+ <target name="create_links" depends="create_latest"/>
+
+ <!-- - - - - - - - - - - - - - - - - -
+ target: create_latest
+ create the latest link
+ - - - - - - - - - - - - - - - - - -->
+ <target name="create_latest" depends="set_os" if="os.unix">
+ <dirname file="${buildout}" property="cc.build.latest.link"/>
+ <delete failonerror="false" >
+ <fileset dir="${cc.build.latest.link}" followsymlinks="false">
+ <include name="latest"/>
+ </fileset>
+ </delete>
+ <echo>building symbolic link for latest ${cc.build.latest.link}/latest->${buildout}</echo>
+ <symlink action="single"
+ link="${cc.build.latest.link}/latest"
+ resource="${buildout}"
+ overwrite="true" />
+ </target>
+
+ <!-- - - - - - - - - - - - - - - - - -
+ target: set_os
+ - - - - - - - - - - - - - - - - - -->
+ <target name="set_os">
+ <condition property="os.windows">
+ <os family="windows" />
+ </condition>
+ <condition property="os.unix">
+ <os family="unix" />
+ </condition>
+ <condition property="os.mac">
+ <os family="mac" />
+ </condition>
+ <echo>Windows: ${os.windows}</echo>
+ <echo>Unix: ${os.unix}</echo>
+ <echo>Mac: ${os.mac}</echo>
+ </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 cc1f528..671a988 100644
--- a/releng/org.eclipse.epp.pde.build/build-pde.xml
+++ b/releng/org.eclipse.epp.pde.build/build-pde.xml
@@ -26,6 +26,10 @@
<echo message="Running build file ${pde.build.script} dir ${pde.build.dir} builder ${builder}"/>
<ant antfile="${pde.build.script}" dir="${pde.build.dir}" />
+
+ <copy todir="${build.out}">
+ <fileset dir="${build.loc}/${pde.build.properties.file.buildLabel}"/>
+ </copy>
</target>
<!-- - - - - - - - - - - - - - - - - -
diff --git a/releng/org.eclipse.epp.pde.build/build-product.xml b/releng/org.eclipse.epp.pde.build/build-product.xml
index 2376d2e..5ae3548 100644
--- a/releng/org.eclipse.epp.pde.build/build-product.xml
+++ b/releng/org.eclipse.epp.pde.build/build-product.xml
@@ -70,13 +70,9 @@
<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-3.2/eclipse"/>
- <mkdir dir="${build.out}/install-image/E-3.1/eclipse"/>
<mkdir dir="${build.out}/install-image/E-zip/eclipse"/>
- <!--
<finalize_build_product/>
- -->
</target>
</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.epp.pde.build/cc-macros.xml b/releng/org.eclipse.epp.pde.build/cc-macros.xml
index 04ec09a..3611222 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.3 2007/09/06 06:30:20 mrussell Exp $ -->
+ <!-- $Id: cc-macros.xml,v 1.4 2007/09/06 13:59:32 mrussell Exp $ -->
<target name="no-build-macros-default">
<fail>This file does not contain a default target</fail>
</target>
@@ -229,22 +229,6 @@
</macrodef>
<!-- = = = = = = = = = = = = = = = = =
- macrodef: generateBuildDate
- = = = = = = = = = = = = = = = = = -->
- <macrodef name="generateBuildDate">
- <attribute name="dateFormat" default="yyyy.MM.dd" />
- <sequential>
- <tstamp>
- <format property="build.date" pattern="yyyy.MM.dd"/>
- </tstamp>
- <echo file="${build.out}/build-date.html"><html><body>
-<p style="font-family: Helvetica, Arial,sans-serif; font-size:80%; color: #333333; background-color: #efefef;line-height: 1.15; margin: 0px; padding: 0px;">
-${build.date}</p></body></html></echo>
-
- </sequential>
- </macrodef>
-
- <!-- = = = = = = = = = = = = = = = = =
macrodef: createLinkFile
= = = = = = = = = = = = = = = = = -->
<macrodef name="createLinkFile">
diff --git a/releng/org.eclipse.epp.pde.build/cc-run.xml b/releng/org.eclipse.epp.pde.build/cc-run.xml
index 811903c..e4561fa 100644
--- a/releng/org.eclipse.epp.pde.build/cc-run.xml
+++ b/releng/org.eclipse.epp.pde.build/cc-run.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="run-cc">
- <!-- $Id: cc-run.xml,v 1.2 2007/09/06 06:21:50 mrussell Exp $ -->
+ <!-- $Id: cc-run.xml,v 1.3 2007/09/06 13:59:32 mrussell Exp $ -->
<import file="cc-macros.xml" />
<!-- ================================================= -->
<target name="run-cc">
+ <!--
<record name="/var/tmp/cc-run.log" loglevel="verbose" action="start"/>
- <echo message="$Id: cc-run.xml,v 1.2 2007/09/06 06:21:50 mrussell Exp $"/>
+ -->
+ <echo message="$Id: cc-run.xml,v 1.3 2007/09/06 13:59:32 mrussell Exp $"/>
<cc_init />
<!-- Build CodePro Ant -->
