diff options
author | Markus Knauer | 2014-08-07 16:37:23 +0000 |
---|---|---|
committer | Markus Knauer | 2014-08-07 16:37:46 +0000 |
commit | dc48fc5b201e52e1499c0593c4a182e7e2cd312f (patch) | |
tree | 550a5f14f9018c5eebe6625fa9af638af771f34d /releng/org.eclipse.epp.config | |
parent | 4286ee0d3c108357ee300333fed4f0fdf13e3457 (diff) | |
download | org.eclipse.epp.packages-dc48fc5b201e52e1499c0593c4a182e7e2cd312f.tar.gz org.eclipse.epp.packages-dc48fc5b201e52e1499c0593c4a182e7e2cd312f.tar.xz org.eclipse.epp.packages-dc48fc5b201e52e1499c0593c4a182e7e2cd312f.zip |
Upgrade configuration files from Luna to Eclipse Mars (4.5.0)
Change-Id: Icea756ad80e1cb9dd34db86615cf0d50c55e8ddf
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
Diffstat (limited to 'releng/org.eclipse.epp.config')
-rw-r--r-- | releng/org.eclipse.epp.config/build.xml | 4 | ||||
-rw-r--r-- | releng/org.eclipse.epp.config/parent/pom.xml | 8 | ||||
-rwxr-xr-x | releng/org.eclipse.epp.config/startEPPMars.sh (renamed from releng/org.eclipse.epp.config/startEPPLuna.sh) | 22 | ||||
-rw-r--r-- | releng/org.eclipse.epp.config/tools/addDownloadStats.xsl | 2 | ||||
-rwxr-xr-x | releng/org.eclipse.epp.config/tools/mirrorRepositories.sh | 2 | ||||
-rwxr-xr-x | releng/org.eclipse.epp.config/tools/releaseRename.sh | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/releng/org.eclipse.epp.config/build.xml b/releng/org.eclipse.epp.config/build.xml index ca7d0ea4..99d7359d 100644 --- a/releng/org.eclipse.epp.config/build.xml +++ b/releng/org.eclipse.epp.config/build.xml @@ -41,7 +41,7 @@ latestversiononly="false"/> <source> <sort> - <fileset dir="/tmp/luna"> + <fileset dir="/tmp/mars"> <include name="*"/> </fileset> <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators"> @@ -49,7 +49,7 @@ </reverse> </sort> </source> - <destination location="${targetRepository}" name="EPP Luna Package Repository" append="true" compressed="true" /> + <destination location="${targetRepository}" name="EPP Mars Package Repository" append="true" compressed="true" /> </p2.mirror> </target> diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index a2becb4e..04dd3298 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -18,7 +18,7 @@ <groupId>org.eclipse.epp</groupId> <artifactId>org.eclipse.epp-parent</artifactId> - <version>4.4.0-SNAPSHOT</version> + <version>4.5.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> @@ -34,11 +34,11 @@ <!-- The location that is used to assemble the single EPP configuration p2 repository --> <eclipse.epp.targetRepository>${eclipse.epp.archiveDirectory}/repository/</eclipse.epp.targetRepository> <!-- ID used to generate the filename of the packages --> - <eclipse.simultaneous.release.id>luna-R</eclipse.simultaneous.release.id> + <eclipse.simultaneous.release.id>mars-M1</eclipse.simultaneous.release.id> <!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) --> <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build> <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) --> - <eclipse.simultaneous.release.name>Luna Release (4.4.0)</eclipse.simultaneous.release.name> + <eclipse.simultaneous.release.name>Mars Milestone 1 (4.5.0M1)</eclipse.simultaneous.release.name> <!-- Upstream p2 repository, used as a source for pre-compiled build artifacts --> <eclipse.simultaneous.release.repository>http://download.eclipse.org/releases/staging/</eclipse.simultaneous.release.repository> </properties> @@ -89,7 +89,7 @@ <includePackedArtifacts>true</includePackedArtifacts> <!-- The Parallel Package feature.xml includes a number of other features that are marked as optional, and unfortunately they - seem to be missing in Luna. Ignoring these options features + seem to be missing in Mars. Ignoring these options features for now. <dependency-resolution> <optionalDependencies>ignore</optionalDependencies> diff --git a/releng/org.eclipse.epp.config/startEPPLuna.sh b/releng/org.eclipse.epp.config/startEPPMars.sh index c7f11ef9..4185d7a2 100755 --- a/releng/org.eclipse.epp.config/startEPPLuna.sh +++ b/releng/org.eclipse.epp.config/startEPPMars.sh @@ -14,7 +14,7 @@ FILESYSTEM_BASE="file:///home/data/httpd/download.eclipse.org" if [ ${BUILDLOCATION} = "server" ] then BASE_URL=${FILESYSTEM_BASE} - ECLIPSE="/shared/technology/epp/epp_build/luna/eclipse/eclipse" + ECLIPSE="/shared/technology/epp/epp_build/mars/eclipse/eclipse" JRE="/usr/local/bin/java" else BASE_URL=${HTTP_BASE} @@ -25,8 +25,8 @@ fi ############################################################################### # variables to adjust -BASE_DIR=/shared/technology/epp/epp_build/luna -RELEASE_NAME="-luna-M5" +BASE_DIR=/shared/technology/epp/epp_build/mars +RELEASE_NAME="-mars-M5" # variables START_TIME=`date -u +%Y%m%d-%H%M` @@ -35,25 +35,25 @@ STATUSFILENAME="status.stub" GITURL="/gitroot/epp/org.eclipse.epp.packages.git" GITBRANCH="HEAD" GITPROJECTPATH="packages" -DOWNLOAD_BASE_URL="http://build.eclipse.org/technology/epp/epp_build/luna/download" +DOWNLOAD_BASE_URL="http://build.eclipse.org/technology/epp/epp_build/mars/download" # directories and files DOWNLOAD_BASE_DIR="${BASE_DIR}/download" BUILD_DIR="${BASE_DIR}/build" DOWNLOAD_DIR="${DOWNLOAD_BASE_DIR}/${START_TIME}" -EPPREPO_INPUT_DIR="/shared/technology/epp/epp_repo/luna/epp.build/buildresult/org.eclipse.epp.allpackages.feature_4.4.0-eclipse.feature/site.p2" +EPPREPO_INPUT_DIR="/shared/technology/epp/epp_repo/mars/epp.build/buildresult/org.eclipse.epp.allpackages.feature_4.5.0-eclipse.feature/site.p2" EPPREPO_WORKINGCOPY_DIR="${DOWNLOAD_DIR}/repository" MARKERFILE="${DOWNLOAD_DIR}/${MARKERFILENAME}" STATUSFILE="${DOWNLOAD_DIR}/${STATUSFILENAME}" LOGFILE="${DOWNLOAD_DIR}/build.log" -LOCKFILE="/tmp/epp.build.luna.lock" +LOCKFILE="/tmp/epp.build.mars.lock" # repository locations -#REPO_ECLIPSE_URL="${BASE_URL}/eclipse/updates/4.4.x/" -#REPO_ECLIPSE_URL="${BASE_URL}/eclipse/updates/4.4milestones/" -#REPO_SIMRELEASE_URL="${BASE_URL}/releases/luna/" +#REPO_ECLIPSE_URL="${BASE_URL}/eclipse/updates/4.5.x/" +#REPO_ECLIPSE_URL="${BASE_URL}/eclipse/updates/4.5milestones/" +#REPO_SIMRELEASE_URL="${BASE_URL}/releases/mars/" REPO_STAGING_URL="${BASE_URL}/releases/staging/" -#REPO_EPP_URL="${BASE_URL}/technology/epp/packages/luna" +#REPO_EPP_URL="${BASE_URL}/technology/epp/packages/mars" #REPO_EPP_URL="file://${EPPREPO_INPUT_DIR}" REPO_EPP_WORKINGCOPY_URL="file://${EPPREPO_WORKINGCOPY_DIR}" @@ -199,7 +199,7 @@ do echo "......adding $FILE" cat ${FILE} >>${DOWNLOAD_BASE_DIR}/${STATUSFILENAME} done -cp -a --no-preserve=ownership ${DOWNLOAD_BASE_DIR}/${STATUSFILENAME} /home/data/httpd/download.eclipse.org/technology/epp/downloads/testing/statusLuna.stub +cp -a --no-preserve=ownership ${DOWNLOAD_BASE_DIR}/${STATUSFILENAME} /home/data/httpd/download.eclipse.org/technology/epp/downloads/testing/statusMars.stub diff --git a/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl b/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl index de41f846..159a4e46 100644 --- a/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl +++ b/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl @@ -22,7 +22,7 @@ Contributors: <xsl:template match="repository/properties"> <properties size='{@size+1}'> <xsl:copy-of select="property" /> - <property name='p2.statsURI' value='http://download.eclipse.org/stats/technology/epp/packages/luna' /> + <property name='p2.statsURI' value='http://download.eclipse.org/stats/technology/epp/packages/mars' /> </properties> </xsl:template> diff --git a/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh b/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh index 4b0720ab..a84f3bf8 100755 --- a/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh +++ b/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh @@ -2,7 +2,7 @@ # directory that points to an Eclipse SDK or similar ECLIPSE_DIR="/opt/eclipse/64/eclipse.rcp.kepler.m7" -#ECLIPSE_DIR="/shared/technology/epp/epp_build/luna/eclipse" +#ECLIPSE_DIR="/shared/technology/epp/epp_build/mars/eclipse" ECLIPSE="${ECLIPSE_DIR}/eclipse" diff --git a/releng/org.eclipse.epp.config/tools/releaseRename.sh b/releng/org.eclipse.epp.config/tools/releaseRename.sh index 148507eb..a86be1fc 100755 --- a/releng/org.eclipse.epp.config/tools/releaseRename.sh +++ b/releng/org.eclipse.epp.config/tools/releaseRename.sh @@ -1,6 +1,6 @@ #!/bin/bash -RELEASETRAIN=luna +RELEASETRAIN=mars RELEASEDIRECTORY=/home/data/httpd/download.eclipse.org/technology/epp/downloads/release TESTDIRECTORY=/shared/technology/epp/epp_build/${RELEASETRAIN}/download CURRENTDIR=${PWD} |