Permalink
Browse files

Updated deps for Oracle Java 7.

  • Loading branch information...
1 parent 2faf967 commit 01419e6d41d19284cc982742567b954240bc0480 @flexiondotorg committed Aug 8, 2012
Showing with 13 additions and 7 deletions.
  1. +3 −2 README.rst
  2. +1 −0 TODO
  3. +9 −5 oab-java.sh
View
@@ -1,6 +1,6 @@
OAB-Java
========
-oab-java.sh v0.2.4 - Create a local 'apt' repository for Sun Java 6 and/or Oracle Java 7 packages.
+oab-java.sh v0.2.5 - Create a local 'apt' repository for Sun Java 6 and/or Oracle Java 7 packages.
Copyright (c) Martin Wimpress, http://flexion.org. MIT License
@@ -29,7 +29,7 @@ Like this.
::
cd ~/
- wget https://github.com/flexiondotorg/oab-java6/raw/0.2.4/oab-java.sh -O oab-java.sh
+ wget https://github.com/flexiondotorg/oab-java6/raw/0.2.5/oab-java.sh -O oab-java.sh
chmod +x oab-java.sh
sudo ./oab-java.sh
@@ -284,6 +284,7 @@ Todo
====
* Check the binary packages downloaded from Oracle are the correct size.
+* Use `fakeroot` rather than `sudo`.
* Add support to build for a given Ubuntu distribution.
* Add support to optionally build using ``pbuilder``.
View
1 TODO
@@ -3,6 +3,7 @@ Todo
====
* Check the binary packages downloaded from Oracle are the correct size.
+* Use `fakeroot` rather than `sudo`.
* Add support to build for a given Ubuntu distribution.
* Add support to optionally build using ``pbuilder``.
View
@@ -9,7 +9,7 @@
# - http://irtfweb.ifa.hawaii.edu/~lockhart/gpg/gpg-cs.html
# Version
-VER="0.2.4"
+VER="0.2.5"
# common ############################################################### START #
sp="/-\|"
@@ -357,9 +357,9 @@ OPTSTRING=7bchk:s
while getopts ${OPTSTRING} OPT
do
case ${OPT} in
- 7)
+ 7)
JAVA_DEV="oracle-java"
- JAVA_UPSTREAM="oracle-java7"
+ JAVA_UPSTREAM="oracle-java7"
;;
b) build_docs;;
c) BUILD_CLEAN=1;;
@@ -386,6 +386,10 @@ if [ "${LSB_ARCH}" == "amd64" ]; then
BUILD_DEPS="${BUILD_DEPS} lib32asound2 ia32-libs"
fi
+if [ "${JAVA_UPSTREAM}" == "oracle-java7" ]; then
+ BUILD_DEPS="${BUILD_DEPS} libxrender1"
+fi
+
# Install the Java build requirements
ncecho " [x] Installing Java build requirements "
apt-get install -y --no-install-recommends ${BUILD_DEPS} >> "$log" 2>&1 &
@@ -447,8 +451,8 @@ if [ -z "${DOWNLOAD_FOUND}" ]; then
wget http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-javase6-419409.html -O /tmp/oab-download.html >> "$log" 2>&1 &
else
wget http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-javase7-521261.html -O /tmp/oab-download.html >> "$log" 2>&1 &
- fi
- pid=$!;progress $pid
+ fi
+ pid=$!;progress $pid
fi
# Set the files we're downloading since sun-java6 and oracle-java7 differ.

0 comments on commit 01419e6

Please sign in to comment.