Better handling of errors from server. Refactoring.

[stg.git] / projects / sgconv / build

diff --git a/projects/sgconv/build b/projects/sgconv/build
index 471ee62cd165732d5292bb37e04e3298970beffe..7e430be2fe4f8438b3ad727862d1b8d5f2649628 100755 (executable)
--- a/projects/sgconv/build
+++ b/projects/sgconv/build
@@ -16,11 +16,20 @@ DATA_MODE=0644
 DIR_MODE=0755
 OWNER=root
 VAR_DIR="./inst/var/stargazer"
 DIR_MODE=0755
 OWNER=root
 VAR_DIR="./inst/var/stargazer"

-DEFS="-DDEBUG"
-MAKEOPTS="-j1"
+
+if [ "$1" = "debug" ]
+then
+   DEFS="$DEFS -DDEBUG"
+   MAKEOPTS="$MAKEOPTS -j1"
+   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
+   DEBUG="yes"
+else
+   DEFS="$DEFS -DNDEBUG"
+   DEBUG="no"
+fi
+

 CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include"
 LDFLAGS="$LDFLAGS -L/usr/local/lib"
 CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include"
 LDFLAGS="$LDFLAGS -L/usr/local/lib"

-DEBUG="yes"

 
 if [ "$sys" = "Linux" ]
 then
 
 if [ "$sys" = "Linux" ]
 then


@@ -45,15 +54,15 @@ fi
 
 if [ "$OS" = "unknown" ]
 then 
 
 if [ "$OS" = "unknown" ]
 then 

-    echo "#############################################################################"
-    echo "# Sorry, but convertor currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #"
-    echo "#############################################################################"
+    printf "#############################################################################\n"
+    printf "# Sorry, but sgconv currently supported by Linux, FreeBSD 4.x, 5.x, 6.x     #\n"
+    printf "#############################################################################\n"

     exit 1
 fi
 
     exit 1
 fi
 

-echo "#############################################################################"
-echo "       Building convertor for $sys $release"
-echo "#############################################################################"
+printf "#############################################################################\n"
+printf "       Building sgconv for $sys $release\n"
+printf "#############################################################################\n"

 
 STG_LIBS="logger.lib 
           locker.lib
 
 STG_LIBS="logger.lib 
           locker.lib


@@ -94,32 +103,32 @@ then
     CXX=g++
 fi
 
     CXX=g++
 fi
 

-echo -n "Checking CC... "
+printf "Checking CC... "

 $CC --version > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
 $CC --version > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then

-    echo "FAIL!"
-    echo "$CC not found"
+    printf "FAIL!\n"
+    printf "$CC not found\n"

     exit;
 fi
     exit;
 fi

-echo "found"
-echo -n "Checking CXX... "
+printf "found\n"
+printf "Checking CXX... "

 $CXX --version > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
 $CXX --version > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then

-    echo "FAIL!"
-    echo "$CXX not found"
+    printf "FAIL!\n"
+    printf "$CXX not found\n"

     exit;
 fi
     exit;
 fi

-echo "found"
+printf "found\n"

 
 

-echo -n "Checking endianess... "
-echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
+printf "Checking endianess... "
+printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c

 $CC $CFLAGS $LDFLAGS -L/usr/lib/mysql -L/usr/local/lib/mysql build_check.c -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
 $CC $CFLAGS $LDFLAGS -L/usr/lib/mysql -L/usr/local/lib/mysql build_check.c -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then

-    echo "FAIL!"
-    echo "Endianess checking failed"
+    printf "FAIL!\n"
+    printf "Endianess checking failed\n"

     exit;
 else
     ./fake
     exit;
 else
     ./fake


@@ -128,102 +137,102 @@ else
         ARCH=le
         CXXFLAGS="$CXXFLAGS -DARCH_LE"
         CFLAGS="$CFLAGS -DARCH_LE"
         ARCH=le
         CXXFLAGS="$CXXFLAGS -DARCH_LE"
         CFLAGS="$CFLAGS -DARCH_LE"

-        echo "Little Endian"
+        printf "Little Endian\n"

     else
         ARCH=be
         CXXFLAGS="$CXXFLAGS -DARCH_BE"
         CFLAGS="$CFLAGS -DARCH_BE"
     else
         ARCH=be
         CXXFLAGS="$CXXFLAGS -DARCH_BE"
         CFLAGS="$CFLAGS -DARCH_BE"

-        echo "Big Endian"
+        printf "Big Endian\n"

     fi
 fi
 rm -f fake
 
     fi
 fi
 rm -f fake
 

-echo -n "Checking for -lfbclient... "
+printf "Checking for -lfbclient... "

 $CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     CHECK_FBCLIENT=no
 $CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     CHECK_FBCLIENT=no

-    echo "no"
+    printf "no\n"

 else
     CHECK_FBCLIENT=yes
 else
     CHECK_FBCLIENT=yes

-    echo "yes"
+    printf "yes\n"

 fi
 rm -f fake
 
 fi
 rm -f fake
 

-echo -n "Checking for mysql_config... "
+printf "Checking for mysql_config... "

 MYSQL_VERSION=`mysql_config --version 2> /dev/null`
 if [ $? != 0 ]
 then
 MYSQL_VERSION=`mysql_config --version 2> /dev/null`
 if [ $? != 0 ]
 then

-    echo "no";
-    echo -n "Checking for -lmysqlclient... "
+    printf "no\n";
+    printf "Checking for -lmysqlclient... "

     $CC $CFLAGS $LDFLAGS build_check.c -lmysqlclient_r $LIB_THREAD -o fake > /dev/null 2> /dev/null
     if [ $? != 0 ]
     then
         CHECK_MYSQLCLIENT=no
     $CC $CFLAGS $LDFLAGS build_check.c -lmysqlclient_r $LIB_THREAD -o fake > /dev/null 2> /dev/null
     if [ $? != 0 ]
     then
         CHECK_MYSQLCLIENT=no

-        echo "no"
+        printf "no\n"

     else
         CHECK_MYSQLCLIENT=yes
     else
         CHECK_MYSQLCLIENT=yes

-        echo "yes"
+        printf "yes\n"

     fi
     rm -f fake
 else
     fi
     rm -f fake
 else

-    echo "yes"
-    echo -n "Checking for mysql_config --cflags... "
+    printf "yes\n"
+    printf "Checking for mysql_config --cflags... "

     MYSQL_CFLAGS=`mysql_config --cflags 2> /dev/null`
     if [ $? != 0 ]
     then
         CHECK_MYSQLCLIENT=no
     MYSQL_CFLAGS=`mysql_config --cflags 2> /dev/null`
     if [ $? != 0 ]
     then
         CHECK_MYSQLCLIENT=no

-        echo "no"
+        printf "no\n"

     else
     else

-        echo "[$MYSQL_CFLAGS]"
-        echo -n "Checking for mysql_config --libs_r... "
+        printf "[$MYSQL_CFLAGS]\n"
+        printf "Checking for mysql_config --libs_r... "

         MYSQL_LDFLAGS=`mysql_config --libs_r 2> /dev/null`
         if [ $? != 0 ]
         then
             CHECK_MYSQLCLIENT=no
         MYSQL_LDFLAGS=`mysql_config --libs_r 2> /dev/null`
         if [ $? != 0 ]
         then
             CHECK_MYSQLCLIENT=no

-            echo "no"
+            printf "no\n"

         else
             CHECK_MYSQLCLIENT=yes
         else
             CHECK_MYSQLCLIENT=yes

-            echo "[$MYSQL_LDFLAGS]"
+            printf "[$MYSQL_LDFLAGS]\n"

         fi
     fi
 fi
 
         fi
     fi
 fi
 

-echo -n "Checking for pg_config... "
+printf "Checking for pg_config... "

 PG_VERSION=`pg_config --version 2> /dev/null`
 if [ $? != 0 ]
 then
 PG_VERSION=`pg_config --version 2> /dev/null`
 if [ $? != 0 ]
 then

-    echo "no";
-    echo -n "Checking for -lpq... "
+    printf "no\n";
+    printf "Checking for -lpq... "

     $CC $CFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null
     if [ $? != 0 ]
     then
         CHECK_PQ=no
     $CC $CFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null
     if [ $? != 0 ]
     then
         CHECK_PQ=no

-        echo "no"
+        printf "no\n"

     else
         CHECK_PQ=yes
     else
         CHECK_PQ=yes

-        echo "yes"
+        printf "yes\n"

     fi
     rm -f fake
 else
     fi
     rm -f fake
 else

-    echo "yes";
-    echo -n "Checking for pg_config --includedir... "
+    printf "yes\n";
+    printf "Checking for pg_config --includedir... "

     PG_CFLAGS=`pg_config --includedir 2> /dev/null`
     if [ $? != 0 ]
     then
         CHECK_PQ=no
     PG_CFLAGS=`pg_config --includedir 2> /dev/null`
     if [ $? != 0 ]
     then
         CHECK_PQ=no

-        echo "no"
+        printf "no\n"

     else
     else

-        echo "[$PG_CFLAGS]"
-        echo -n "Checking for pg_config --libdir... "
+        printf "[$PG_CFLAGS]\n"
+        printf "Checking for pg_config --libdir... "

         PG_LDFLAGS=`pg_config --libdir 2> /dev/null`
         if [ $? != 0 ]
         then
             CHECK_PQ=no
         PG_LDFLAGS=`pg_config --libdir 2> /dev/null`
         if [ $? != 0 ]
         then
             CHECK_PQ=no

-            echo "no"
+            printf "no\n"

         else
             CHECK_PQ=yes
         else
             CHECK_PQ=yes

-            echo "[$PG_LDFLAGS]"
+            printf "[$PG_LDFLAGS]\n"

         fi
     fi
 fi
         fi
     fi
 fi


@@ -250,40 +259,40 @@ then
          store/mysql"
 fi
 
          store/mysql"
 fi
 

-echo "OS=$OS" > $CONFFILE
-echo "STG_TIME=yes" >> $CONFFILE
-echo "DEBUG=$DEBUG" >> $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 "DIR_MOD=\$(DIR_BUILD)/../stargazer/modules" >> $CONFFILE
-echo "DIR_PLUGINS=\$(DIR_BUILD)/../stargazer/plugins" >> $CONFFILE
-echo "ARCH=$ARCH" >> $CONFFILE
-echo "CHECK_FBCLIENT=$CHECK_FBCLIENT" >> $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 "DIR_MOD=\$(DIR_BUILD)/../stargazer/modules\n" >> $CONFFILE
+printf "DIR_PLUGINS=\$(DIR_BUILD)/../stargazer/plugins\n" >> $CONFFILE
+printf "ARCH=$ARCH\n" >> $CONFFILE
+printf "CHECK_FBCLIENT=$CHECK_FBCLIENT\n" >> $CONFFILE
+printf "DEFS=$DEFS\n" >> $CONFFILE
+printf "STG_LIBS=" >> $CONFFILE

 for lib in $STG_LIBS
 do
 for lib in $STG_LIBS
 do

-    echo -n "$lib " >> $CONFFILE
+    printf "$lib " >> $CONFFILE

 done
 done

-echo "" >> $CONFFILE
-echo -n "PLUGINS=" >> $CONFFILE
+printf "\n" >> $CONFFILE
+printf "PLUGINS=" >> $CONFFILE

 for plugin in $PLUGINS
 do
 for plugin in $PLUGINS
 do

-    echo -n "$plugin " >> $CONFFILE
+    printf "$plugin " >> $CONFFILE

 done
 done

-echo "" >> $CONFFILE
-echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
-echo "CFLAGS=$CFLAGS" >> $CONFFILE
-echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
-echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
-echo "PREFIX=$PREFIX" >> $CONFFILE
-echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
-echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
-echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
-echo "OWNER=$OWNER" >> $CONFFILE
-echo "VAR_DIR=$VAR_DIR" >> $CONFFILE
+printf "\n" >> $CONFFILE
+printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
+printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
+printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
+printf "LIB_THREAD=$LIB_THREAD\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
+printf "VAR_DIR=$VAR_DIR\n" >> $CONFFILE

 
 mkdir -p ../stargazer/modules
 
 
 mkdir -p ../stargazer/modules