Update the script file for SBS environment.

Change-Id: Ib07e26bbc0cd0555673cfd4ac82f1dc7e5ac638f

diff --git a/TC/_export_env.sh b/TC/_export_env.sh
index b354434..d785463 100755 (executable)
--- a/TC/_export_env.sh
+++ b/TC/_export_env.sh
@@ -1,17 +1,23 @@
 # Customize below path information 
-TET_INSTALL_PATH=/scratchbox/TETware
+#TET_INSTALL_PATH=/scratchbox/TETware
+
+CURRENT_USER=`echo $HOME`
+TET_INSTALL_PATH=$CURRENT_USER/sbs/TETware
 
 TET_SIMUL_PATH=$TET_INSTALL_PATH/tetware-simulator
 TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target
-TET_MOUNTED_PATH=/mnt/nfs/TETware/tetware-target
+TET_MOUNTED_PATH=/mnt/nfs/sbs/TETware/tetware-target
+#TET_MOUNTED_PATH=/opt/home/root/tmp/sbs/TETware/tetware-target
+
+#MACHINE=`echo $SBOX_UNAME_MACHINE`
 
-MACHINE=`echo $SBOX_UNAME_MACHINE`
+MACHINE=`echo $DEB_BUILD_ARCH_ABI`
 
-if [ $MACHINE = "i686" ]               # Scratchbox i686
+if [ $MACHINE = "gnu" ]                # SBS i386
 then                   
        export ARCH=simulator
        export TET_ROOT=$TET_SIMUL_PATH
-elif [ $MACHINE = "arm" ]      # Scratchbox ARM
+elif [ $MACHINE = "gnueabi" ]  # SBS ARM
 then
        export ARCH=target
        export TET_ROOT=$TET_TARGET_PATH

diff --git a/TC/build.sh b/TC/build.sh
index d32a327..4d9551d 100755 (executable)
--- a/TC/build.sh
+++ b/TC/build.sh
@@ -1,6 +1,8 @@
-export MACHINE=`echo $SBOX_UNAME_MACHINE`
-echo $MACHINE
-if [ $MACHINE = "i686" ]
+#export MACHINE=`echo $SBOX_UNAME_MACHINE`
+
+export MACHINE=`echo $DEB_BUILD_ARCH_ABI`
+
+if [ $MACHINE = "gnu" ]
 then
        TET_SCEN_FILE=tet_scen_i686
 else
@@ -26,7 +28,7 @@ fi
 SCEN_FILE_INPUT="false"
 args_count=0
 
-for i in $* 
+for i in $*
 do
        args_count=`expr $args_count + 1`
        if [ $SCEN_FILE_INPUT = "true" ]
@@ -56,14 +58,14 @@ echo RESULT_TO_JOURNAL=$RESULT_TO_JOURNAL
 
 RESULT_DIR=result
 
-if [ $MACHINE = "i686" ]
+if [ $MACHINE = "gnu" ]
 then
-       TEXT_RESULT=$RESULT_DIR/BLD-i686-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.html
-       JOURNAL_RESULT=$RESULT_DIR/BLD-i686-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.journal
+       TEXT_RESULT=$RESULT_DIR/BLD-i386-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.html
+       JOURNAL_RESULT=$RESULT_DIR/BLD-i386-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.journal
 else
        TEXT_RESULT=$RESULT_DIR/BLD-ARM-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.html
        JOURNAL_RESULT=$RESULT_DIR/BLD-ARM-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.journal
-fi             
+fi
 
 ### Make Result output directory
 echo

diff --git a/TC/execute.sh b/TC/execute.sh
index e4e43ab..eaa0960 100755 (executable)
--- a/TC/execute.sh
+++ b/TC/execute.sh
@@ -1,6 +1,8 @@
-export MACHINE=`echo $SBOX_UNAME_MACHINE`
+#export MACHINE=`echo $SBOX_UNAME_MACHINE`
+export MACHINE=`echo $DEB_BUILD_ARCH_ABI`
+#export MACHINE="gnueabi"
 
-if [ $MACHINE = "i686" ]
+if [ $MACHINE = "gnu" ]
 then
        TET_SCEN_FILE=tet_scen_i686
 else
@@ -19,7 +21,7 @@ fi
 SCEN_FILE_INPUT="false"
 args_count=0
 
-for i in $* 
+for i in $*
 do
        args_count=`expr $args_count + 1`
        if [ $SCEN_FILE_INPUT = "true" ]
@@ -48,15 +50,15 @@ echo TET_SCEN_NAME=$TET_SCEN_NAME
 echo RESULT_TO_JOURNAL=$RESULT_TO_JOURNAL
 
 RESULT_DIR=result
-#if [ $MACHINE = "i686" ]
-if [ $MACHINE = "i686" ]
+
+if [ $MACHINE = "gnu" ]
 then
-       TEXT_RESULT=$RESULT_DIR/EXE-i686-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.html
-       JOURNAL_RESULT=$RESULT_DIR/EXE-i686-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.journal
+       TEXT_RESULT=$RESULT_DIR/EXE-i386-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.html
+       JOURNAL_RESULT=$RESULT_DIR/EXE-i386-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.journal
 else
        TEXT_RESULT=$RESULT_DIR/EXE-ARM-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.html
        JOURNAL_RESULT=$RESULT_DIR/EXE-ARM-$TET_SCEN_NAME-$FILE_NAME_EXTENSION.journal
-fi             
+fi
 
 ### Make Result output directory
 echo