Skip to content
This repository has been archived by the owner on Apr 9, 2019. It is now read-only.

Commit

Permalink
Closes #31, #32, #33, #34 and #39. Thanks for all the pull requests g…
Browse files Browse the repository at this point in the history
…uys!
  • Loading branch information
flexiondotorg committed Jun 15, 2012
1 parent 0ea2c92 commit 48f49d0
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 8 deletions.
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Other contributors, listed alphabetically, are:
* Derek Chen-Becker - Added an option to skip rebuilding packages.
* Eshwar Andhavarapu - Added comments in the apt source file.
* Hannes Schmidt - Added an option to use a pre-existing signing key.
* Jameson J Lee - Added support for JCE Unlimited Strength Jurisdiction Policy Files and fixed downloading from Oracle (yet again).
* Ladios Jonquil - Added support for JCE Unlimited Strength Jurisdiction Policy Files and fixed downloading from Oracle (yet again).
* Martin Polden - Fixed download binary packages from Oracle.
* Miah Johnson - Fixed download binary packages from Oracle.
* onlymostlydead - Fixed downloading from Oracle (again).
Expand Down
16 changes: 16 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@
History
=======

0.2.4
-----
* Added support for JCE Unlimited Strength Jurisdiction Policy Files. Thanks to Ladios Jonquil and Jameson J Lee.

* Closes: https://github.com/flexiondotorg/oab-java6/issues/31

* Reverted to https for git clone of upstream tools.

* Closes: https://github.com/flexiondotorg/oab-java6/issues/32

* Updated download links to Sun Java 6 and Oracle Java 7. Thanks to Ladios Jonquil and Jameson J Lee.

* Closes: https://github.com/flexiondotorg/oab-java6/issues/33
* Closes: https://github.com/flexiondotorg/oab-java6/issues/34
* Closes: https://github.com/flexiondotorg/oab-java6/issues/39

0.2.3
-----
* Added an option to build ``oracle-java7`` packages.
Expand Down
23 changes: 20 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OAB-Java
========
oab-java.sh v0.2.3 - Create a local 'apt' repository for Sun Java 6 and/or Oracle Java 7 packages.
oab-java.sh v0.2.4 - Create a local 'apt' repository for Sun Java 6 and/or Oracle Java 7 packages.

Copyright (c) Martin Wimpress, http://flexion.org. MIT License

Expand Down Expand Up @@ -29,7 +29,7 @@ Like this.
::

cd ~/
wget https://github.com/flexiondotorg/oab-java6/raw/0.2.3/oab-java.sh -O oab-java.sh
wget https://github.com/flexiondotorg/oab-java6/raw/0.2.4/oab-java.sh -O oab-java.sh
chmod +x oab-java.sh
sudo ./oab-java.sh

Expand Down Expand Up @@ -111,6 +111,22 @@ Because, O.A.B! ;-)
History
=======

0.2.4
-----
* Added support for JCE Unlimited Strength Jurisdiction Policy Files. Thanks to Ladios Jonquil and Jameson J Lee.

* Closes: https://github.com/flexiondotorg/oab-java6/issues/31

* Reverted to https for git clone of upstream tools.

* Closes: https://github.com/flexiondotorg/oab-java6/issues/32

* Updated download links to Sun Java 6 and Oracle Java 7. Thanks to Ladios Jonquil and Jameson J Lee.

* Closes: https://github.com/flexiondotorg/oab-java6/issues/33
* Closes: https://github.com/flexiondotorg/oab-java6/issues/34
* Closes: https://github.com/flexiondotorg/oab-java6/issues/39

0.2.3
-----
* Added an option to build ``oracle-java7`` packages.
Expand Down Expand Up @@ -255,6 +271,8 @@ Other contributors, listed alphabetically, are:
* Derek Chen-Becker - Added an option to skip rebuilding packages.
* Eshwar Andhavarapu - Added comments in the apt source file.
* Hannes Schmidt - Added an option to use a pre-existing signing key.
* Jameson J Lee - Added support for JCE Unlimited Strength Jurisdiction Policy Files and fixed downloading from Oracle (yet again).
* Ladios Jonquil - Added support for JCE Unlimited Strength Jurisdiction Policy Files and fixed downloading from Oracle (yet again).
* Martin Polden - Fixed download binary packages from Oracle.
* Miah Johnson - Fixed download binary packages from Oracle.
* onlymostlydead - Fixed downloading from Oracle (again).
Expand All @@ -265,7 +283,6 @@ Many thanks for all contributions!
Todo
====

* Add support for JCE Unlimited Strength Jurisdiction Policy Files.
* Check the binary packages downloaded from Oracle are the correct size.
* Add support to build for a given Ubuntu distribution.
* Add support to optionally build using ``pbuilder``.
Expand Down
1 change: 0 additions & 1 deletion TODO
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
Todo
====

* Add support for JCE Unlimited Strength Jurisdiction Policy Files.
* Check the binary packages downloaded from Oracle are the correct size.
* Add support to build for a given Ubuntu distribution.
* Add support to optionally build using ``pbuilder``.
8 changes: 4 additions & 4 deletions oab-java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# - http://irtfweb.ifa.hawaii.edu/~lockhart/gpg/gpg-cs.html

# Version
VER="0.2.3"
VER="0.2.4"

# common ############################################################### START #
sp="/-\|"
Expand Down Expand Up @@ -401,15 +401,15 @@ chown root:root ${WORK_PATH}/gpg 2>/dev/null
chmod 0700 ${WORK_PATH}/gpg 2>/dev/null

# Remove the 'src' directory everytime.
ncecho " [x] Removing clones of http://github.com/rraptorr/${JAVA_UPSTREAM} "
ncecho " [x] Removing clones of https://github.com/rraptorr/${JAVA_UPSTREAM} "
rm -rfv ${WORK_PATH}/${JAVA_UPSTREAM}* 2>/dev/null >> "$log" 2>&1
rm -rfv ${WORK_PATH}/src 2>/dev/null >> "$log" 2>&1 &
pid=$!;progress $pid

# Clone the code
ncecho " [x] Cloning http://github.com/rraptorr/${JAVA_UPSTREAM} "
ncecho " [x] Cloning https://github.com/rraptorr/${JAVA_UPSTREAM} "
cd ${WORK_PATH}/ >> "$log" 2>&1
git clone http://github.com/rraptorr/${JAVA_UPSTREAM} src >> "$log" 2>&1 &
git clone https://github.com/rraptorr/${JAVA_UPSTREAM} src >> "$log" 2>&1 &
pid=$!;progress $pid

# Get the last commit tag.
Expand Down

0 comments on commit 48f49d0

Please sign in to comment.