Omaha #4178 Java 1.7u76 Upgrade

Former-commit-id: 50c46ce076713a18076b45110e373fba6d39b841

rpms/awips2.core/Installer.java/1.7/component.spec

@@ -1,264 +0,0 @@
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
-%define _java_major_version 1.7
-%define _java_revision 65
-%define _java_version %{_java_major_version}.0_%{_java_revision}
-%define _build_arch %(uname -i)
-%define _java_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#
-# AWIPS II Java 1.7 Spec File
-#
-Name: awips2-java
-Summary: AWIPS II Java Distribution
-Version: %{_java_version}
-Release: %{_component_version}.%{_component_release}
-Group: AWIPSII
-BuildRoot: %{_build_root}
-BuildArch: %{_build_arch}
-URL: N/A
-License: N/A
-Distribution: N/A
-Vendor: Raytheon
-Packager: Bryan Kowal
-
-AutoReq: no
-provides: awips2-java
-
-%description
-AWIPS II Java Distribution - Contains Java SE Development Kit (JDK) 1.7.0_65
-plus additional libraries used by AWIPS II.
-
-%prep
-# Ensure that a "buildroot" has been specified.
-if [ "%{_build_root}" = "" ]; then
-   echo "ERROR: A BuildRoot has not been specified."
-   echo "FATAL: Unable to Continue ... Terminating."
-   exit 1
-fi
-
-if [ -d %{_build_root} ]; then
-   rm -rf %{_build_root}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-fi
-if [ -d %{_java_build_loc} ]; then
-   rm -rf %{_java_build_loc}
-fi
-mkdir -p %{_java_build_loc}
-
-%build
-
-%install
-build_arch=
-arch_directory=
-# determine the architecture based on the system architecture.
-if [ "%{_build_arch}" = "x86_64" ]; then
-   build_arch="amd64"
-   arch_directory="x86_64"
-   jdk_arch="x64"
-else
-   if [ "%{_build_arch}" = "i386" ]; then
-      build_arch="i586"
-      arch_directory="i386"
-      jdk_arch=${build_arch}
-   else
-      echo "ERROR: Unrecognized architecture '%{_build_arch}."
-      exit 1
-   fi
-fi
-
-JDK_BIN_var_javahome="jdk%{_java_version}"
-jdk_tar="jdk-7u%{_java_revision}-linux-${jdk_arch}.tar.gz"
-jai_bin="jai-1_1_3-lib-linux-${build_arch}-jdk.bin"
-jai_imageio_bin="jai_imageio-1_1-lib-linux-${build_arch}-jdk.bin"
-jai_bin_patch="jai.patch1"
-jai_imageio_bin_patch="jai_imageio.patch1"
-pydev_cert="pydev_certificate.cer"
-
-# locate the java src.
-CORE_PROJECT_DIR="%{_baseline_workspace}/rpms/awips2.core"
-INSTALLER_JAVA="${CORE_PROJECT_DIR}/Installer.java"
-JAVA_SRC_DIR="${INSTALLER_JAVA}/%{_java_major_version}/src"
-JAVA_COMMON_DIR="${INSTALLER_JAVA}/common"
-JAVA_SCRIPTS_DIR="${JAVA_COMMON_DIR}/scripts"
-JAVA_COMMON_SRC_DIR="${JAVA_COMMON_DIR}/src/${arch_directory}"
-JAVA_ARCH_SRC_DIR="${JAVA_SRC_DIR}/${arch_directory}"
-
-pushd . > /dev/null
-cd ${JAVA_ARCH_SRC_DIR}
-/bin/tar -xvf ${jdk_tar} -C %{_java_build_loc}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
-pushd . > /dev/null
-cd ${JAVA_COMMON_SRC_DIR}
-/usr/bin/patch -i ${jai_bin_patch} \
-   -o %{_java_build_loc}/${jai_bin}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-/usr/bin/patch -i ${jai_imageio_bin_patch} \
-   -o %{_java_build_loc}/${jai_imageio_bin}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
-mkdir -p %{_build_root}/awips2/java
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-mkdir -p %{_build_root}/etc/profile.d
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-chmod a+x %{_java_build_loc}/*.bin
-pushd . > /dev/null
-cd %{_build_root}/awips2/java
-# Used to automatically agree to software licenses.
-touch yes.txt
-echo "yes" > yes.txt
-
-/bin/mv %{_java_build_loc}/${JDK_BIN_var_javahome}/* .
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-%{_java_build_loc}/${jai_bin} < yes.txt
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-%{_java_build_loc}/${jai_imageio_bin} < yes.txt
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-rm -fv yes.txt
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
-# Our profile.d scripts.
-JAVA_PROFILED_DIR="${JAVA_SCRIPTS_DIR}/profile.d"
-cp -v ${JAVA_PROFILED_DIR}/* %{_build_root}/etc/profile.d
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-# The pydev certificate.
-cp -v ${JAVA_COMMON_DIR}/src/${pydev_cert} \
-   %{_build_root}/awips2/java/jre/lib/security
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-touch changeit.txt
-echo "changeit" > changeit.txt
-chmod 666 %{_build_root}/awips2/java/jre/lib/security/cacerts
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-%{_build_root}/awips2/java/bin/keytool -import \
-   -file %{_build_root}/awips2/java/jre/lib/security/pydev_certificate.cer \
-   -keystore %{_build_root}/awips2/java/jre/lib/security/cacerts \
-   -noprompt < changeit.txt
-rm -fv changeit.txt
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-# Remove jrockit missioncontrol
-rm -rf %{_build_root}/awips2/java/lib/missioncontrol
-rm -f %{_build_root}/awips2/java/bin/jmc.ini
-rm -f %{_build_root}/awips2/java/bin/jmc
-
-# The licenses
-mkdir -p %{_build_root}/awips2/java/licenses
-LEGAL_DIR="%{_baseline_workspace}/rpms/legal"
-cp -v ${LEGAL_DIR}/*.pdf \
-   %{_build_root}/awips2/java/licenses
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-%pre
-if [ "${1}" = "2" ]; then
-   # Upgrade. Removing the existing /awips2/java/man
-   # directory to prevent conflicts.
-   if [ -d /awips2/java/man ]; then
-      rm -rf /awips2/java/man
-      if [ $? -ne 0 ]; then
-         echo "ERROR: The awips2-java upgrade has FAILED."
-         exit 1
-      fi
-   fi
-fi
-
-%post
-%preun
-%postun
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-rm -rf %{_java_build_loc}
-
-%files
-%defattr(644,awips,fxalpha,755)
-%attr(755,root,root) /etc/profile.d/awips2Java.csh
-%attr(755,root,root) /etc/profile.d/awips2Java.sh
-%dir /awips2/java
-%dir /awips2/java/bin
-
-%doc /awips2/java/COPYRIGHT
-%doc /awips2/java/COPYRIGHT-jai_imageio.txt
-%doc /awips2/java/COPYRIGHT-jai.txt
-%doc /awips2/java/DISTRIBUTIONREADME-jai_imageio.txt
-%doc /awips2/java/DISTRIBUTIONREADME-jai.txt
-%doc /awips2/java/ENTITLEMENT-jai_imageio.txt
-%doc /awips2/java/jre/README
-%doc /awips2/java/jre/THIRDPARTYLICENSEREADME.txt
-%doc /awips2/java/jre/Welcome.html
-%doc /awips2/java/jre/LICENSE
-%doc /awips2/java/LICENSE
-%doc /awips2/java/LICENSE-jai_imageio.txt
-%doc /awips2/java/LICENSE-jai.txt
-%docdir /awips2/java/licenses
-%dir /awips2/java/licenses
-/awips2/java/licenses/*
-%docdir /awips2/java/man
-%dir /awips2/java/man
-/awips2/java/man/*
-%doc /awips2/java/README.html
-%doc /awips2/java/THIRDPARTYLICENSEREADME-jai_imageio.txt
-%doc /awips2/java/THIRDPARTYLICENSEREADME-jai.txt
-%doc /awips2/java/THIRDPARTYLICENSEREADME.txt
-%doc /awips2/java/THIRDPARTYLICENSEREADME-JAVAFX.txt
-%doc /awips2/java/jre/THIRDPARTYLICENSEREADME-JAVAFX.txt
-%doc /awips2/java/release
-%doc /awips2/java/UNINSTALL-jai
-%doc /awips2/java/UNINSTALL-jai_imageio
-%doc /awips2/java/jre/COPYRIGHT
-
-%dir /awips2/java/db
-/awips2/java/db/*
-%dir /awips2/java/include
-/awips2/java/include/*
-%dir /awips2/java/jre
-#/awips2/java/jre/.systemPrefs/.systemRootModFile
-%dir /awips2/java/jre/bin
-
-%dir /awips2/java/jre/lib
-
-%dir /awips2/java/jre/plugin
-/awips2/java/jre/plugin/*
-%dir /awips2/java/lib
-
-/awips2/java/src.zip
-
-%defattr(755,awips,fxalpha,755)
-/awips2/java/bin/*
-/awips2/java/lib/*
-/awips2/java/jre/bin/*
-/awips2/java/jre/lib/*

rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u65-linux-i586.tar.gz.REMOVED.git-id

@@ -1 +0,0 @@
-02af52f6d2dfb339dda7325b41e14e642c68031a

rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u65-linux-x64.tar.gz.REMOVED.git-id

@@ -1 +0,0 @@
-ddc235cad4204c594b2bc5302108650ba31f3704

rpms/awips2.core/Installer.java/build.sh

@@ -1,36 +0,0 @@
-# verify that the workspace, rpm top directory, and build root are available in the environment
-
-if [ -z ${WORKSPACE} ]; then
-   echo "Error: the location of the baseline workspace must be specified using the WORKSPACE environment variable."
-   exit 1
-fi
-if [ -z ${AWIPSII_TOP_DIR} ]; then
-   echo "Error: the location of the rpm top directory must be specified using the AWIPSII_TOP_DIR environment variable."
-   exit 1
-fi
-if [ -z ${AWIPSII_BUILD_ROOT} ]; then
-   echo "Error: the location of the AWIPS II build root must be specified using the AWIPSII_BUILD_ROOT environment variable."
-   exit 1
-fi
-
-function buildRPM()
-{
-   SPECS=${1}
-
-   /usr/bin/rpmbuild -ba \
-      --define "_topdir ${AWIPSII_TOP_DIR}" \
-      --define "_build_root ${AWIPSII_BUILD_ROOT}" \
-      --define "_baseline_workspace ${WORKSPACE}" \
-      --buildroot ${AWIPSII_BUILD_ROOT} \
-      ${SPECS}
-   if [ $? -ne 0 ]; then
-      return 1
-   fi
-}
-
-# build java 1.7
-SPECS=1.7/component.spec
-buildRPM ${SPECS}
-if [ $? -ne 0 ]; then
-   exit 1
-fi

rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.csh

@@ -1,10 +0,0 @@
-#!/bin/csh
-
-set JAVA_INSTALL="/awips2/java"
-setenv JAVA_HOME "${JAVA_INSTALL}"
-
-if $?PATH then
-   setenv PATH ${JAVA_INSTALL}/bin:$PATH
-else
-   setenv PATH ${JAVA_INSTALL}/bin
-endif

rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Is Java Installed?
-rpm -q awips2-java > /dev/null 2>&1
-RC=$?
-if [ ${RC} -ne 0 ]; then
-   return
-fi
-
-JAVA_INSTALL="/awips2/java"
-# Update The Environment
-export JAVA_HOME=${JAVA_INSTALL}
-# Determine If Java Is Already Part Of The Path.
-CHECK_PATH=`echo ${PATH} | grep ${JAVA_INSTALL}`
-if [ ! "${CHECK_PATH}" = "" ]; then
-   return
-fi
-# Java Is Not In The Path; Add It To The Path.
-export PATH=${JAVA_INSTALL}/bin:${PATH}

rpms/awips2.core/Installer.java/common/src/i386/jai.patch1

@@ -1,49 +0,0 @@
-*** jai-1_1_3-lib-linux-i586-jdk.bin	2011-09-08 14:03:07.000000000 -0500
---- jai-1_1_3-lib-linux-i586-jdk.bin.update	2011-09-08 14:04:43.000000000 -0500
-***************
-*** 1,6 ****
-  #!/bin/sh
-  PATH=/bin:/usr/bin
-! more <<EOF
-  
-  
-  
---- 1,6 ----
-  #!/bin/sh
-  PATH=/bin:/usr/bin
-! cat <<EOF
-  
-  
-  
-***************
-*** 81,89 ****
-  outname=install.sfx.$$
-  echo "Unpacking..."
-  if [ "`uname`" = "SunOS" ]; then
-!     /bin/tail +139 $0 > $outname
-  else
-!     tail -n +139 $0 > $outname
-  fi
-  if [ -x /usr/bin/cksum ] ; then
-      echo "Checksumming..."
---- 81,89 ----
-  outname=install.sfx.$$
-  echo "Unpacking..."
-  if [ "`uname`" = "SunOS" ]; then
-!     /bin/tail +137 $0 > $outname
-  else
-!     tail -n +137 $0 > $outname
-  fi
-  if [ -x /usr/bin/cksum ] ; then
-      echo "Checksumming..."
-***************
-*** 119,126 ****
-      else
-  	ARCH=i386  # solaris-i586 or solaris-amd64
-      fi
-- elif [ `expr "\`uname -m\`" : .*64.*` != '0' ]; then
-- 	ARCH=amd64 # linux-amd64
-  else
-  	ARCH=i386  # linux-i586
-  fi
---- 119,124 ----

rpms/awips2.core/Installer.java/common/src/i386/jai_imageio.patch1

@@ -1,45 +0,0 @@
-*** jai_imageio-1_1-lib-linux-i586-jdk.bin	2011-09-08 14:29:01.000000000 -0500
---- jai_imageio-1_1-lib-linux-i586-jdk.bin.update	2011-09-08 14:30:10.000000000 -0500
-***************
-*** 1,6 ****
-  #!/bin/sh
-  PATH=/bin:/usr/bin
-! more <<EOF
-  
-  
-  
---- 1,6 ----
-  #!/bin/sh
-  PATH=/bin:/usr/bin
-! cat <<EOF
-  
-  
-  
-***************
-*** 160,166 ****
-  fi
-  outname=install.sfx.$$
-  echo "Unpacking..."
-! tail +215 $0 > $outname
-  if [ -x /usr/bin/cksum ] ; then
-      echo "Checksumming..."
-  
---- 160,166 ----
-  fi
-  outname=install.sfx.$$
-  echo "Unpacking..."
-! tail -n +213 $0 > $outname
-  if [ -x /usr/bin/cksum ] ; then
-      echo "Checksumming..."
-  
-***************
-*** 195,202 ****
-      else
-  	ARCH=i386  # solaris-i586 or solaris-amd64
-      fi
-- elif [ `expr \`uname -m\` : .*64.*` != '0' ]; then
-- 	ARCH=amd64 # linux-amd64
-  else
-  	ARCH=i386  # linux-i586
-  fi
---- 195,200 ----

rpms/awips2.core/Installer.java/common/src/x86_64/jai.patch1

@@ -1,17 +0,0 @@
-*** jai-1_1_3-lib-linux-amd64-jdk.bin	2011-07-01 10:33:52.000000000 -0500
---- jai-1_1_3-lib-linux-amd64-jdk.bin.update	2011-07-05 14:23:31.000000000 -0500
-***************
-*** 1,6 ****
-  #!/bin/sh
-  PATH=/bin:/usr/bin
-! more <<EOF
-  
-  
-  
---- 1,6 ----
-  #!/bin/sh
-  PATH=/bin:/usr/bin
-! cat <<EOF
-  
-  
-  

rpms/awips2.core/Installer.java/common/src/x86_64/jai_imageio.patch1

@@ -1,33 +0,0 @@
-*** jai_imageio-1_1-lib-linux-amd64-jdk.bin	2011-07-05 09:24:04.000000000 -0500
---- jai_imageio-1_1-lib-linux-amd64-jdk.bin.update	2011-07-05 14:34:16.000000000 -0500
-***************
-*** 1,6 ****
-  #!/bin/sh
-  PATH=/bin:/usr/bin
-! more <<EOF
-  
-  
-  
---- 1,6 ----
-  #!/bin/sh
-  PATH=/bin:/usr/bin
-! cat <<EOF
-  
-  
-  
-***************
-*** 160,166 ****
-  fi
-  outname=install.sfx.$$
-  echo "Unpacking..."
-! tail +215 $0 > $outname
-  if [ -x /usr/bin/cksum ] ; then
-      echo "Checksumming..."
-  
---- 160,166 ----
-  fi
-  outname=install.sfx.$$
-  echo "Unpacking..."
-! tail -n +215 $0 > $outname
-  if [ -x /usr/bin/cksum ] ; then
-      echo "Checksumming..."

rpms/build/common/lookupRPM.sh

@@ -216,7 +216,7 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-java" ]; then
-      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.java"
+      export RPM_SPECIFICATION="${installer_dir}/java-1.7"
       return 0
    fi
    if [ "${1}" = "awips2-groovy" ]; then

rpms/build/common/rpms.sh

@@ -33,7 +33,7 @@ function buildJava()
 {
    pushd . > /dev/null 2>&1
 
-   cd ${WORKSPACE}/rpms/awips2.core/Installer.java
+   cd ${WORKSPACE}/installers/RPMs/java-1.7
    /bin/bash build.sh
    if [ $? -ne 0 ]; then
       return 1