From 1c667ee86904b6b090a589a50bb167416bf7762a Mon Sep 17 00:00:00 2001
From: "hyunsik.noh" <hyunsik.noh@samsung.com>
Date: Mon, 3 Feb 2014 11:47:10 +0900
Subject: [PATCH] CLI: Fix to copy spwaner directory for install script.

Change-Id: Ia61e578fbd826d45f21c0ca420334b5f217ffd23
Signed-off-by: hyunsik.noh <hyunsik.noh@samsung.com>
---
 org.tizen.ncli.ide/tizen-autocomplete |  2 +-
 org.tizen.ncli.ide/tizen.bat          |  2 +-
 org.tizen.ncli.ide/tizen.sh           |  2 +-
 package/build.linux                   | 13 +++++++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/org.tizen.ncli.ide/tizen-autocomplete b/org.tizen.ncli.ide/tizen-autocomplete
index 75595c2..c089c66 100644
--- a/org.tizen.ncli.ide/tizen-autocomplete
+++ b/org.tizen.ncli.ide/tizen-autocomplete
@@ -22,7 +22,7 @@ _tizen()
     
     MAIN=org.tizen.ncli.ide.autocomplete.TizenAutoComplete
     
-    next=$(java -Djava.library.path=CLI_LIB_PATH -cp $CLASSPATH $MAIN $ARGS)
+    next=$(java -Djava.library.path=CLI_LIB_PATH/spawner -cp $CLASSPATH $MAIN $ARGS)
     COMPREPLY=($(compgen -W "${next}" -- ${cur}))
 
     return 0
diff --git a/org.tizen.ncli.ide/tizen.bat b/org.tizen.ncli.ide/tizen.bat
index 08a3ff9..aa053e0 100644
--- a/org.tizen.ncli.ide/tizen.bat
+++ b/org.tizen.ncli.ide/tizen.bat
@@ -60,7 +60,7 @@ REM command excute method
     set CLASSPATH=%CONFIG_PATH%;%CLASSPATH%
 
     set MAIN=org.tizen.ncli.ide.shell.Main
-    set EXEC=java %LOG_OPT% -Djava.library.path=%LIB_PATH% -cp %CONFIG_PATH%;%CLASSPATH% %MAIN% %ARGS%
+    set EXEC=java %LOG_OPT% -Djava.library.path=%LIB_PATH%\spawner -cp %CONFIG_PATH%;%CLASSPATH% %MAIN% %ARGS%
 
     %EXEC%
 goto:eof
diff --git a/org.tizen.ncli.ide/tizen.sh b/org.tizen.ncli.ide/tizen.sh
index 50944c7..c924b8f 100755
--- a/org.tizen.ncli.ide/tizen.sh
+++ b/org.tizen.ncli.ide/tizen.sh
@@ -34,6 +34,6 @@ fi
 
 MAIN=org.tizen.ncli.ide.shell.Main
 
-EXEC="java $LOG_OPT -Djava.library.path=$LIB_PATH -cp $CLASS_PATH $MAIN $ARGS"
+EXEC="java $LOG_OPT -Djava.library.path=$LIB_PATH/spawner -cp $CLASS_PATH $MAIN $ARGS"
 
 eval "$EXEC"
diff --git a/package/build.linux b/package/build.linux
index 4af5b2e..507364f 100755
--- a/package/build.linux
+++ b/package/build.linux
@@ -181,7 +181,9 @@ new_common_cli_build() {
 		cd ${NCLI_COMMON_LIB}
                 jar -xvf ${CDT_SPWAN_LINUX} os
 		TARGET=`find . -name libspawner.so | head -1`
-		cp ${TARGET} ./libspawner.so
+		TARGETDIR=`dirname ${TARGET}`
+		mv ${TARGETDIR} spawner
+		rm ${CDT_SPWAN_LINUX}
 		rm -rf os
 		cd -
 	    ;;
@@ -190,8 +192,9 @@ new_common_cli_build() {
 		cp -r ${TARGET} ${NCLI_COMMON_LIB}
 		cd ${NCLI_COMMON_LIB}
 		TARGET=`find . -name spawner.dll | head -1`
-		cp ${TARGET} ./spawner.dll
-		rm -rf ${TARGET}
+		TARGETDIR=`dirname ${TARGET}`
+		mv ${TARGETDIR} spawner
+		rm -rf ${CDT_SPWAN_WINDOWS}
 		cd -
 	    ;;
 	macos-64)
@@ -200,7 +203,9 @@ new_common_cli_build() {
 		cd ${NCLI_COMMON_LIB}
 		jar -xvf ${CDT_SPWAN_MACOS} os
 		TARGET=`find ./os/macosx/x86_64 -name libspawner.jnilib | head -1`
-		cp ${TARGET} ./libspawner.jnilib
+		TARGETDIR=`dirname ${TARGET}`
+		mv ${TARGETDIR} spawner
+		rm ${CDT_SPWAN_MACOS}
 		rm -rf os
 		cd -
 	    ;;
-- 
2.7.4