From adf174fe321a74c37e89ff9165b846158a7dbc61 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 20 Apr 2013 05:58:17 +0000
Subject: [PATCH] Added script for setting openjdk environment.  Updated
 openjdk bep to correctly build distro zip.

(cherry picked from commit 1e2de4b85d4f11ad4454d50cde63a3de21a366c3)
---
 dev-lang/openjdk/openjdk-1.7.recipe   | 19 ++++++++-----
 dev-lang/openjdk/openjdk_setup_env.sh | 41 +++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 dev-lang/openjdk/openjdk_setup_env.sh

diff --git a/dev-lang/openjdk/openjdk-1.7.recipe b/dev-lang/openjdk/openjdk-1.7.recipe
index 34407108a..97d23b285 100644
--- a/dev-lang/openjdk/openjdk-1.7.recipe
+++ b/dev-lang/openjdk/openjdk-1.7.recipe
@@ -1,7 +1,7 @@
 DESCRIPTION="openjdk"
 HOMEPAGE="http://openjdk.java.net/"
 SRC_URI="http://ports-space.haiku-files.org/source/openjdk/j2sdk-april-2013.tar"
-REVISION="2"
+REVISION="3"
 STATUS_HAIKU="stable"
 DEPEND="app-arch/cpio 	= 2.10
 	media-libs/freetype 	>= 2.4.9"
@@ -162,12 +162,17 @@ BUILD {
 }
 
 INSTALL {
-	export DESTDIR=`finddir B_COMMON_DIRECTORY`
-	cp -r -f -v output ${DESTDIR}/jdk
-	echo "you should add this lines to \$HOME/.profile"
-	echo "export JAVA_HOME=/boot/common/jdk"
-	echo "export PATH=\$JAVA_HOME/bin:\$PATH"
-	echo "export LIBRARY_PATH=\$JAVA_HOME/lib/i386/:\$LIBRARY_PATH"
+	# install
+	mkdir -p `finddir B_COMMON_DIRECTORY`/jdk
+	cp -r -f -v output/j2sdk-image/* `finddir B_COMMON_DIRECTORY`/jdk
+	# setup env
+	$(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh
+
+	# build distro
+	mkdir -p ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk
+	cp -r -f -v output/j2sdk-image/* ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk
+	mkdir -p ${DESTDIR}/boot/common/boot/post_install
+	cp -f $(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
 TEST {
diff --git a/dev-lang/openjdk/openjdk_setup_env.sh b/dev-lang/openjdk/openjdk_setup_env.sh
new file mode 100644
index 000000000..ef1cd2f39
--- /dev/null
+++ b/dev-lang/openjdk/openjdk_setup_env.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+_progress () {
+	notify --type progress --group openJDK \
+		--icon /boot/system/kernel_x86 \
+		--messageID $0_$$ \
+		--title "Set OpenJDK env..." \
+		--progress "$1" "$2" >/dev/null
+}
+
+_progress 0.2 ".profile"
+cd
+if [ -e .profile ];
+then
+	echo
+else
+	touch .profile
+fi
+
+_progress 0.4 "JAVA_HOME"
+grep "export JAVA_HOME=" .profile >/dev/null
+if [ $? == 1 ];
+then
+	echo "export JAVA_HOME=\`finddir B_COMMON_DIRECTORY\`/jdk" >>.profile
+fi
+
+_progress 0.6 "PATH"
+grep "export PATH=\$JAVA_HOME/bin:\$PATH" .profile >/dev/null
+if [ $? == 1 ];
+then
+	echo "export PATH=\$JAVA_HOME/bin:\$PATH" >>.profile
+fi
+
+_progress 0.8 "LIBRARY_PATH"
+export _SEARCH=$JAVA_HOME/jre/lib/i386
+echo $_SEARCH | grep $LIBRARY_PATH >/dev/null
+grep "export LIBRARY_PATH=\$JAVA_HOME/jre/lib/i386:\$LIBRARY_PATH" .profile >/dev/null
+if [ $? == 1 ];
+then
+	echo "export LIBRARY_PATH=\$JAVA_HOME/jre/lib/i386:\$LIBRARY_PATH" >>.profile
+fi
+_progress 1.0 "done"