Bug 517931 - Update branding and build scripts to 4.8

Change-Id: I95b5d010f0fe6c512c989c000513a150538a3d61
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

11 files changed, 172 insertions, 34 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
index 849f8a25c..ab1b017b9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
@@ -142,7 +142,7 @@
     -->
     <property
       name="eclipserun-repo"
-      value="http://download.eclipse.org/eclipse/updates/4.7-I-builds/" />
+      value="http://download.eclipse.org/eclipse/updates/4.8-I-builds/" />
     <echo message="eclipserun-repo: ${eclipserun-repo}" />
 
     <property
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
index 18f01b0d4..60279bbeb 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
@@ -1,8 +1,8 @@
 instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.7,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.7,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.8,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.8,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen,name:Photon);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen,name:Photon);\
   mkdir(path:${installFolder}/dropins);
 requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=toolingorg.eclipse.configuration.macosx
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index 94659b418..033045afa 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -1,8 +1,8 @@
 instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.7,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.7,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.8,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.8,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen,name:Photon);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen,name:Photon);\
   mkdir(path:${installFolder}/dropins);
 requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=toolingorg.eclipse.platform.configuration.macosx
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index e40bd6cf8..7dca6e649 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1165,11 +1165,11 @@ fn-summarize-apitooling ()
   EBuilderDir=$BUILD_DIR/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
   pushd "$BUILD_DIR"
   # Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports.
-#  FREEZE_PARAMS=" "
+  FREEZE_PARAMS=" "
   # When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions.
-  FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.7M6-201703082000/eclipse-SDK-4.7M6-win32.zip \
-    -DfreezeName=Eclipse-SDK-4.7M6 \
-    -DfreezeFilename=eclipse-SDK-4.7M6-win32.zip "
+#  FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.7M6-201703082000/eclipse-SDK-4.7M6-win32.zip \
+#    -DfreezeName=Eclipse-SDK-4.7M6 \
+#    -DfreezeFilename=eclipse-SDK-4.7M6-win32.zip "
   # this API_PREV_REF_LABEL variable should be changed any time the version used
   # by previousBaseURL changes. Its purpose is just to localize changes to this one
   # place, and not have to make further, hard-coded changes to php files.
@@ -1177,8 +1177,8 @@ fn-summarize-apitooling ()
   # NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release".
   API_PREV_REF_LABEL=4.6.3
   fn-write-property API_PREV_REF_LABEL
-  API_FREEZE_REF_LABEL=4.7M6
-#  API_FREEZE_REF_LABEL=" "
+#  API_FREEZE_REF_LABEL=4.7M6
+  API_FREEZE_REF_LABEL=" "
   fn-write-property API_FREEZE_REF_LABEL
   java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
     -data ${BUILD_DIR}/workspace-apitoolingsLogs \
@@ -1243,6 +1243,10 @@ fn-publish-eclipse ()
   then
     touch buildHidden
   fi
+  if [[ "$BUILD_STREAM" == "4.8.0" ]]
+  then
+    touch buildHidden
+  fi
   popd
 }
 
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index a941fbc34..58943e108 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -18,7 +18,7 @@ source localBuildProperties.shsource 2>/dev/null
 export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
 
 export BRANCH=${BRANCH:-master}
-export STREAM=${STREAM:-4.7.0}
+export STREAM=${STREAM:-4.8.0}
 export BUILD_TYPE=${BUILD_TYPE:-N}
 
 # If not set be caller, make sure its an empty string
diff --git a/production/createReports.sh b/production/createReports.sh
index 74eb17d12..a474e8a06 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -63,7 +63,7 @@ function latestSimpleRepo
 
 if [[ ${build_type} == "N" ]]
 then
-  update_dir_segment="4.7-N-builds"
+  update_dir_segment="4.8-N-builds"
   # Note: I am not sure all N-build comparisons are meaninful.
   #       we may want a way to "skip" those comparisons.
   latest_M_build=$(latestSimpleRepo "${repo_root}/4.6-M-builds" "M20*")
@@ -73,15 +73,15 @@ then
     exit $RC
   fi
   echo -e "\tlatest_M_build: $latest_M_build"
-  buildIdToCompare="4.6-M-builds/${latest_M_build}"
+  buildIdToCompare="4.7-M-builds/${latest_M_build}"
 elif [[ ${build_type} == "M" ]]
 then
-  update_dir_segment="4.6-M-builds"
-  buildIdToCompare="4.6/R-4.6.3-201703010400"
+  update_dir_segment="4.7-M-builds"
+  buildIdToCompare="4.7/R-4.6.3-201703010400"
   echo -e "\tlatest_R_build: R-4.6.3-201703010400"
 elif [[ ${build_type} == "I" ]]
 then
-  update_dir_segment="4.7-I-builds"
+  update_dir_segment="4.8-I-builds"
   # We use a function that gets the "latest" simple repo under
   # 4.6-M-builds and use that automatically so each I-build automatically is
   # compared to the latest M-build, instead of having to manually update this value
@@ -94,10 +94,10 @@ then
     exit $RC
   fi
   echo -e "\tlatest_M_build: $latest_M_build"
-  buildIdToCompare="4.6-M-builds/${latest_M_build}"
+  buildIdToCompare="4.7-M-builds/${latest_M_build}"
 elif [[ ${build_type} == "Y" ]]
 then
-  update_dir_segment="4.7-Y-builds"
+  update_dir_segment="4.8-Y-builds"
   # Note: we use same value for Y-builds as for I-builds, since conceptually
   # they are the same, except that Y-builds use some code from BETA_JAVA9 branch.
   latest_M_build=$(latestSimpleRepo "${repo_root}/4.6-M-builds" "M20*")
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index a5540e7e6..8aeac5de1 100755
--- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh
+++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
@@ -33,6 +33,10 @@ repoList="\
 /eclipse/updates/4.7-N-builds/ \
 /eclipse/updates/4.7-I-builds/ \
 /eclipse/updates/4.7milestones/ \
+/eclipse/updates/4.8-P-builds/ \
+/eclipse/updates/4.8-Y-builds/ \
+/eclipse/updates/4.8-I-builds/ \
+/eclipse/updates/4.8milestones/ \
 
 "
 
diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
index d5ce674a8..733a1e88a 100755
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
@@ -59,15 +59,15 @@ BUILDFILESTR="-f ${BUILDFILE}"
 currentStream=$1
 if [[ -z "${currentStream}" ]]
 then
-  printf "\n\t%s\t%s\n" "WARNING:" "Current stream version not specified on command line, assuming 4.7"
-  currentStream="4.7"
+  printf "\n\t%s\t%s\n" "WARNING:" "Current stream version not specified on command line, assuming 4.8"
+  currentStream="4.8"
 fi
 
 maintenanceStream=$2
 if [[ -z "${maintenanceStream}" ]]
 then
-  printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.6"
-  maintenanceStream="4.6"
+  printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.7"
+  maintenanceStream="4.7"
 fi
 
 
diff --git a/production/sdk/bootstrap/mb4I_hudson_photon.sh b/production/sdk/bootstrap/mb4I_hudson_photon.sh
new file mode 100755
index 000000000..476c1214b
--- /dev/null
+++ b/production/sdk/bootstrap/mb4I_hudson_photon.sh
@@ -0,0 +1,130 @@
+#!/usr/bin/env bash
+
+# This job is just like its cronjob counter part, except it 
+# turns off verbose debugging (else Hudson logs would be 300 MB)
+# and does not pipe output to separate files, but lets it all go 
+# to Hudson't "console". 
+# Normally resides in $BUILD_HOME
+
+function usage()
+{
+  printf "\n\tSimple script start a build of a certain stream." >&2
+  printf "\n\tUsage: %s [[-h] | [-t]] " $(basename $0) >&2
+  printf "\n\t\t%s\n" "where h==help, t==test build " >&2
+}
+
+# Start with minimal path for consistency across machines
+# plus, cron jobs do not inherit an environment
+# care is needed not have anything in ${HOME}/bin that would effect the build
+# unintentionally, but is required to make use of "source localBuildProperties.shsource" on
+# local machines.
+# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it
+# to false) for a test I-build on a remote machine.
+export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin
+# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves)
+unset JAVA_HOME
+unset JAVA_ROOT
+unset JAVA_JRE
+unset CLASSPATH
+unset JAVA_BINDIR
+unset JRE_HOME
+
+# 0002 is often the default for shell users, but it is not when ran from
+# a cron job, so we set it explicitly, so releng group has write access to anything
+# we create.
+NEWUMASK="0002"
+oldumask=$(umask)
+umask $NEWUMASK
+
+echo "ulimit (file handles): $( ulimit -n ) "
+ulimit -n 4096
+echo "ulimit (file handles): $( ulimit -n ) "
+
+echo "locale charmap: $(locale charmap)"
+echo "LC_ALL: $LC_ALL"
+echo "LANG: $LANG"
+echo "LANGUAGE: $LANGUAGE"
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+export LANGUAGE=en_US.UTF-8
+echo "LC_ALL: $LC_ALL"
+echo "LANG: $LANG"
+echo "LANGUAGE: $LANGUAGE"
+echo "locale charmap: $(locale charmap)"
+
+# all optional
+# normally, when ran from crobjob, none should be specified
+while getopts 'ht' OPTION
+do
+  case $OPTION in
+    h)    usage
+      exit
+      ;;
+    t)    export testbuildonly=true
+      ;;
+  esac
+done
+
+# this localBuildProperties.shsource file is to ease local builds to override some variables.
+# It should not be used for production builds.
+source localBuildProperties.shsource 2>/dev/null
+
+# BUILD_HOME defines the "top" of the build area (for all types of builds)
+export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
+
+SCRIPT_NAME=$0
+
+echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) "
+
+echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
+
+export BRANCH=master
+export BUILD_TYPE=I
+export STREAM=4.8.0
+
+eclipseStreamMajor=${STREAM:0:1}
+
+# unique short name for stream and build type
+BUILDSTREAMTYPEDIR=${eclipseStreamMajor}$BUILD_TYPE
+
+export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR}
+
+# These values for proxies come from the configuration files of the Releng HIPP instance. 
+# They are normally defined in "ANT_OPTS" and similar environment variables, but 
+# the JavaDoc program requires them is this special -Jflag form. 
+export JAVA_DOC_PROXIES=${JAVA_DOC_PROXIES:-"-J-Dhttps.proxyHost=proxy.eclipse.org -J-Dhttps.proxyPort=9898 -J-Dhttps.nonProxyHosts=\"172.30.206.*\""}
+
+# These definitions are primarily for Curl. (Wget and other programs use different env variables or parameters
+export NO_PROXY=${NO_PROXY:-eclipse.org,build.eclipse.org,download.eclipse.org,archive.eclipse.org,dev.eclipes.org,git.eclipse.org}
+export ALL_PROXY=${ALL_PROXY:-proxy.eclipse.org:9898}
+
+# default (later) is set to 'true'. 
+# set to false here for less output.
+# setting to false until  bug 495750 is fixed, else too much output.
+# export MVN_DEBUG=false
+
+
+export PRODUCTION_SCRIPTS_DIR=production
+if [[ -z "${WORKSPACE}" ]]
+then
+   export RUNNING_ON_HUDSON=false
+else
+   export RUNNING_ON_HUDSON=true
+fi
+echo -e "\n\t[INFO]RUNNING_ON_HUDSON: $RUNNING_ON_HUDSON"
+
+# To allow this cron job to work from hudson, or traditional crontab
+if [[ -z "${WORKSPACE}" ]]
+then
+  export UTILITIES_HOME=/shared/eclipse
+  source $BUILD_HOME/bootstrap.shsource
+  makeProductionDirectoryOnBuildMachine
+  # build_eclipse_org.shsource should come from branch 
+  # though ideally  the rest of "production" directory would be identical between branches.
+${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/master-build.sh "${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/build_eclipse_org.shsource" 
+else
+  export UTILITIES_HOME=${WORKSPACE}/utilities/production
+  source $UTILITIES_HOME/sdk/bootstrap/bootstrap.shsource
+  $UTILITIES_HOME/master-build.sh $UTILITIES_HOME/build_eclipse_org.shsource
+fi
+
diff --git a/production/sdk/cleaners/cleanupNightlyRepo.sh b/production/sdk/cleaners/cleanupNightlyRepo.sh
index 21d34b061..b2130634a 100755
--- a/production/sdk/cleaners/cleanupNightlyRepo.sh
+++ b/production/sdk/cleaners/cleanupNightlyRepo.sh
@@ -207,12 +207,12 @@ function cleanRepo ()
 
 remoteBase="/home/data/httpd/download.eclipse.org"
 
-eclipseNRepo="${remoteBase}/eclipse/updates/4.7-N-builds"
-eclipseIRepo="${remoteBase}/eclipse/updates/4.7-I-builds"
-eclipseMRepo="${remoteBase}/eclipse/updates/4.6-M-builds"
-eclipseSRepo="${remoteBase}/eclipse/updates/4.7milestones"
-eclipseYRepo="${remoteBase}/eclipse/updates/4.7-Y-builds"
-eclipsePRepo="${remoteBase}/eclipse/updates/4.7-P-builds"
+eclipseNRepo="${remoteBase}/eclipse/updates/4.8-N-builds"
+eclipseIRepo="${remoteBase}/eclipse/updates/4.8-I-builds"
+eclipseMRepo="${remoteBase}/eclipse/updates/4.7-M-builds"
+eclipseSRepo="${remoteBase}/eclipse/updates/4.8milestones"
+eclipseYRepo="${remoteBase}/eclipse/updates/4.8-Y-builds"
+eclipsePRepo="${remoteBase}/eclipse/updates/4.8-P-builds"
 
 #doDryrun=dryrun
 doDryrun=
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index dccec2b4d..8b43bc3d7 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -5,7 +5,7 @@
 
 # purely title or identifier for display, to help confirm right file
 # is being retrieved and used.
-streamSpecificPropertiesTitle="Properties for 4.7.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.8.0 builds and tests"
 
 # These "previousRelease" variables are primarily used to have a
 # stable version of Eclipse, that is used, for example, for it's p2