Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2016-04-19 20:23:34 +0000
committerDavid Williams2016-04-19 20:35:16 +0000
commit47052f5ecdb03c094aaa7bec0bb56d09522d154d (patch)
tree31fb68123730c2329fa9d6e29a243300fa8fde5f
parentd3f46ffca95ef8132fab8788f7ba531afa7cc857 (diff)
downloadeclipse.platform.releng.aggregator-47052f5ecdb03c094aaa7bec0bb56d09522d154d.tar.gz
eclipse.platform.releng.aggregator-47052f5ecdb03c094aaa7bec0bb56d09522d154d.tar.xz
eclipse.platform.releng.aggregator-47052f5ecdb03c094aaa7bec0bb56d09522d154d.zip
Bug 470932 - remove scripts that create delta pack during build
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/.gitignore2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml134
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml16
3 files changed, 9 insertions, 143 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/.gitignore b/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/.gitignore
deleted file mode 100644
index 373b6c322..000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-featureTemp/
-featureTemp2/ \ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml
deleted file mode 100644
index e531a0057..000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- name="equinox feature build"
- default="build">
-
- <target name="init">
- <property
- name="archiveRoot"
- value="eclipse-${buildId}" />
- <property
- name="archiveName"
- value="${archiveRoot}-delta-pack.zip" />
- <property
- name="featureTempRoot"
- value="${eclipse.build.configs}/rcp.deltapack" />
- <property
- name="featureTempDir"
- value="featureTemp" />
- <property
- name="featureTemp"
- value="${featureTempRoot}/${featureTempDir}" />
- <property
- name="featureTemp2"
- value="${featureTempRoot}/featureTemp2" />
- </target>
-
- <target
- name="build"
- depends="init">
- <echo message="DEBUG: echoproperties at beginning of deltapack (after init)" />
- <echoproperties />
- <delete
- verbose="true"
- dir="${featureTemp}" />
- <mkdir dir="${featureTemp}" />
- <delete
- verbose="true"
- dir="${featureTemp2}" />
- <mkdir dir="${featureTemp2}" />
- <!--need to change slicing options to only include platform specific bits -->
- <p2.mirror
- source="file://${buildRepo}"
- log="${postingDirectory}/${buildLabel}/buildlogs/deltapackmirrorlog.txt"
- verbose="true"
- ignoreerrors="true">
- <destination
- kind="metadata"
- location="file://${featureTemp}"
- name="RCP Delta Pack Repo"
- format="file://${buildRepo}" />
- <destination
- kind="artifact"
- location="file://${featureTemp}"
- name="RCP Delta Pack Repo"
- format="file://${buildRepo}" />
- <iu
- id="org.eclipse.platform.feature.group"
- version="" />
- <iu
- id="org.eclipse.platform.source.feature.group"
- version="" />
- <iu
- id="org.eclipse.rcp.feature.group"
- version="" />
- <iu
- id="org.eclipse.rcp.source.feature.group"
- version="" />
- <iu
- id="org.eclipse.jdt.feature.group"
- version="" />
- <iu
- id="org.eclipse.jdt.source.feature.group"
- version="" />
- <iu
- id="org.eclipse.rcp.configuration.feature.group"
- version="" />
-
- <iu
- id="org.eclipse.equinox.executable"
- version="" />
- <iu
- id="org.eclipse.e4.rcp.feature.group"
- version="" />
- <iu
- id="org.eclipse.e4.rcp.source.feature.group"
- version="" />
- <slicingOptions
- includeOptional="false"
- includeNonGreedy="false"
- followStrict="true"
- followOnlyFilteredRequirements="true"
- latestVersionOnly="true"/>
- </p2.mirror>
- <p2.remove.iu>
- <repository location="file://${featureTemp}" />
- <iu id="org.eclipse.jdt.feature.jar" />
- <iu id="org.eclipse.jdt.source.feature.jar" />
- <iu id="org.eclipse.platform.feature.jar" />
- <iu id="org.eclipse.platform.source.feature.jar" />
- <iu id="org.eclipse.rcp.feature.jar" />
- <iu id="org.eclipse.rcp.source.feature.jar" />
- <iu id="org.eclipse.e4.rcp.feature.jar" />
- <iu id="org.eclipse.e4.rcp.source.feature.jar" />
- </p2.remove.iu>
- <p2.repo2runnable
- destination="${featureTemp2}/eclipse"
- failonerror="true">
- <source
- dir="${featureTempRoot}"
- includes="${featureTempDir}" />
- </p2.repo2runnable>
- <delete verbose="true">
- <fileset
- dir="${featureTemp2}/eclipse"
- includes="*.jar" />
- <fileset
- dir="${featureTemp2}/eclipse"
- includes="*.xml" />
- </delete>
- <antcall target="assembler" />
- </target>
-
- <target name="assembler">
- <mkdir dir="${equinoxPostingDirectory}/${buildLabel}/checksum" />
- <property
- name="archiveFullPath"
- value="${postingDirectory}/${buildLabel}/${archiveName}" />
- <exec
- executable="zip"
- dir="${featureTemp2}">
- <arg line="${archiveFullPath} -r ." />
- </exec>
- </target>
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml b/eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml
index 0846b1df2..98319c9e4 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml
@@ -1,11 +1,13 @@
-<project name="Build All Repos" default="all" basedir=".">
+<project
+ name="Build All Repos"
+ default="all"
+ basedir=".">
<target name="all">
- <!--call to generate pde, rcp, cvs and jdt repos -->
- <ant antfile="${eclipse.build.configs}/repos/build.xml" />
- <ant antfile="${eclipse.build.configs}/repos/platformrepo.xml" />
- <ant antfile="${eclipse.build.configs}/repos/rcprepo.xml" />
- <ant antfile="${eclipse.build.configs}/rcp.deltapack/build.xml" />
- </target>
+ <!--call to generate pde, rcp, cvs and jdt repos -->
+ <ant antfile="${eclipse.build.configs}/repos/build.xml" />
+ <ant antfile="${eclipse.build.configs}/repos/platformrepo.xml" />
+ <ant antfile="${eclipse.build.configs}/repos/rcprepo.xml" />
+ </target>
</project>

Back to the top