Fixes in dealing with external libs.

[stg.git] / projects / rscriptd / build

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index c7aa090dc9d2bf79a1cd7591ff44813690f2e131..da5c3b5b3df79f4bc23cf0d492fb5cbd9711c0b2 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -7,7 +7,8 @@
 
 OS=unknown
 sys=`uname -s`
 
 OS=unknown
 sys=`uname -s`

-release=`uname -r | cut -b1`
+release=`uname -r`
+major=`printf "%s" "$release" | cut -d. -f1`

 BUILD_DIR=`pwd`
 CONFFILE="../../Makefile.conf"
 PREFIX="/"
 BUILD_DIR=`pwd`
 CONFFILE="../../Makefile.conf"
 PREFIX="/"


@@ -20,6 +21,7 @@ if [ "$1" = "debug" ]
 then
    DEFS="$DEFS -DDEBUG"
    MAKEOPTS="$MAKEOPTS -j1"
 then
    DEFS="$DEFS -DDEBUG"
    MAKEOPTS="$MAKEOPTS -j1"

+   CFLAGS="$CFLAGS -ggdb3 -W -Wall -Wextra"

    CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
    DEBUG="yes"
 else
    CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
    DEBUG="yes"
 else


@@ -27,34 +29,39 @@ else
    DEBUG="no"
 fi
 
    DEBUG="no"
 fi
 

+CFLAGS="$CFLAGS -I/usr/local/include"

 CXXFLAGS="$CXXFLAGS -I/usr/local/include"
 LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 if [ "$sys" = "Linux" ]
 then
     OS=linux
 CXXFLAGS="$CXXFLAGS -I/usr/local/include"
 LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 if [ "$sys" = "Linux" ]
 then
     OS=linux

-    release=""

     MAKE="make"
 fi
 
 if [ "$sys" = "FreeBSD" ]
 then
     MAKE="make"
 fi
 
 if [ "$sys" = "FreeBSD" ]
 then

-    case $release in
+    case $major in

         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
         7) OS=bsd7;;
         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
         7) OS=bsd7;;

-        8) OS=bsd7;;
-        9) OS=bsd7;;
-        *) OS=unknown;;
+        *) OS=bsd7;;

     esac
     MAKE="gmake"
 fi
 
     esac
     MAKE="gmake"
 fi
 

+if [ "$sys" = "Darwin" ]
+then
+    OS=darwin
+    ETC_DIR="./inst/freebsd/etc/stargazer"
+    MAKE="gmake"
+fi
+

 if [ "$OS" = "unknown" ]
 if [ "$OS" = "unknown" ]

-then 
+then

     printf "#############################################################################\n"
     printf "#############################################################################\n"

-    printf "# Sorry, but rscriptd currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #\n"
+    printf "# Sorry, but rscriptd is currently supported by Linux, FreeBSD and Darwin.  #\n"

     printf "#############################################################################\n"
     exit 1
 fi
     printf "#############################################################################\n"
     exit 1
 fi


@@ -63,12 +70,11 @@ printf "########################################################################
 printf "       Building rscriptd for $sys $release\n"
 printf "#############################################################################\n"
 
 printf "       Building rscriptd for $sys $release\n"
 printf "#############################################################################\n"
 

-STG_LIBS="logger.lib 
-          locker.lib
-         crypto.lib 
-         common.lib 
-         scriptexecuter.lib 
-         conffiles.lib"
+STG_LIBS="logger.lib
+          crypto.lib
+          common.lib
+          scriptexecuter.lib
+          conffiles.lib"

 
 if [ "$OS" = "linux" ]
 then
 
 if [ "$OS" = "linux" ]
 then


@@ -78,14 +84,19 @@ else
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"

-        LIB_THREAD=-lc_r

     else
     else

-        DEFS="$DEFS -DFREE_BSD5"

         if [ "$OS" = "bsd7" ]
         then
         if [ "$OS" = "bsd7" ]
         then

+            DEFS="$DEFS -DFREE_BSD5"

             LIB_THREAD=-lpthread
         else
             LIB_THREAD=-lpthread
         else

-            LIB_THREAD=-lc_r
+            if [ "$OS" == "darwin" ]
+            then
+                DEFS="$DEFS -DDARWIN"
+                LIB_THREAD=-lpthread
+            else
+                LIB_THREAD=-lc_r
+            fi

         fi
     fi
 fi
         fi
     fi
 fi


@@ -161,6 +172,8 @@ do
 done
 printf "\n" >> $CONFFILE
 printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE
 done
 printf "\n" >> $CONFFILE
 printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE

+printf "CC=$CC\n" >> $CONFFILE
+printf "CXX=$CXX\n" >> $CONFFILE

 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE


@@ -170,5 +183,9 @@ printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE
 printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE
 printf "OWNER=$OWNER\n" >> $CONFFILE
 
 printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE
 printf "OWNER=$OWNER\n" >> $CONFFILE
 

-$MAKE $MAKEOPTS
-
+if [ "$1" != "debug" ]
+then
+    $MAKE $MAKEOPTS
+else
+    printf "\n\n\nDebug build. Type $MAKE explicitly\n"
+fi