--stringparam base.path replaces with -o

[stg.git] / projects / rscriptd / build

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index 38302ee34dcdb5a883dde007727bb76b47ab04b6..a91d70c805cbbf843f054daf158bee788817288d 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -13,6 +13,7 @@ CONFFILE="../../Makefile.conf"
 PREFIX="/"
 BIN_MODE=0755
 DATA_MODE=0644
 PREFIX="/"
 BIN_MODE=0755
 DATA_MODE=0644

+DIR_MODE=0755

 OWNER=root
 
 if [ -z $1 ]
 OWNER=root
 
 if [ -z $1 ]


@@ -64,11 +65,11 @@ echo "##########################################################################
 echo "       Building rscriptd for $sys $release"
 echo "#############################################################################"
 
 echo "       Building rscriptd for $sys $release"
 echo "#############################################################################"
 

-STG_LIBS="stg_logger.lib 
-          stg_locker.lib
+STG_LIBS="logger.lib 
+          locker.lib

          crypto.lib 
          common.lib 
          crypto.lib 
          common.lib 

-         script_executer.lib 
+         scriptexecuter.lib 

          conffiles.lib"
 
 if [ "$OS" = "linux" ]
          conffiles.lib"
 
 if [ "$OS" = "linux" ]


@@ -93,6 +94,25 @@ else
     SHELL="/usr/local/bin/bash"
 fi
 
     SHELL="/usr/local/bin/bash"
 fi
 

+echo -n "Checking gcc... "
+gcc --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    echo "FAIL!"
+    echo "gcc not found"
+    exit;
+fi
+echo "found"
+echo -n "Checking g++... "
+g++ --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    echo "FAIL!"
+    echo "g++ not found"
+    exit;
+fi
+echo "found"
+

 echo -n "Checking endianess... "
 echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
 gcc $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null
 echo -n "Checking endianess... "
 echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
 gcc $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null


@@ -138,6 +158,7 @@ echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE

+echo "DIR_MODE=$DIR_MODE" >> $CONFFILE

 echo "OWNER=$OWNER" >> $CONFFILE
 
 $MAKE $MAKEOPTS
 echo "OWNER=$OWNER" >> $CONFFILE
 
 $MAKE $MAKEOPTS