X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/afb00c045e0ea58e39c0d7a7921bedbf26d1860d..ab2f65a4271701388a6baef4350ed6cb6dcecb8c:/projects/sgconf_xml/build?ds=sidebyside

diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
index cdd7e72a..689cc262 100755
--- a/projects/sgconf_xml/build
+++ b/projects/sgconf_xml/build
@@ -13,29 +13,30 @@ CONFFILE="../../Makefile.conf"
 PREFIX="/"
 BIN_MODE=0755
 DATA_MODE=0644
+DIR_MODE=0755
 OWNER=root
 
-if [ -z $1 ]
+if [ "$1" = "debug" ]
 then
-    MAKEOPTS="-j1"
-    CFLAGS="-O2"
+   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="-g3"
-    else
-        MAKEOPTS="-j1"
-        CFLAGS="-O2"
-    fi
+   DEFS="$DEFS -DNDEBUG"
+   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
     release=""
-    ETC_DIR="./inst/linux/etc/stargazer"
+    MAKE="make"
 fi
 
 if [ "$sys" = "FreeBSD" ]
@@ -43,86 +44,148 @@ then
     case $release in
         4) OS=bsd;;
         5) OS=bsd5;;
-        6) OS=bsd5;;	
-        *) OS=unknown;;
+        6) OS=bsd5;;
+        7) OS=bsd7;;
+        *) OS=bsd7;;
     esac
-    ETC_DIR="./inst/freebsd/etc/stargazer"
+    MAKE="gmake"
 fi
 
 if [ "$OS" = "unknown" ]
-then 
-    echo "#############################################################################"
-    echo "# Sorry, but sgconf currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #"
-    echo "#############################################################################"
+then
+    printf "#############################################################################\n"
+    printf "# Sorry, but sgconf currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #\n"
+    printf "#############################################################################\n"
     exit 1
 fi
 
-echo "#############################################################################"
-echo "       Building sgconf for $sys $release"
-echo "#############################################################################"
+printf "#############################################################################\n"
+printf "       Building sgconf for $sys $release\n"
+printf "#############################################################################\n"
 
 STG_LIBS="conffiles.lib
-	  crypto.lib 
-	  common.lib 
-	  srvconf.lib"
+          crypto.lib
+          common.lib
+          srvconf.lib"
 
 if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
-    SHELL="/bin/bash"
 else
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
     else
         DEFS="$DEFS -DFREE_BSD5"
+        if [ "$OS" = "bsd7" ]
+        then
+            LIB_THREAD=-lpthread
+        else
+            LIB_THREAD=-lc_r
+        fi
+    fi
+fi
+
+if [ -z "$CC" ]
+then
+    CC=gcc
+fi
+
+if [ -z "$CXX" ]
+then
+    CXX=g++
+fi
+
+printf "Checking CC... "
+$CC --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    printf "FAIL!\n"
+    printf "$CC not found\n"
+    exit;
+fi
+printf "found\n"
+printf "Checking CXX... "
+$CXX --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    printf "FAIL!\n"
+    printf "$CXX not found\n"
+    exit;
+fi
+printf "found\n"
+
+printf "Checking endianess... "
+printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c
+$CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    printf "FAIL!\n"
+    printf "Endianess checking failed\n"
+    exit;
+else
+    ./fake
+    if [ $? = 1 ]
+    then
+        ARCH=le
+        CXXFLAGS="$CXXFLAGS -DARCH_LE"
+        CFLAGS="$CFLAGS -DARCH_LE"
+        printf "Little Endian\n"
+    else
+        ARCH=be
+        CXXFLAGS="$CXXFLAGS -DARCH_BE"
+        CFLAGS="$CFLAGS -DARCH_BE"
+        printf "Big Endian\n"
     fi
-    SHELL="/usr/local/bin/bash"
-    LIB_THREAD=-lc_r
 fi
+rm -f fake
 
-echo -n "Checking for -lexpat... "
-echo "int main() { return 0; }" > build_check.c
-gcc build_check.c -lexpat -o fake > /dev/null 2> /dev/null
+printf "Checking for -lexpat... "
+printf "int main() { return 0; }\n" > build_check.c
+$CC $CXXFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     CHECK_EXPAT=no
-    echo "no"
+    printf "no\n"
 else
     CHECK_EXPAT=yes
-    echo "yes"
+    printf "yes\n"
 fi
 rm -f fake
 rm -f build_check.c
 
 if [ "$CHECK_EXPAT" != "yes" ]
 then
-    echo "-lexpat not found!"
+    printf "-lexpat not found!\n"
     exit 1
 fi
 
-echo "OS=$OS" > $CONFFILE
-echo "STG_TIME=no" >> $CONFFILE
-echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
-echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
-echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
-echo "DIR_INCLUDE=\$(DIR_BUILD)/../../include" >> $CONFFILE
-echo "CHECK_EXPAT=$CHECK_EXPAT" >> $CONFFILE
-echo "DEFS=$DEFS" >> $CONFFILE
-echo -n "STG_LIBS=" >> $CONFFILE
+printf "OS=$OS\n" > $CONFFILE
+printf "STG_TIME=yes\n" >> $CONFFILE
+printf "DEBUG=$DEBUG\n" >> $CONFFILE
+printf "DIR_BUILD=$BUILD_DIR\n" >> $CONFFILE
+printf "DIR_LIB=\$(DIR_BUILD)/../../lib\n" >> $CONFFILE
+printf "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs\n" >> $CONFFILE
+printf "DIR_INCLUDE=\$(DIR_BUILD)/../../include\n" >> $CONFFILE
+printf "ARCH=$ARCH\n" >> $CONFFILE
+printf "CHECK_EXPAT=$CHECK_EXPAT\n" >> $CONFFILE
+printf "DEFS=$DEFS\n" >> $CONFFILE
+printf "STG_LIBS=" >> $CONFFILE
 for lib in $STG_LIBS
 do
-    echo -n "$lib " >> $CONFFILE
+    printf "$lib " >> $CONFFILE
 done
-echo "" >> $CONFFILE
-echo "SHELL=$SHELL" >> $CONFFILE
-echo "CFLAGS=$CFLAGS" >> $CONFFILE
-echo "PREFIX=$PREFIX" >> $CONFFILE
-echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
-echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
-echo "OWNER=$OWNER" >> $CONFFILE
-echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
-
-gmake $MAKEOPTS
+printf "\n" >> $CONFFILE
+printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE
+printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
+printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
+printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
+printf "PREFIX=$PREFIX\n" >> $CONFFILE
+printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
+printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE
+printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE
+printf "OWNER=$OWNER\n" >> $CONFFILE
+
+$MAKE $MAKEOPTS