cleanup deploy scripts

 * removed mac 32bit support
 * removed JRE download and re-packaging

Signed-off-by: Frank Gasdorf <[email protected]>

deploy/all.sh

@@ -3,9 +3,6 @@
 #
 export SCRIPTS=`dirname $0`
 
-cd ${SCRIPTS}
-./mac32.sh
-
 cd ${SCRIPTS}
 ./mac64.sh
 

deploy/lin32.sh

@@ -2,4 +2,4 @@
 echo "Release Linux 32"
 source ./support_functions.sh
 
-assemble "linux32" "linux.gtk.x86" "${JRE_LIN32}"
+assemble "linux32" "linux.gtk.x86"

deploy/lin64.sh

@@ -2,4 +2,4 @@
 echo "Release Linux 64"
 source ./support_functions.sh
 
-assemble "linux64" "linux.gtk.x86_64" "${JRE_LIN64}"
+assemble "linux64" "linux.gtk.x86_64"

deploy/mac64.sh

@@ -3,4 +3,4 @@ echo "Release mac osx 64"
 
 source ./support_functions.sh
 
-assemble "mac64" "macosx.cocoa.x86_64" ""
+assemble "mac64" "macosx.cocoa.x86_64"

deploy/readme.txt

@@ -5,16 +5,14 @@ This directory contains a series of scripts used to package the uDig
 application after it has been exported from eclipse.
 
 To use:
-1. Download the latest custom JREs into a jre/ folder
-2. Export udig.product to a subdirectory 1.2.x/ folder
-3. Update versions.sh to reflect the above two settings and the version you are releasing
-4. ./clean.sh - to remove the build directory
-5. Individual scripts to package:
+1. Export udig.product to a subdirectory 1.2.x/ folder
+2. Update versions.sh to reflect the above two settings and the version you are releasing
+3. ./clean.sh - to remove the build directory
+4. Individual scripts to package:
    ./win32 - package jre, udig.bat
    ./win64 - (pending the availability of an appropriate JRE)
    ./lin32 - package jre, udig.sh
    ./lin64 - package jre, udig.sh
-   ./mac32 - renames udig_internal back to udig
    ./mac64 - renames udig_internal back to udig
    ./sdk - very simple script removes configuration and application
 5. Upload to:

deploy/support_functions.sh

@@ -3,7 +3,6 @@ source ./versions.sh
 function assemble() {
     PLATFORM=$1
     EXT=$2
-    PLATFORM_JRE=$3
 
     echo "Looking for ${PRODUCT_TARGET}/org.locationtech.udig-product-${EXT}.zip"
 
@@ -25,10 +24,6 @@ function assemble() {
             echo "Extracting ${PRODUCT_TARGET}/org.locationtech.udig-product-${EXT}.zip"
             unzip -q -d ${BUILD}/${PLATFORM}/udig ${PRODUCT_TARGET}/org.locationtech.udig-product-${EXT}.zip
 
-            echo "Preparing ${BUILD}/${PLATFORM} with ${JRE}/${PLATFORM_JRE}"
-
-            extract_jre
-
             echo "Preparing ${BUILD}/${PLATFORM} with start up scripts and html files"
             prepare_resources
 
@@ -261,25 +256,3 @@ function check() {
     echo "$2 succeeded return value $1"
   fi
 }
-
-function extract_jre () {
-
-    if [[ $PLATFORM == linux* ]] ; then
-        echo "Looking for ${JRE}/${PLATFORM_JRE}.tar.gz"
-        if [ -f ${JRE}/${PLATFORM_JRE}.tar.gz ] ; then
-            echo "Extracting ${JRE}/${PLATFORM_JRE}.tar.gz"
-            tar xzf ${JRE}/${PLATFORM_JRE}.tar.gz -C ${BUILD}/${PLATFORM}/udig
-        else
-            echo "${JRE}/${PLATFORM_JRE}.tar.gz not found - user will require their own JRE"
-            exit
-        fi
-    else
-        echo "Looking for ${JRE}/${PLATFORM_JRE}.zip"
-        if [ -f ${JRE}/${PLATFORM_JRE}.zip ] ; then
-            echo "Extracting ${JRE}/${PLATFORM_JRE}.zip ..."
-            unzip -q -d ${BUILD}/${PLATFORM}/udig ${JRE}/${PLATFORM_JRE}.zip
-        else
-            echo "${JRE}/${PLATFORM_JRE}.zip not found - user will require their own JRE"
-        fi
-    fi
-}

deploy/versions.sh

@@ -18,15 +18,5 @@ export PRODUCT_TARGET="${BASE}/../features/org.locationtech.udig-product/target/
 # Tycho SDK Build
 export SDK_TARGET="${BASE}/../features/org.locationtech.udig_sdk-feature/target"
 
-# Build Resources
-export JRE="${BASE}/jre"
-export JRE_WIN32=jre1.6.0_25.win32_gdal_ecw
-export JRE_WIN64=jre1.6.0.win64
-export JRE_LIN32=jre1.6.0_25.lin32_jai_gdal_ecw
-export JRE_LIN64=jre1.6.0_25.lin64_gdal_ecw
-
 # echo "Staged for release by maven tycho build..."
 # ls ${PRODUCT_TARGET}/*.zip | xargs -n1 basename
-
-# echo "Available JREs:"
-# ls ${JRE} | xargs -n1 basename

deploy/win32.sh

@@ -2,4 +2,4 @@
 echo "Release Win 32"
 source ./support_functions.sh
 
-assemble "win32" "win32.win32.x86" "${JRE_WIN32}"
+assemble "win32" "win32.win32.x86"

deploy/win64.sh

@@ -2,4 +2,4 @@
 echo "Release Win 64"
 source ./support_functions.sh
 
-assemble "win64" "win32.win32.x86_64" "${JRE_WIN64}"
+assemble "win64" "win32.win32.x86_64"