Some fixes in build scripts.

diff --git a/projects/libs/build b/projects/libs/build
index a85ad133d05be01b0b9ca41e49b56ac43bde859f..7b18b48aab6b6f145ee63647e4feccf418469c17 100755 (executable)
--- a/projects/libs/build
+++ b/projects/libs/build
@@ -76,13 +76,13 @@ fi
 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"
-    printf "# Sorry, but stargazer currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #\n"
+    printf "# Sorry, but we currently support Linux, FreeBSD and Darwin.                #\n"
     printf "#############################################################################\n"
     exit 1
 fi
 
 printf "#############################################################################\n"
-printf "       Building STG 2.4 for $sys $release\n"
+printf "       Building STG 2.4 libs for $sys $release\n"
 printf "#############################################################################\n"
 
 STG_LIBS="logger.lib

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index 3b73000dc128369b54c831b86d9a79edb4c80104..68a64f874abf089b58f47f06bdd9d351d9b3ad45 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -61,7 +61,7 @@ fi
 if [ "$OS" = "unknown" ]
 then
     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

diff --git a/projects/sgauth/build b/projects/sgauth/build
index e7c4be9b0e745c68d97ba8b5df29e84618888a2a..bd21df21d3dc56d794d41537a2ea6854c0896e55 100755 (executable)
--- a/projects/sgauth/build
+++ b/projects/sgauth/build
@@ -64,7 +64,7 @@ fi
 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"
-    printf "# Sorry, but sgauth currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #\n"
+    printf "# Sorry, but sgauth is currently supported by Linux, FreeBSD and Darwin.    #\n"
     printf "#############################################################################\n"
     exit 1
 fi

diff --git a/projects/sgauthstress/build b/projects/sgauthstress/build
index 29b106751b6153e1ff28a172edc91223527fc695..8da9ac678a21ec9cfb9dc3c6aa5ff45aad638e80 100755 (executable)
--- a/projects/sgauthstress/build
+++ b/projects/sgauthstress/build
@@ -16,22 +16,16 @@ DATA_MODE=0644
 DIR_MODE=0755
 OWNER=root
 
-if [ -z $1 ]
+if [ "$1" = "debug" ]
 then
-    MAKEOPTS="-j1"
-    DEBUG="no"
+   DEFS="$DEFS -DDEBUG"
+   MAKEOPTS="$MAKEOPTS -j1"
+   CFLAGS="$CFLAGS -ggdb3 -W -Wall -Wextra"
+   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
+   DEBUG="yes"
 else
-    if [ "$1" = "debug" ]
-    then
-        DEFS="-DDEBUG"
-        MAKEOPTS="-j1"
-        CFLAGS="$CFLAGS -ggdb3 -W -Wall"
-        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
-        DEBUG="yes"
-    else
-        MAKEOPTS="-j1"
-        DEBUG="no"
-    fi
+   DEFS="$DEFS -DNDEBUG"
+   DEBUG="no"
 fi
 
 CFLAGS="$CFLAGS -I/usr/local/include"
@@ -52,17 +46,25 @@ 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"
+    CFLAGS="$CFLAGS -I/opt/local/include"
+    CXXFLAGS="$CFLAGS -I/opt/local/include"
+    LDFLAGS="$LDFLAGS -L/opt/local/lib"
+fi
+
 if [ "$OS" = "unknown" ]
 then
     printf "################################################################################\n"
-    printf "# Sorry, but sgauthstress currently supported by Linux, FreeBSD 4.x-8.x        #\n"
+    printf "# Sorry, but sgauthstress is currently supported by Linux, FreeBSD and Darwin. #\n"
     printf "################################################################################\n"
     exit 1
 fi
@@ -73,7 +75,7 @@ printf "########################################################################
 
 STG_LIBS="logger.lib
           crypto.lib
-         common.lib
+          common.lib
           conffiles.lib
           dotconfpp.lib"
 

diff --git a/projects/sgconf/build b/projects/sgconf/build
index 91be27281a9f8fce04b43dd50a21c04f2a206238..721d507cec352b946030df35956c3f8f3164def5 100755 (executable)
--- a/projects/sgconf/build
+++ b/projects/sgconf/build
@@ -61,7 +61,7 @@ fi
 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"
-    printf "# Sorry, but sgconf currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #\n"
+    printf "# Sorry, but sgconf is currently supported by Linux, FreeBSD and Darwin.    #\n"
     printf "#############################################################################\n"
     exit 1
 fi

diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
index 689cc262d615e3aea0bae8cccd33353aa6bf57d5..3e019e7c7cb0000d101b7956964ebdb32f2502c1 100755 (executable)
--- a/projects/sgconf_xml/build
+++ b/projects/sgconf_xml/build
@@ -54,13 +54,13 @@ fi
 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"
-    printf "# Sorry, but sgconf currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #\n"
+    printf "# Sorry, but sgconf_xml is currently supported by Linux, FreeBSD and Darwin.#\n"
     printf "#############################################################################\n"
     exit 1
 fi
 
 printf "#############################################################################\n"
-printf "       Building sgconf for $sys $release\n"
+printf "       Building sgconf_xml for $sys $release\n"
 printf "#############################################################################\n"
 
 STG_LIBS="conffiles.lib
@@ -187,5 +187,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

diff --git a/projects/sgconv/build b/projects/sgconv/build
index 5ceb4013f2cd6fc7e78d6076a57ffc2167e90933..a458e05f1e1790c12bab05527b5f6a43f6754175 100755 (executable)
--- a/projects/sgconv/build
+++ b/projects/sgconv/build
@@ -62,7 +62,7 @@ fi
 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"
-    printf "# Sorry, but sgconv currently supported by Linux, FreeBSD 4.x, 5.x, 6.x     #\n"
+    printf "# Sorry, but sgconv is currently supported by Linux, FreeBSD and Darwin.    #\n"
     printf "#############################################################################\n"
     exit 1
 fi

diff --git a/projects/stargazer/build b/projects/stargazer/build
index 519aeb1393fea690d6a2ba2c4d73fdc0e36fb1db..83f62b4647ae9aaea3650e728c03afe3100f0fec 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -82,7 +82,7 @@ fi
 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"
-    printf "# Sorry, but stargazer currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #\n"
+    printf "# Sorry, but stargazer is currently supported by Linux, FreeBSD and Darwin. #\n"
     printf "#############################################################################\n"
     exit 1
 fi