Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2013-08-17 10:31:05 -0400
committerMarkus Knauer2013-08-17 10:31:05 -0400
commitff22ac3753f9082eb0ce10c4349dec7ae84bebb6 (patch)
tree5928323065a0863cdf60f4044a4ec7e73b01b0be /releng/org.eclipse.epp.config
parent54ae36ba68a0e768ca5ff22970c5832006521150 (diff)
downloadorg.eclipse.epp.packages-ff22ac3753f9082eb0ce10c4349dec7ae84bebb6.tar.gz
org.eclipse.epp.packages-ff22ac3753f9082eb0ce10c4349dec7ae84bebb6.tar.xz
org.eclipse.epp.packages-ff22ac3753f9082eb0ce10c4349dec7ae84bebb6.zip
Upgrade from Kepler to Luna
- Update feature.xml, epp.product, MANIFEST.MF, p2.inf, plugin.xml, epp.website.xml, pom.xml, ... from EPP 2.0 to 2.1 and adjust "Kepler" with new "Luna" - Update build scripts, map files, etc. - Create .project files for new virtual Tycho product projects
Diffstat (limited to 'releng/org.eclipse.epp.config')
-rw-r--r--releng/org.eclipse.epp.config/build.xml4
-rw-r--r--releng/org.eclipse.epp.config/packages_map.txt45
-rwxr-xr-xreleng/org.eclipse.epp.config/startEPPLuna.sh (renamed from releng/org.eclipse.epp.config/startEPPKepler.sh)22
-rw-r--r--releng/org.eclipse.epp.config/tools/addDownloadStats.xsl2
-rwxr-xr-xreleng/org.eclipse.epp.config/tools/functions.sh2
-rwxr-xr-xreleng/org.eclipse.epp.config/tools/mirrorRepositories.sh4
-rwxr-xr-xreleng/org.eclipse.epp.config/tools/releaseRename.sh2
7 files changed, 18 insertions, 63 deletions
diff --git a/releng/org.eclipse.epp.config/build.xml b/releng/org.eclipse.epp.config/build.xml
index 17a8f280..ca7d0ea4 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/juno">
+ <fileset dir="/tmp/luna">
<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 Juno Package Repository" append="true" compressed="true" />
+ <destination location="${targetRepository}" name="EPP Luna Package Repository" append="true" compressed="true" />
</p2.mirror>
</target>
diff --git a/releng/org.eclipse.epp.config/packages_map.txt b/releng/org.eclipse.epp.config/packages_map.txt
index e300f45e..e69de29b 100644
--- a/releng/org.eclipse.epp.config/packages_map.txt
+++ b/releng/org.eclipse.epp.config/packages_map.txt
@@ -1,45 +0,0 @@
-# EPP package definitions
-# name, [CVS,GIT], repository string, path to file, version [HEAD], EPP local filename
-
-# package definitions provided by EPP
-## 1st: EPP package definition
-## 2nd: feature.xml renamed
-
-automotive,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.automotive.feature/epp.website.xml,HEAD,automotive.xml
-automotive,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.automotive.feature/feature.xml,HEAD,automotive.feature.xml
-
-cpp,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.cpp.feature/epp.website.xml,HEAD,cpp.xml
-cpp,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.cpp.feature/feature.xml,HEAD,cpp.feature.xml
-
-#classic,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.classic.feature/epp.website.xml,HEAD,classic.xml
-#classic,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.classic.feature/feature.xml,HEAD,classic.feature.xml
-
-dsl,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.dsl.feature/epp.website.xml,HEAD,dsl.xml
-dsl,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.dsl.feature/feature.xml,HEAD,dsl.feature.xml
-
-java,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.java.feature/epp.website.xml,HEAD,java.xml
-java,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.java.feature/feature.xml,HEAD,java.feature.xml
-
-jee,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.jee.feature/epp.website.xml,HEAD,jee.xml
-jee,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.jee.feature/feature.xml,HEAD,jee.feature.xml
-
-modeling,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.modeling.feature/epp.website.xml,HEAD,modeling.xml
-modeling,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.modeling.feature/feature.xml,HEAD,modeling.feature.xml
-
-parallel,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.parallel.feature/epp.website.xml,HEAD,parallel.xml
-parallel,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.parallel.feature/feature.xml,HEAD,parallel.feature.xml
-
-rcp,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.rcp.feature/epp.website.xml,HEAD,rcp.xml
-rcp,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.rcp.feature/feature.xml,HEAD,rcp.feature.xml
-
-reporting,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.reporting.feature/epp.website.xml,HEAD,reporting.xml
-reporting,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.reporting.feature/feature.xml,HEAD,reporting.feature.xml
-
-scout,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.scout.feature/epp.website.xml,HEAD,scout.xml
-scout,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.scout.feature/feature.xml,HEAD,scout.feature.xml
-
-standard,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.standard.feature/epp.website.xml,HEAD,standard.xml
-standard,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.standard.feature/feature.xml,HEAD,standard.feature.xml
-
-testing,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.testing.feature/epp.website.xml,HEAD,testing.xml
-testing,GIT,/gitroot/epp/org.eclipse.epp.packages.git,packages/org.eclipse.epp.package.testing.feature/feature.xml,HEAD,testing.feature.xml
diff --git a/releng/org.eclipse.epp.config/startEPPKepler.sh b/releng/org.eclipse.epp.config/startEPPLuna.sh
index e407e2af..a71f5bf1 100755
--- a/releng/org.eclipse.epp.config/startEPPKepler.sh
+++ b/releng/org.eclipse.epp.config/startEPPLuna.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/kepler/eclipse/eclipse"
+ ECLIPSE="/shared/technology/epp/epp_build/luna/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/kepler
-RELEASE_NAME="-kepler-RC4"
+BASE_DIR=/shared/technology/epp/epp_build/luna
+RELEASE_NAME="-luna-M1"
# 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/kepler/download"
+DOWNLOAD_BASE_URL="http://build.eclipse.org/technology/epp/epp_build/luna/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/kepler/epp.build/buildresult/org.eclipse.epp.allpackages.feature_2.0.0-eclipse.feature/site.p2"
+EPPREPO_INPUT_DIR="/shared/technology/epp/epp_repo/luna/epp.build/buildresult/org.eclipse.epp.allpackages.feature_2.1.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.kepler.lock"
+LOCKFILE="/tmp/epp.build.luna.lock"
# repository locations
-#REPO_ECLIPSE_URL="${BASE_URL}/eclipse/updates/4.3.x/"
-#REPO_ECLIPSE_URL="${BASE_URL}/eclipse/updates/4.3milestones/"
-#REPO_SIMRELEASE_URL="${BASE_URL}/releases/kepler/"
+#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_STAGING_URL="${BASE_URL}/releases/staging/"
-#REPO_EPP_URL="${BASE_URL}/technology/epp/packages/kepler"
+#REPO_EPP_URL="${BASE_URL}/technology/epp/packages/luna"
#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/statusKepler.stub
+cp -a --no-preserve=ownership ${DOWNLOAD_BASE_DIR}/${STATUSFILENAME} /home/data/httpd/download.eclipse.org/technology/epp/downloads/testing/statusLuna.stub
diff --git a/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl b/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl
index b3a5c092..94c3015b 100644
--- a/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl
+++ b/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl
@@ -22,7 +22,7 @@ Gregoire Dupe
<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/kepler' />
+ <property name='p2.statsURI' value='http://download.eclipse.org/stats/technology/epp/packages/luna' />
</properties>
</xsl:template>
diff --git a/releng/org.eclipse.epp.config/tools/functions.sh b/releng/org.eclipse.epp.config/tools/functions.sh
index c60cbafe..199d4438 100755
--- a/releng/org.eclipse.epp.config/tools/functions.sh
+++ b/releng/org.eclipse.epp.config/tools/functions.sh
@@ -61,7 +61,7 @@ function pullAllConfigFiles {
FILEPATH=`echo ${II} | cut -d "," -f 4`
VERSION=`echo ${II} | cut -d "," -f 5`
FILENAME=`echo ${II} | cut -d "," -f 6`
-
+
if [ "${REPTYPE}" = "CVS" ]; then
cvsCheckout ${REPSTRING} ${FILEPATH} ${VERSION} ${2}/${FILENAME}
elif [ "${REPTYPE}" = "GIT" ]; then
diff --git a/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh b/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh
index 6fc02975..4b0720ab 100755
--- a/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh
+++ b/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# directory that points to an Eclipse SDK or similar
-ECLIPSE_DIR="/opt/eclipse/64/eclipse.rcp.juno"
-#ECLIPSE_DIR="/shared/technology/epp/epp_build/juno/eclipse"
+ECLIPSE_DIR="/opt/eclipse/64/eclipse.rcp.kepler.m7"
+#ECLIPSE_DIR="/shared/technology/epp/epp_build/luna/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 8d808d5a..148507eb 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=kepler
+RELEASETRAIN=luna
RELEASEDIRECTORY=/home/data/httpd/download.eclipse.org/technology/epp/downloads/release
TESTDIRECTORY=/shared/technology/epp/epp_build/${RELEASETRAIN}/download
CURRENTDIR=${PWD}

Back to the top