[Lunar-commits] <moonbase> sun-jdk: A little fix up here. Need to add a BUILD.x86_64, and a

[Dennis 'stumbles' Veatch]

commit d19a0a0ff182244058e5d4f4679e879251ff5abe
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Mon Jun 22 13:38:38 2009 -0400

    sun-jdk: A little fix up here. Need to add a BUILD.x86_64, and a
    
    couple of other associated tweaks.
---
 compilers/sun-jdk/BUILD.x86_64 |   42 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/compilers/sun-jdk/BUILD.x86_64 b/compilers/sun-jdk/BUILD.x86_64
new file mode 100644
index 0000000..0ef23ed
--- /dev/null
+++ b/compilers/sun-jdk/BUILD.x86_64
@@ -0,0 +1,42 @@
+(
+  chmod +x $SOURCE &&
+  ./$SOURCE --accept-license --unpack &&
+
+  # Clean up old java 1.6.0 service packs
+  rm -rf /usr/lib/jdk1.6.0_* &&
+
+  prepare_install &&
+
+  cp -r $SOURCE_DIRECTORY/jdk${FVERSION} /usr/lib/ &&
+
+  # Some apps only search for java in /usr/java
+  rm  -f /usr/java &&
+  ln -sf /usr/lib/jdk${FVERSION} /usr/java &&
+
+  # Some applications don't accept anything but /usr/bin
+  for file in /usr/lib/jdk${FVERSION}/bin/*; do
+      bfile=`basename $file`
+      # Conflicting files with heimdal
+      if [[ "$bfile" != "klist" ]] && [[ "$bfile" != "kinit" ]]; then
+          ln -sf $file /usr/bin/
+      fi
+  done
+
+  mkdir -p /opt/lunar/plugins &&
+  rm -f /opt/lunar/plugins/libjavaplugin_oji.so &&
+  rm -f /opt/lunar/plugins/libnpjp2.so &&
+
+  if [ $NEWPLUGIN == 'y' ]; then
+  ln -sf /usr/lib/jdk${FVERSION}/jre/lib/amd64/libnpjp2.so \
+         /opt/lunar/plugins/
+  else
+  ln -sf /usr/lib/jdk${FVERSION}/jre/plugin/amd64/libjavaplugin_jni.so \
+         /opt/lunar/plugins/
+  fi &&
+
+
+  echo export PATH=\"'${PATH}':/usr/lib/jdk"${FVERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
+  echo export JAVA_HOME=\"/usr/lib/jdk"${FVERSION}"/\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
+  install -m644 $SOURCE_DIRECTORY/sun-jdk.rc /etc/profile.d/
+
+) > $C_FIFO 2>&1