[SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (04710d70faa01c863c4573dcbb21978d53b42055)

David Kowis scm at sourcemage.org
Sun Feb 15 21:11:32 EST 2009


GIT changes to master z-rejected grimoire by David Kowis <dkowis at shlrm.org>:

 z-java/jdk6-bin/HISTORY   |    5 +++++
 z-java/jdk6-bin/INSTALL   |   24 ++++++++++++++++++++----
 z-java/jdk6-bin/PRE_BUILD |   11 ++---------
 3 files changed, 27 insertions(+), 13 deletions(-)

New commits:
commit 04710d70faa01c863c4573dcbb21978d53b42055
Author: David Kowis <dkowis at shlrm.org>
Commit: David Kowis <dkowis at shlrm.org>

    jdk6-bin: Fixed installation of it.
    
    The plugin for webbrowsers works! I was unable to test the amd64 one, as
    I don't have an amd64, but this won't break anything if it doesn't work.
    It just *won't work*.

diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index 5bc10b1..2f59a32 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,8 @@
+2009-02-15 David Kowis <dkowis at shlrm.org>
+	* PRE_BUILD: changed extraction method to use the one sun provides
+	  This also builds a few more jars than it used to.
+	* INSTALL: fixed installing of plugins, and added amd64 plugin
+
 2009-02-08 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 6u12
 
diff --git a/z-java/jdk6-bin/INSTALL b/z-java/jdk6-bin/INSTALL
index 343e85a..d97af4b 100755
--- a/z-java/jdk6-bin/INSTALL
+++ b/z-java/jdk6-bin/INSTALL
@@ -1,4 +1,4 @@
-cp -va $SOURCE_DIRECTORY /usr/lib  &&
+cp -pPR jdk$VER "$INSTALL_ROOT/usr/lib" &&
 
 if [[ "${ARCHITECTURE[0]}" == "i386" || "${ARCHITECTURE[0]}" == "i486" ]]
 then
@@ -10,13 +10,29 @@ then
 	if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
 	then
 		ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so  \
-                       ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so
-	fi
+		              ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so &&
+		ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+		              ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
+	fi &&
 
 	if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
 	then
 		ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so  \
-                       ${INSTALL_ROOT}/usr/lib/firefox/plugins/libjavaplugin_oji.so
+                      ${INSTALL_ROOT}/usr/lib/firefox/plugins/libjavaplugin_oji.so &&
+		ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+		              ${INSTALL_ROOT}/usr/lib/firefox/plugins/libnpjp2.so
+	fi
+elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+	if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+	then
+		ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
+		              ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
+	fi &&
+
+	if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+	then
+		ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
+		              ${INSTALL_ROOT}/usr/lib/firefox/plugins/libnpjp2.so
 	fi
 fi  &&
 
diff --git a/z-java/jdk6-bin/PRE_BUILD b/z-java/jdk6-bin/PRE_BUILD
index 9939c1e..57bb607 100755
--- a/z-java/jdk6-bin/PRE_BUILD
+++ b/z-java/jdk6-bin/PRE_BUILD
@@ -1,7 +1,6 @@
 verify_file  ''                   &&
 mk_source_dir  $SOURCE_DIRECTORY  &&
-unzip -qq -d $BUILD_DIRECTORY $SOURCE_CACHE/$SOURCE || true  &&
-cd  $SOURCE_DIRECTORY             &&
+cd $SOURCE_DIRECTORY &&
 
 #
 # Java binaries have hardcoded /lib64/ld-linux-x86-64.so.2
@@ -14,10 +13,4 @@ then
   fi
 fi  &&
 
-#
-# Unpack JAR files
-#
-for pack_file in jre/lib/rt.pack jre/lib/jsse.pack jre/lib/charsets.pack lib/tools.pack jre/lib/ext/localedata.pack
-do
-  bin/unpack200 $pack_file ${pack_file/pack/jar}
-done
+/bin/bash $SOURCE_CACHE/$SOURCE --accept-license --unpack



More information about the SM-Commit mailing list