]> git.stg.codes - stg.git/blobdiff - projects/rscriptd/build
Corporations added to compilation
[stg.git] / projects / rscriptd / build
index 38302ee34dcdb5a883dde007727bb76b47ab04b6..19b0fd78d8c67a153f3f6bff78e73d12dad4f188 100755 (executable)
@@ -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 ]
@@ -23,7 +24,7 @@ else
     then
         DEFS="-DDEBUG"
         MAKEOPTS="-j1"
     then
         DEFS="-DDEBUG"
         MAKEOPTS="-j1"
-        CXXFLAGS="$CXXFLAGS -g3 -W -Wall"
+        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
     else
         MAKEOPTS="-j1"
     fi
     else
         MAKEOPTS="-j1"
     fi
@@ -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,9 +94,38 @@ else
     SHELL="/usr/local/bin/bash"
 fi
 
     SHELL="/usr/local/bin/bash"
 fi
 
+if [ -z "$CC" ]
+then
+    CC=gcc
+fi
+
+if [ -z "$CXX" ]
+then
+    CXX=g++
+fi
+
+echo -n "Checking CC... "
+$CC --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    echo "FAIL!"
+    echo "$CC not found"
+    exit;
+fi
+echo "found"
+echo -n "Checking CXX... "
+$CXX --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    echo "FAIL!"
+    echo "$CXX not found"
+    exit;
+fi
+echo "found"
+
 echo -n "Checking endianess... "
 echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
 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
+$CC $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     echo "FAIL!"
 if [ $? != 0 ]
 then
     echo "FAIL!"
@@ -134,10 +164,12 @@ echo "" >> $CONFFILE
 echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
 echo "SHELL=$SHELL" >> $CONFFILE
 echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
 echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
 echo "SHELL=$SHELL" >> $CONFFILE
 echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
+echo "CFLAGS=$CXXFLAGS" >> $CONFFILE
 echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
 echo "LDFLAGS=$LDFLAGS" >> $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