Ticket 12. The 'stopOnError' property added in the SETTINGS_IMPL class.

[stg.git] / projects / rscriptd / build

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index 59927348bab369f99774c204ffbc1fd3e409a52c..3b73000dc128369b54c831b86d9a79edb4c80104 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -51,6 +51,13 @@ then
     MAKE="gmake"
 fi
 
     MAKE="gmake"
 fi
 

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

 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"
 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"


@@ -77,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


@@ -169,5 +181,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