r1903 - trunk/java-package/lib
Barry Hawkins
barryh-guest at costa.debian.org
Sun Feb 12 18:16:49 UTC 2006
Author: barryh-guest
Date: 2006-02-12 18:16:48 +0000 (Sun, 12 Feb 2006)
New Revision: 1903
Modified:
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-doc.sh
trunk/java-package/lib/sun-j2sdk.sh
Log:
Refactor evaluate_architecture to correct errors; currently supports only a single line to suppress. Also updating descriptions of JRE/JDKs
Modified: trunk/java-package/lib/blackdown-j2re.sh
===================================================================
--- trunk/java-package/lib/blackdown-j2re.sh 2006-02-11 15:53:21 UTC (rev 1902)
+++ trunk/java-package/lib/blackdown-j2re.sh 2006-02-12 18:16:48 UTC (rev 1903)
@@ -1,6 +1,7 @@
# Detect product
function blackdown_j2re_detect() {
- local found=evaluate_architecture
+ local found=
+ evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
@@ -123,7 +124,7 @@
cat << EOF
Detected product:
- Java(TM) Runtime Environment (J2RE)
+ Java(TM) Runtime Environment (JRE)
Standard Edition, Version $j2se_version
Blackdown Java-Linux
EOF
@@ -132,7 +133,7 @@
j2se_release="${j2se_version:0:3}"
j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
j2se_vendor="blackdown"
- j2se_title="Java(TM) 2 RE, Standard Edition, Blackdown"
+ j2se_title="Java(TM) JRE, Standard Edition, Blackdown"
j2re_run
fi
fi
Modified: trunk/java-package/lib/blackdown-j2sdk.sh
===================================================================
--- trunk/java-package/lib/blackdown-j2sdk.sh 2006-02-11 15:53:21 UTC (rev 1902)
+++ trunk/java-package/lib/blackdown-j2sdk.sh 2006-02-12 18:16:48 UTC (rev 1903)
@@ -1,6 +1,7 @@
# Detect product
function blackdown_j2sdk_detect() {
- local found=evaluate_architecture
+ local found=
+ evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
@@ -123,7 +124,7 @@
cat << EOF
Detected product:
- Java(TM) Software Development Kit (J2SDK)
+ Java(TM) Development Kit (JDK)
Standard Edition, Version $j2se_version
Blackdown Java-Linux
EOF
@@ -132,7 +133,7 @@
j2se_release="${j2se_version:0:3}"
j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
j2se_vendor="blackdown"
- j2se_title="Java(TM) 2 SDK, Standard Edition, Blackdown"
+ j2se_title="Java(TM) JDK, Standard Edition, Blackdown"
j2sdk_run
fi
fi
Modified: trunk/java-package/lib/common.sh
===================================================================
--- trunk/java-package/lib/common.sh 2006-02-11 15:53:21 UTC (rev 1902)
+++ trunk/java-package/lib/common.sh 2006-02-12 18:16:48 UTC (rev 1903)
@@ -182,7 +182,5 @@
# provide the architecture for evaluation by plugins
function evaluate_architecture() {
- eval $(dpkg-architecture) 2>&1 |
- { grep -v "dpkg-architecture: warning: Couldn't determine gcc system type, falling back to default (native compilation) | sh: gcc: command not found" >&2 || true; }
-
+ eval $(dpkg-architecture)
}
\ No newline at end of file
Modified: trunk/java-package/lib/ibm-j2re.sh
===================================================================
--- trunk/java-package/lib/ibm-j2re.sh 2006-02-11 15:53:21 UTC (rev 1902)
+++ trunk/java-package/lib/ibm-j2re.sh 2006-02-12 18:16:48 UTC (rev 1903)
@@ -1,6 +1,7 @@
# Detect product
function ibm_j2re_detect() {
- local found=evaluate_architecture
+ local found=
+ evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
@@ -107,7 +108,7 @@
cat << EOF
Detected product:
- Java(TM) Runtime Environment (J2RE)
+ Java(TM) Runtime Environment (JRE)
Standard Edition, Version $j2se_version
IBM Corporation
EOF
@@ -116,7 +117,7 @@
j2se_release="${j2se_version:0:3}"
j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
j2se_vendor="ibm"
- j2se_title="Java(TM) 2 RE, Standard Edition, IBM Corporation"
+ j2se_title="Java(TM) JRE, Standard Edition, IBM Corporation"
j2re_run
fi
fi
Modified: trunk/java-package/lib/ibm-j2sdk.sh
===================================================================
--- trunk/java-package/lib/ibm-j2sdk.sh 2006-02-11 15:53:21 UTC (rev 1902)
+++ trunk/java-package/lib/ibm-j2sdk.sh 2006-02-12 18:16:48 UTC (rev 1903)
@@ -1,6 +1,7 @@
# Detect product
function ibm_j2sdk_detect() {
- local found=evaluate_architecture
+ local found=
+ evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
@@ -112,7 +113,7 @@
cat << EOF
Detected product:
- Java(TM) Software Development Kit (J2SDK)
+ Java(TM) Development Kit (JDK)
Standard Edition, Version $j2se_version
IBM Corporation
EOF
@@ -121,7 +122,7 @@
j2se_release="${j2se_version:0:3}"
j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
j2se_vendor="ibm"
- j2se_title="Java(TM) 2 SDK, Standard Edition, IBM Corporation"
+ j2se_title="Java(TM) JDK, Standard Edition, IBM Corporation"
j2sdk_run
fi
fi
Modified: trunk/java-package/lib/sun-j2re.sh
===================================================================
--- trunk/java-package/lib/sun-j2re.sh 2006-02-11 15:53:21 UTC (rev 1902)
+++ trunk/java-package/lib/sun-j2re.sh 2006-02-12 18:16:48 UTC (rev 1903)
@@ -1,6 +1,7 @@
# Detect product
function sun_j2re_detect() {
-local found=evaluate_architecture
+ local found=
+ evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
@@ -55,7 +56,7 @@
cat << EOF
Detected product:
- Java(TM) Runtime Environment (J2RE)
+ Java(TM) Runtime Environment (JRE)
Standard Edition, Version $j2se_version
Sun Microsystems(TM), Inc.
EOF
@@ -64,7 +65,7 @@
j2se_release="${j2se_version:0:3}"
j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
j2se_vendor="sun"
- j2se_title="Java(TM) 2 RE, Standard Edition, Sun Microsystems(TM)"
+ j2se_title="Java(TM) JRE, Standard Edition, Sun Microsystems(TM)"
j2re_run
fi
fi
Modified: trunk/java-package/lib/sun-j2sdk-doc.sh
===================================================================
--- trunk/java-package/lib/sun-j2sdk-doc.sh 2006-02-11 15:53:21 UTC (rev 1902)
+++ trunk/java-package/lib/sun-j2sdk-doc.sh 2006-02-12 18:16:48 UTC (rev 1903)
@@ -32,7 +32,7 @@
cat << EOF
Detected product:
- Java(TM) Software Development Kit (J2SDK) Documentation
+ Java(TM) Development Kit (JDK) Documentation
Standard Edition, Version $j2se_version
Sun Microsystems(TM), Inc.
EOF
@@ -41,7 +41,7 @@
j2se_release="${j2se_version:0:3}"
j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
j2se_vendor="sun"
- j2se_title="Java(TM) 2 SDK, Standard Edition, Sun Microsystems(TM) Documentation"
+ j2se_title="Java(TM) JDK, Standard Edition, Sun Microsystems(TM) Documentation"
j2sdk_doc_run
fi
fi
Modified: trunk/java-package/lib/sun-j2sdk.sh
===================================================================
--- trunk/java-package/lib/sun-j2sdk.sh 2006-02-11 15:53:21 UTC (rev 1902)
+++ trunk/java-package/lib/sun-j2sdk.sh 2006-02-12 18:16:48 UTC (rev 1903)
@@ -1,6 +1,7 @@
# Detect product
function sun_j2sdk_detect() {
- local found=evaluate_architecture
+ local found=
+ evaluate_architecture
case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
i386|i386-linux)
case "$archive_name" in
@@ -74,7 +75,7 @@
cat << EOF
Detected product:
- Java(TM) Software Development Kit (J2SDK)
+ Java(TM) Development Kit (JDK)
Standard Edition, Version $j2se_version
Sun Microsystems(TM), Inc.
EOF
@@ -83,7 +84,7 @@
j2se_release="${j2se_version:0:3}"
j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
j2se_vendor="sun"
- j2se_title="Java(TM) 2 SDK, Standard Edition, Sun Microsystems(TM)"
+ j2se_title="Java(TM) JDK, Standard Edition, Sun Microsystems(TM)"
j2sdk_run
fi
fi
More information about the pkg-java-commits
mailing list