From d05a172192e5047b77b87b93d9db85d4e9235f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Wed, 2 Nov 2005 13:20:26 +0000
Subject: [PATCH] fixes for the new build system, added script to install some
 libs, currently only run script of Playground is fixed, jam haiku_registrar
 (run_haiku_registrar) does not work do to SimpleTests being currently broken,
 the run scripts needs to be fixed again for the new location of
 run_haiku_registrar

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14641 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/tests/servers/app/install_libs   | 33 ++++++++++++++++++++++++++++
 src/tests/servers/app/playground/run | 23 +++++++++++++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100755 src/tests/servers/app/install_libs

diff --git a/src/tests/servers/app/install_libs b/src/tests/servers/app/install_libs
new file mode 100755
index 0000000000..ba4f81b965
--- /dev/null
+++ b/src/tests/servers/app/install_libs
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+CURRENT="$PWD"
+
+if test -d "../../../../generated/objects/r5/x86/release"; then
+	cd "../../../../generated/objects/r5/x86/release"
+elif test -d "../../../../generated/objects/bone/x86/release"; then
+	cd "../../../../generated/objects/bone/x86/release"
+elif test -d "../../../../generated/objects/dano/x86/release"; then
+	cd "../../../../generated/objects/dano/x86/release"
+fi
+
+RELEASE="$PWD"
+DEST="/boot/home/config/lib"
+
+cd "$DEST"
+
+ln -fs "$RELEASE/kits/libopenbeos.so" "libopenbeos.so"
+
+ln -fs "$RELEASE/libs/freetype2/libfreetype.so" "libfreetype.so"
+ln -fs "$RELEASE/libs/png/libpng.so" "libpng.so"
+
+HAIKU_APP_SERVER="$RELEASE/tests/servers/app"
+
+if ! test -d "$HAIKU_APP_SERVER/lib"; then
+	mkdir "$HAIKU_APP_SERVER/lib"
+fi
+
+cd "$HAIKU_APP_SERVER/lib"
+
+ln -fs "../libhaikuappserver.so" "libhaikuappserver.so"
+ln -fs "../libhwinterface.so" "libhwinterface.so"
+ln -fs "../libhwinterfaceimpl.so" "libhwinterfaceimpl.so"
diff --git a/src/tests/servers/app/playground/run b/src/tests/servers/app/playground/run
index 3fd1c1d2fd..ecd5d66565 100755
--- a/src/tests/servers/app/playground/run
+++ b/src/tests/servers/app/playground/run
@@ -1,6 +1,25 @@
 #!/bin/sh
 
 ../../../../../tests/servers/registrar/run_haiku_registrar || exit
-../../../../../distro/x86.release.r5/beos/system/servers/haiku_app_server &
+
+if test -f ../../../../../generated/objects/bone/x86/release/tests/servers/app/haiku_app_server; then
+	../../../../../generated/objects/bone/x86/release/tests/servers/app/haiku_app_server &
+elif test -f ../../../../../generated/objects/r5/x86/release/tests/servers/app/haiku_app_server; then
+	../../../../../generated/objects/r5/x86/release/tests/servers/app/haiku_app_server &
+elif test -f ../../../../../generated/objects/dano/x86/release/tests/servers/app/haiku_app_server; then
+	../../../../../generated/objects/dano/x86/release/tests/servers/app/haiku_app_server &
+else
+	echo "You need to jam haiku_app_server first."
+fi
+
 sleep 1s
-../../../../../distro/x86.release.r5/beos/apps/Playground
+
+if test -f ../../../../../generated/objects/r5/x86/release/tests/servers/app/playground/Playground; then
+	../../../../../generated/objects/r5/x86/release/tests/servers/app/playground/Playground
+elif test -f ../../../../../generated/objects/bone/x86/release/tests/servers/app/playground/Playground; then
+	../../../../../generated/objects/bone/x86/release/tests/servers/app/playground/Playground
+elif test -f ../../../../../generated/objects/dano/x86/release/tests/servers/app/playground/Playground; then
+	../../../../../generated/objects/dano/x86/release/tests/servers/app/playground/Playground
+else
+	echo "You need to jam Playground first."
+fi