From 7da963e5f936a329b63c308e4031b59390f42a92 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sun, 18 Jan 2015 22:18:04 +0200
Subject: [PATCH 1/1] Some fixes in build scripts.
---
projects/libs/build | 4 ++--
projects/rscriptd/build | 2 +-
projects/sgauth/build | 2 +-
projects/sgauthstress/build | 40 +++++++++++++++++++------------------
projects/sgconf/build | 2 +-
projects/sgconf_xml/build | 12 +++++++----
projects/sgconv/build | 2 +-
projects/stargazer/build | 2 +-
8 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/projects/libs/build b/projects/libs/build
index a85ad133..7b18b48a 100755
--- 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 3b73000d..68a64f87 100755
--- 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 e7c4be9b..bd21df21 100755
--- 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 29b10675..8da9ac67 100755
--- 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 91be2728..721d507c 100755
--- 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 689cc262..3e019e7c 100755
--- 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 5ceb4013..a458e05f 100755
--- 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 519aeb13..83f62b46 100755
--- 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
--
2.44.2