Merge branch '3.10' of https://github.com/JumpMind/symmetric-ds.git i…

…nto 3.10
JumpMind · Oct 31, 2019 · 0585dda · 0585dda
2 parents 3c5468e + 7c3fe6e
commit 0585dda
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 6 deletions.
diff --git a/symmetric-server/src/main/deploy/databases/firebird/build.sh b/symmetric-server/src/main/deploy/databases/firebird/build.sh
@@ -21,8 +21,21 @@
 #
 
 
-INTERBASE_HOME=/opt/interbase
+if [[ -z "${INTERBASE_HOME}" ]]; then
+        INTERBASE_HOME=/opt/interbase
+fi
+
+if [[ "${OSTYPE}" == "linux-gnu" ]]; then
+        SHARED_LIB_FILE=sym_udf.so
+        LD_OPTIONS="-G -lm -lc -lib_util"
+elif [[ "${OSTYPE}" == "darwin"* ]]; then
+        SHARED_LIB_FILE=sym_udf.dylib
+        LD_OPTIONS="-lm -lc -lib_util -dylib"
+else
+        SHARED_LIB_FILE=sym_udf.so
+        LD_OPTIONS="-G -lm -lc -lib_util"
+fi
 
 gcc -I "$INTERBASE_HOME"/include -c -O -fpic sym_udf.c
-ld -G sym_udf.o -lm -lc -lib_util -o sym_udf.so
-cp sym_udf.so "$INTERBASE_HOME_HOME"/UDF/
+ld ${LD_OPTIONS} sym_udf.o -o ${SHARED_LIB_FILE}
+cp ${SHARED_LIB_FILE} "$INTERBASE_HOME"/UDF/
diff --git a/symmetric-server/src/main/deploy/databases/interbase/build.sh b/symmetric-server/src/main/deploy/databases/interbase/build.sh
@@ -21,8 +21,21 @@
 #
 
 
-INTERBASE_HOME=/opt/interbase
+if [[ -z "${INTERBASE_HOME}" ]]; then
+        INTERBASE_HOME=/opt/interbase
+fi
+
+if [[ "${OSTYPE}" == "linux-gnu" ]]; then
+        SHARED_LIB_FILE=sym_udf.so
+        LD_OPTIONS="-G -lm -lc -lib_util"
+elif [[ "${OSTYPE}" == "darwin"* ]]; then
+        SHARED_LIB_FILE=sym_udf.dylib
+        LD_OPTIONS="-lm -lc -lib_util -dylib"
+else
+        SHARED_LIB_FILE=sym_udf.so
+        LD_OPTIONS="-G -lm -lc -lib_util"
+fi
 
 gcc -I "$INTERBASE_HOME"/include -c -O -fpic sym_udf.c
-ld -G sym_udf.o -lm -lc -lib_util -o sym_udf.so
-cp sym_udf.so "$INTERBASE_HOME_HOME"/UDF/
+ld ${LD_OPTIONS} sym_udf.o -o ${SHARED_LIB_FILE}
+cp ${SHARED_LIB_FILE} "$INTERBASE_HOME"/UDF/
diff --git a/symmetric-util/src/test/resources/log4j.xml b/symmetric-util/src/test/resources/log4j.xml
@@ -177,6 +177,13 @@
     </category>
      -->
 
+    <!-- In order to see DDL Changes enable this
+    <category name="org.jumpmind.db.alter.ModelComparator">
+        <priority value="DEBUG" />
+    </category>
+     -->
+
+
     <!-- Change the "CONSOLE" to "ROLLING" to log to a file instead -->
     <root>
         <priority value="INFO" />