X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8569ecdc2c9368dc0fe650b901cce7b37337ffec..6aadaaf234bfd8129e8b4ff7f64c3aef8df54659:/projects/rscriptd/build?ds=sidebyside diff --git a/projects/rscriptd/build b/projects/rscriptd/build index c7aa090d..3b73000d 100755 --- a/projects/rscriptd/build +++ b/projects/rscriptd/build @@ -20,6 +20,7 @@ if [ "$1" = "debug" ] then DEFS="$DEFS -DDEBUG" MAKEOPTS="$MAKEOPTS -j1" + CFLAGS="$CFLAGS -ggdb3 -W -Wall -Wextra" CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra" DEBUG="yes" else @@ -27,6 +28,7 @@ else DEBUG="no" fi +CFLAGS="$CFLAGS -I/usr/local/include" CXXFLAGS="$CXXFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" @@ -44,15 +46,20 @@ then 5) OS=bsd5;; 6) OS=bsd5;; 7) OS=bsd7;; - 8) OS=bsd7;; - 9) OS=bsd7;; - *) OS=unknown;; + *) OS=bsd7;; esac MAKE="gmake" fi +if [ "$sys" = "Darwin" ] +then + OS=darwin + ETC_DIR="./inst/freebsd/etc/stargazer" + MAKE="gmake" +fi + if [ "$OS" = "unknown" ] -then +then printf "#############################################################################\n" printf "# Sorry, but rscriptd currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #\n" printf "#############################################################################\n" @@ -63,12 +70,11 @@ printf "######################################################################## 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 @@ -78,14 +84,19 @@ else if [ "$OS" = "bsd" ] then DEFS="$DEFS -DFREE_BSD" - LIB_THREAD=-lc_r else - DEFS="$DEFS -DFREE_BSD5" if [ "$OS" = "bsd7" ] then + DEFS="$DEFS -DFREE_BSD5" 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 @@ -170,5 +181,9 @@ printf "DATA_MODE=$DATA_MODE\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