Author: barryh-guest
Date: 2006-02-26 05:54:43 +0000 (Sun, 26 Feb 2006)
New Revision: 1934
Modified:
trunk/java-package/debian/changelog
trunk/java-package/debian/control
trunk/java-package/lib/blackdown-j2re.sh
trunk/java-package/lib/blackdown-j2sdk.sh
trunk/java-package/lib/common.sh
trunk/java-package/lib/ibm-j2re.sh
trunk/java-package/lib/ibm-j2sdk.sh
trunk/java-package/lib/sun-j2re.sh
trunk/java-package/lib/sun-j2sdk.sh
trunk/java-package/make-jpkg
Log:
refactoring for architecture evaluation, plus code cleanup and corrections for
i486-linux-gnu evaluation of DEB_BUILD_GNU_TYPE
Modified: trunk/java-package/debian/changelog
===================================================================
--- trunk/java-package/debian/changelog 2006-02-23 07:17:33 UTC (rev 1933)
+++ trunk/java-package/debian/changelog 2006-02-26 05:54:43 UTC (rev 1934)
@@ -13,10 +13,9 @@
* Added quotes to variable tests for maintainer name and email
(Closes: #342623)
* Refactored architecture evaluation to eliminate repetition and
- suppress spurious warnings from dpkg-architecture when gcc is
- not present (Closes: #281766)
+ evaluate DEB_BUILD_GNU_TYPE correctly for i486-linux-gnu
- -- Barry Hawkins <[EMAIL PROTECTED]> Tue, 07 Feb 2006 22:55:33 -0500
+ -- Barry Hawkins <[EMAIL PROTECTED]> Sun, 26 Feb 2006 00:54:00 -0500
java-package (0.27) unstable; urgency=low
Modified: trunk/java-package/debian/control
===================================================================
--- trunk/java-package/debian/control 2006-02-23 07:17:33 UTC (rev 1933)
+++ trunk/java-package/debian/control 2006-02-26 05:54:43 UTC (rev 1934)
@@ -2,7 +2,7 @@
Section: contrib/misc
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
-Uploaders: Takashi Okamoto <[EMAIL PROTECTED]>, Carlos Laviola <[EMAIL
PROTECTED]>, Arnaud Vandyck <[EMAIL PROTECTED]>, Jeroen van Wolffelaar <[EMAIL
PROTECTED]>, Barry Hawkins <[EMAIL PROTECTED]>
+Uploaders: Carlos Laviola <[EMAIL PROTECTED]>, Arnaud Vandyck <[EMAIL
PROTECTED]>, Jeroen van Wolffelaar <[EMAIL PROTECTED]>, Barry Hawkins <[EMAIL
PROTECTED]>
Build-Depends: debhelper (>= 4.0.0)
Standards-Version: 3.6.2.1
Modified: trunk/java-package/lib/blackdown-j2re.sh
===================================================================
--- trunk/java-package/lib/blackdown-j2re.sh 2006-02-23 07:17:33 UTC (rev
1933)
+++ trunk/java-package/lib/blackdown-j2re.sh 2006-02-26 05:54:43 UTC (rev
1934)
@@ -1,9 +1,9 @@
# Detect product
function blackdown_j2re_detect() {
local found=
- evaluate_architecture
+
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
- i386|i386-linux)
+ i386|i486-linux-gnu)
case "$archive_name" in
"j2re-1.3.1-02b-FCS-linux-i386.bin") # SUPPORTED
j2se_version=1.3.1+02a
Modified: trunk/java-package/lib/blackdown-j2sdk.sh
===================================================================
--- trunk/java-package/lib/blackdown-j2sdk.sh 2006-02-23 07:17:33 UTC (rev
1933)
+++ trunk/java-package/lib/blackdown-j2sdk.sh 2006-02-26 05:54:43 UTC (rev
1934)
@@ -1,9 +1,9 @@
# Detect product
function blackdown_j2sdk_detect() {
local found=
- evaluate_architecture
+
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
- i386|i386-linux)
+ i386|i486-linux-gnu)
case "$archive_name" in
"j2sdk-1.3.1-02a-FCS-linux-i386.bin") # SUPPORTED
j2se_version=1.3.1+02a
Modified: trunk/java-package/lib/common.sh
===================================================================
--- trunk/java-package/lib/common.sh 2006-02-23 07:17:33 UTC (rev 1933)
+++ trunk/java-package/lib/common.sh 2006-02-26 05:54:43 UTC (rev 1934)
@@ -181,6 +181,14 @@
}
# provide the architecture for evaluation by plugins
-function evaluate_architecture() {
- eval $(dpkg-architecture)
-}
\ No newline at end of file
+function get_architecture() {
+ echo
+
+ export DEB_BUILD_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
+
+ export DEB_BUILD_GNU_TYPE=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ echo "Detected Debian build architecture: ${DEB_BUILD_ARCH:-N/A}"
+
+ echo "Detected Debian GNU type: ${DEB_BUILD_GNU_TYPE:-N/A}"
+}
Modified: trunk/java-package/lib/ibm-j2re.sh
===================================================================
--- trunk/java-package/lib/ibm-j2re.sh 2006-02-23 07:17:33 UTC (rev 1933)
+++ trunk/java-package/lib/ibm-j2re.sh 2006-02-26 05:54:43 UTC (rev 1934)
@@ -1,9 +1,9 @@
# Detect product
function ibm_j2re_detect() {
local found=
- evaluate_architecture
+
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
- i386|i386-linux)
+ i386|i486-linux-gnu)
case "$archive_name" in
"IBMJava2-JRE-131.tgz") # SUPPORTED
j2se_version=1.3.1
Modified: trunk/java-package/lib/ibm-j2sdk.sh
===================================================================
--- trunk/java-package/lib/ibm-j2sdk.sh 2006-02-23 07:17:33 UTC (rev 1933)
+++ trunk/java-package/lib/ibm-j2sdk.sh 2006-02-26 05:54:43 UTC (rev 1934)
@@ -1,9 +1,9 @@
# Detect product
function ibm_j2sdk_detect() {
local found=
- evaluate_architecture
+
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
- i386|i386-linux)
+ i386|i486-linux-gnu)
case "$archive_name" in
"IBMJava2-SDK-131.tgz") # SUPPORTED
j2se_version=1.3.1
Modified: trunk/java-package/lib/sun-j2re.sh
===================================================================
--- trunk/java-package/lib/sun-j2re.sh 2006-02-23 07:17:33 UTC (rev 1933)
+++ trunk/java-package/lib/sun-j2re.sh 2006-02-26 05:54:43 UTC (rev 1934)
@@ -1,9 +1,9 @@
# Detect product
function sun_j2re_detect() {
local found=
- evaluate_architecture
+
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
- i386|i386-linux)
+ i386|i486-linux-gnu)
case "$archive_name" in
"j2re-1_4_1_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
j2se_version="1.4.1+${archive_name:11:2}"
Modified: trunk/java-package/lib/sun-j2sdk.sh
===================================================================
--- trunk/java-package/lib/sun-j2sdk.sh 2006-02-23 07:17:33 UTC (rev 1933)
+++ trunk/java-package/lib/sun-j2sdk.sh 2006-02-26 05:54:43 UTC (rev 1934)
@@ -1,9 +1,9 @@
# Detect product
function sun_j2sdk_detect() {
local found=
- evaluate_architecture
+
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
- i386|i386-linux)
+ i386|i486-linux-gnu)
case "$archive_name" in
"j2sdk-1_4_1_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
j2se_version="1.4.1+${archive_name:12:2}"
Modified: trunk/java-package/make-jpkg
===================================================================
--- trunk/java-package/make-jpkg 2006-02-23 07:17:33 UTC (rev 1933)
+++ trunk/java-package/make-jpkg 2006-02-26 05:54:43 UTC (rev 1934)
@@ -143,7 +143,7 @@
fi
-### Error handling
+# error handling
success=
failed=
@@ -193,9 +193,7 @@
install_dir="$tmp/install"
install -d -m 755 "$install_dir"
-
-
-### load and execute plugins
+# load and execute plugins
echo -n "Loading plugins:"
cd "$lib_dir"
files=(*.sh)
@@ -203,8 +201,12 @@
echo -n " $file"
source "$lib_dir/$file"
done
+
echo
+# get architecture information
+get_architecture
+
j2se_found=
for var in ${!j2se_detect_*}; do
eval "\$$var"
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
