diff --git a/deploy/all.sh b/deploy/all.sh index b41fa5da4b..ea1229d8d4 100755 --- a/deploy/all.sh +++ b/deploy/all.sh @@ -3,9 +3,6 @@ # export SCRIPTS=`dirname $0` -cd ${SCRIPTS} -./mac32.sh - cd ${SCRIPTS} ./mac64.sh diff --git a/deploy/jre/.gitignore b/deploy/jre/.gitignore deleted file mode 100644 index a7e8081115..0000000000 --- a/deploy/jre/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.zip -*.gz \ No newline at end of file diff --git a/deploy/jre/download_jre.sh b/deploy/jre/download_jre.sh deleted file mode 100755 index 43efa5c97a..0000000000 --- a/deploy/jre/download_jre.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - - -################################################################################ -# Download prebuilt JREs from http://udig.refractions.net/files/downloads/jre/ # -# # -# There is a manual process for assembling your own JRE, or look at # -# linux_jre_build.sh for an automated example # -# # -# Each JRE has JAI and ImageIO installed as a JRE extension, since the # - -################################################################################ - -# Build Resources -export DOWNLOAD=http://udig.refractions.net/files/downloads/jre -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 - -if [[ ! -e "${JRE_LIN64}.tar.gz" ]]; then - echo "Attempting to download ${JRE_LIN64}." - wget --progress=bar ${DOWNLOAD}/${JRE_LIN64}.tar.gz - if [[ $? -ne 0 ]]; then - echo "Unable to download ${JRE_LIN64} bundle from Refractions." - exit - fi -fi - -if [[ ! -e ${JRE_LIN32}.tar.gz ]]; then - echo "Attempting to download ${JRE_LIN32}." - wget --progress=bar ${DOWNLOAD}/${JRE_LIN32}.tar.gz - if [[ $? -ne 0 ]]; then - echo "Unable to download ${JRE_LIN32} bundle from Refractions." - exit - fi -fi - -if [[ ! -e ${JRE_WIN32}.zip ]]; then - echo "Attempting to download ${WIN_LIN32}." - wget --progress=bar ${DOWNLOAD}/${JRE_WIN32}.zip - if [[ $? -ne 0 ]]; then - echo "Unable to download ${JRE_WIN32} bundle from Refractions." - exit - fi -fi - -if [[ ! -e ${JRE_WIN64}.zip ]]; then - echo "Attempting to download ${WIN_LIN64}." - wget --progress=bar ${DOWNLOAD}/${JRE_WIN64}.zip - if [[ $? -ne 0 ]]; then - echo "Unable to download ${JRE_WIN64} bundle from Refractions." - exit - fi -fi \ No newline at end of file diff --git a/deploy/jre/linux_jre_build.sh b/deploy/jre/linux_jre_build.sh deleted file mode 100755 index f9f8a1a22f..0000000000 --- a/deploy/jre/linux_jre_build.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -################################################################################ -# This script will build the linux32 jre required for uDig binary releases. # -# # -# The versions of various tasty bits are defined in the exports below. The # -# one thing this script will not do is download or install the jre, simply # -# because there's a clickthrough license that I didn't feel like sorting out. # -# As a result, you need to download and install the jre into the folder the # -# script is running in. Other things need to be valid versions. And the # -# imageie-ext bits need to be downloaded, since the folder structure isn't # -# predictable between versions. If things are already downloaded, they won't # -# be refetched. # -################################################################################ - -export jre_version=1.6.0_18 -export jai_version=1_1_3 -export imageio_version=1_1 -export imageioext_version=1.0.5 -export gdal_data_version=1.4.5 -export input='' - -if [[ ! -e jre${jre_version} ]]; then - echo "Please install the Sun JRE version ${jre_version} before building the jre package." - exit -fi - -if [[ ! -e jai-${jai_version} ]]; then - if [[ ! -e jai-${jai_version}-lib-linux-i586.tar.gz ]]; then - echo "Attempting to download jai version ${jai_version}." - wget --progress=bar http://download.java.net/media/jai/builds/release/${jai_version}/jai-${jai_version}-lib-linux-i586.tar.gz - if [[ $? -ne 0 ]]; then - echo "Unable to download jai version ${jai_version} from Sun. Please download the package manually before trying again." - exit - fi - fi - echo "Extracting jai verison ${jai_version}." - tar -xzf jai-${jai_version}-lib-linux-i586.tar.gz -fi - -if [[ ! -e jai_imageio-${imageio_version} ]]; then - if [[ ! -e jai_imageio-${imageio_version}-lib-linux-i586.tar.gz ]]; then - echo "Attempting to download jai-imageio version ${imageio_version}." - wget --progress=bar http://download.java.net/media/jai-imageio/builds/release/1.1/jai_imageio-1_1-lib-linux-i586.tar.gz - if [[ $? -ne 0 ]]; then - echo "Unable to download jai-imageio version ${imageio_verison} from Sun. Please download the package manually before trying again." - exit - fi - fi - echo "Extracting jai-imageio version ${imageio_version}." - tar -xzf jai_imageio-${imageio_version}-lib-linux-i586.tar.gz -fi - -if [[ ! -e imageioext-${imageioext_version} ]]; then - if [[ ! -e imageio-ext-${imageioext_version}-linux32-mrsid-ecw-lib.tar.gz ]]; then - echo "The imageio-ext package version ${imageioext_version} cannot be downloaded automatically. Please download it manually before trying again." - exit - fi - echo "Extracting imageio-ext version ${imageioext_version}." - mkdir imageioext-${imageioext_version} - cd imageioext-${imageioext_version} - tar -xzf ../imageio-ext-${imageioext_version}-linux32-mrsid-ecw-lib.tar.gz - cd .. -fi - -if [[ ! -e gdal_data-${gdal_data_version} ]]; then - if [[ ! -e gdal_data-${gdal_data_version}.zip ]]; then - echo "The imageio-ext gdal_data package version ${gdal_data_version} cannot be downloaded automatically. Please download it manually before trying again." - exit - fi - echo "Extracting imageio-ext gdal_data version ${gdal_data_version}." - mkdir gdal_data-${gdal_data_version} - cd gdal_data-${gdal_data_version} - unzip -qq ../gdal_data-${gdal_data_version}.zip - cd .. -fi - -echo "Building uDig jre version ${jre_version}." -cd jre${jre_version} - -# Copy in the JAI bits as follows: -# jar's into lib/ext -# so's into lib/i386 -# license stuffs into root -find ../jai-${jai_version}/ -name '*.jar' -exec cp {} lib/ext/ \; -find ../jai-${jai_version}/ -name '*.so' -exec cp {} lib/i386/ \; -find ../jai-${jai_version}/ -name '*.txt' -exec cp {} . \; - -# Copy in the JAI Image IO bits as follows: -# jar's into lib/ext -# so's into lib/i386 -# license stuffs into root -find ../jai_imageio-${imageio_version}/ -name '*.jar' -exec cp {} lib/ext/ \; -find ../jai_imageio-${imageio_version}/ -name '*.so' -exec cp {} lib/i386/ \; -find ../jai_imageio-${imageio_version}/ -name '*.txt' -exec cp {} . \; - -# Copy in the Image IO-ext bits indo lib/i386 -cp ../imageioext-${imageioext_version}/* lib/i386/ - -cd .. - -cp -R jre${jre_version} jre -cp -R gdal_data-${gdal_data_version} gdal_data - -tar -czf jre${jre_version}.linux.x86_gdal_ecw_mrsid.tar.gz jre/ gdal_data/ - -echo "Cleaning up stuff." - -rm -rf jai-${jai_version}/ jai_imageio-${imageio_version}/ imageioext-${imageioext_version}/ gdal_data-${gdal_data_version}/ jre/ gdal_data/ - diff --git a/deploy/lin32.sh b/deploy/lin32.sh index 94984b8cb7..f67f004929 100755 --- a/deploy/lin32.sh +++ b/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" diff --git a/deploy/lin64.sh b/deploy/lin64.sh index 55402e19d4..d5b48f1a73 100755 --- a/deploy/lin64.sh +++ b/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" diff --git a/deploy/mac32.sh b/deploy/mac32.sh deleted file mode 100755 index 5b79e0b270..0000000000 --- a/deploy/mac32.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -echo "Release mac osx 32" - -source ./support_functions.sh - -assemble "mac32" "macosx.cocoa.x86" "" \ No newline at end of file diff --git a/deploy/mac64.sh b/deploy/mac64.sh index 6367f4a757..595022ff03 100755 --- a/deploy/mac64.sh +++ b/deploy/mac64.sh @@ -3,4 +3,4 @@ echo "Release mac osx 64" source ./support_functions.sh -assemble "mac64" "macosx.cocoa.x86_64" "" \ No newline at end of file +assemble "mac64" "macosx.cocoa.x86_64" diff --git a/deploy/readme.txt b/deploy/readme.txt index 63d46d11f4..5c2fd97aaa 100644 --- a/deploy/readme.txt +++ b/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: diff --git a/deploy/support_functions.sh b/deploy/support_functions.sh index 362d357546..76a747d78b 100644 --- a/deploy/support_functions.sh +++ b/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 -} \ No newline at end of file diff --git a/deploy/versions.sh b/deploy/versions.sh index b6bb0f8cb2..3614b7a855 100755 --- a/deploy/versions.sh +++ b/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 diff --git a/deploy/win32.sh b/deploy/win32.sh index 7e37b80c04..e97807e48d 100755 --- a/deploy/win32.sh +++ b/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" diff --git a/deploy/win64.sh b/deploy/win64.sh index 429c9eb7f4..379bff6d1d 100755 --- a/deploy/win64.sh +++ b/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"