Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorPascal Rapicault2014-12-13 01:39:37 +0000
committerMarkus Knauer2014-12-15 22:52:52 +0000
commitc880263dcd06c5f8bc9aac87e96c589b124c1ae0 (patch)
tree6b28896948298404881fffa68363e7caea02f8c0 /releng
parent50f9b36ffbf3eb45bec6bc146e967948cad779e3 (diff)
downloadorg.eclipse.epp.packages-c880263dcd06c5f8bc9aac87e96c589b124c1ae0.tar.gz
org.eclipse.epp.packages-c880263dcd06c5f8bc9aac87e96c589b124c1ae0.tar.xz
org.eclipse.epp.packages-c880263dcd06c5f8bc9aac87e96c589b124c1ae0.zip
Use Tycho for creating the package archives including symbolic links
- Revert the change that used to be required to fix bug 424769 with symbolic links in tar archives. - Update to Tycho to 0.23.0-SNAPSHOT (temporary solution). - Use maven-antrun-plugin for copying the artifacts. Bug 455101: Use tycho zipping feature instead of createArchive.sh script https://bugs.eclipse.org/bugs/show_bug.cgi?id=455101 Signed-off-by: Pascal Rapicault <pascal@rapicorp.com> Change-Id: I7467f450af212b00a04b002fbe25919b994756e1
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.epp.config/parent/pom.xml60
-rwxr-xr-xreleng/org.eclipse.epp.config/tools/createArchives.sh48
2 files changed, 55 insertions, 53 deletions
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 8a506dbd..999c92c0 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -22,7 +22,7 @@
<packaging>pom</packaging>
<properties>
- <tycho.version>0.20.0</tycho.version>
+ <tycho.version>0.23.0-SNAPSHOT</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/epp/org.eclipse.epp.packages.git</tycho.scmUrl>
<cbi.version>1.1.1</cbi.version>
@@ -57,6 +57,10 @@
<id>eclipse-cbi</id>
<url>https://repo.eclipse.org/content/repositories/releases/</url>
</pluginRepository>
+ <pluginRepository>
+ <id>tycho-snapshots</id>
+ <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+ </pluginRepository>
</pluginRepositories>
<repositories>
@@ -196,7 +200,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
<pluginManagement>
@@ -232,14 +235,61 @@
<version>${tycho.version}</version>
</plugin>
<plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-p2-extras-plugin</artifactId>
+ <version>${tycho.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
<version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>materialize-products</id>
+ <goals>
+ <goal>materialize-products</goal>
+ <goal>archive-products</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <formats>
+ <linux>tar.gz</linux>
+ <macosx>tar.gz</macosx>
+ <win32>zip</win32>
+ </formats>
+ <products>
+ <product>
+ <id>${project.artifactId}</id>
+ <rootFolder>eclipse</rootFolder>
+ <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName>
+ </product>
+ </products>
+ <profile>${project.artifactId}</profile>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <version>${tycho.version}</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>copy-zips-to-archive-folder</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <target>
+ <copy todir="${basedir}/../../archive">
+ <fileset dir="${project.build.directory}/products">
+ <include name="*.zip" />
+ <include name="*.tar.gz" />
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</pluginManagement>
diff --git a/releng/org.eclipse.epp.config/tools/createArchives.sh b/releng/org.eclipse.epp.config/tools/createArchives.sh
deleted file mode 100755
index 70a05ac6..00000000
--- a/releng/org.eclipse.epp.config/tools/createArchives.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-if [[ "$#" -ne 3 ]]; then
- echo "Illegal number of parameters"
- exit 1
-fi
-
-TARGET_DIR="${1}"
-SOURCE_DIR="${2}"
-BASENAME="${3}"
-
-if [[ ! -d "${TARGET_DIR}" ]]; then
- echo "Creating target directory ${TARGET_DIR}"
- mkdir -p ${TARGET_DIR}
-fi
-echo "Starting archive creation in target directory ${TARGET_DIR}"
-
-if [[ ! -d "${SOURCE_DIR}" ]]; then
- echo "Source directory ${SOURCE_DIR} does not exist"
- exit 1
-fi
-echo "Using packages from source directory ${SOURCE_DIR}"
-
-# definition of OS, WS, ARCH, FORMAT combinations - DO NOT FORGET to adjust the for loop
-OSes=( win32 win32 linux linux macosx )
-WSes=( win32 win32 gtk gtk cocoa )
-ARCHes=( x86 x86_64 x86 x86_64 x86_64 )
-FORMAT=( zip zip tar.gz tar.gz tar.gz )
-
-for index in 0 1 2 3 4;
-do
- EXTENSION="${OSes[$index]}.${WSes[$index]}.${ARCHes[$index]}"
- echo -n "Building archive ${BASENAME} for ${EXTENSION} : "
- PACKAGE_DIR="${SOURCE_DIR}/${OSes[$index]}/${WSes[$index]}/${ARCHes[$index]}"
- cd "${PACKAGE_DIR}"
- if [[ ${OSes[$index]} = "win32" ]]; then
- PACKAGEFILE="${BASENAME}-${EXTENSION}.zip"
- zip -r -o -q ${TARGET_DIR}/${PACKAGEFILE} eclipse || exit 1
- else
- PACKAGEFILE="${BASENAME}-${EXTENSION}.tar.gz"
- tar zc --owner=100 --group=100 -f ${TARGET_DIR}/${PACKAGEFILE} eclipse || exit 1
- fi
- echo "${PACKAGEFILE}"
-done
-
-echo "Package archive creation in target directory ${TARGET_DIR} finished successfully"
-exit 0
-

Back to the top