Use ARTOOLKITX_CSUU and ARTOOLKITX_CSAT in build if defined.

Author: philip-lamb

Android/app/src/main/cpp/CMakeLists.txt

@@ -32,6 +32,13 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_library(main SHARED)
 
+if(DEFINED ENV{ARTOOLKITX_CSUU})
+    add_definitions("-DARTOOLKITX_CSUU=\"$ENV{ARTOOLKITX_CSUU}\"")
+endif()
+if(DEFINED ENV{ARTOOLKITX_CSAT})
+    add_definitions("-DARTOOLKITX_CSAT=\"$ENV{ARTOOLKITX_CSAT}\"")
+endif()
+
 # Enable C++11 for GCC/Clang compilers.
 set(CMAKE_CXX_STANDARD "11")
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

Linux/CMakeLists.txt

@@ -34,6 +34,13 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
     add_definitions("-DDEBUG=1")
 endif()
 
+if(DEFINED ENV{ARTOOLKITX_CSUU})
+    add_definitions("-DARTOOLKITX_CSUU=\"$ENV{ARTOOLKITX_CSUU}\"")
+endif()
+if(DEFINED ENV{ARTOOLKITX_CSAT})
+    add_definitions("-DARTOOLKITX_CSAT=\"$ENV{ARTOOLKITX_CSAT}\"")
+endif()
+
 # Search prefix.
 list(APPEND CMAKE_MODULE_PATH "${ARTOOLKITX_HOME}/Source/cmake")
 if(ARX_TARGET_PLATFORM_VARIANT)

artoolkitx-version.txt

@@ -1 +1 @@
-1.1.12
+1.1.14

build.sh

@@ -160,6 +160,11 @@ if [ $BUILD_MACOS ] ; then
     # Make the version number available to Xcode.
     cp macOS/user-config-in.xcconfig macOS/user-config.xcconfig
     sed -E -i "" -e "s/@VERSION@/${VERSION}/" macOS/user-config.xcconfig
+
+    # Insert the calibration server upload URL and authentication tokens into the build config.
+    if [[ ! -z "${ARTOOLKITX_CSUU}" && ! -z "${ARTOOLKITX_CSAT}" ]]; then
+        echo "GCC_PREPROCESSOR_DEFINITIONS=ARTOOLKITX_CSUU=\\\"${ARTOOLKITX_CSUU////\/}\\\" ARTOOLKITX_CSAT=\\\"${ARTOOLKITX_CSAT}\\\"" >> macOS/user-config.xcconfig
+    fi
 
     (cd macOS
     xcodebuild -target "artoolkitX Camera Calibration Utility" -configuration Release
@@ -188,6 +193,10 @@ if [ $BUILD_IOS ] ; then
     cp iOS/user-config-in.xcconfig iOS/user-config.xcconfig
     sed -E -i "" -e "s/@VERSION@/${VERSION}/" iOS/user-config.xcconfig
 
+    # Insert the calibration server upload URL and authentication tokens into the build config.
+    if [[ ! -z "${ARTOOLKITX_CSUU}" && ! -z "${ARTOOLKITX_CSAT}" ]]; then
+        echo "GCC_PREPROCESSOR_DEFINITIONS=ARTOOLKITX_CSUU=\\\"${ARTOOLKITX_CSUU////\/}\\\" ARTOOLKITX_CSAT=\\\"${ARTOOLKITX_CSAT}\\\"" >> iOS/user-config.xcconfig
+    fi
     (cd iOS
     xcodebuild -target "artoolkitX Camera Calibration Utility" -configuration Release -destination generic/platform=iOS
     )
@@ -223,6 +232,13 @@ if [ $BUILD_ANDROID ] ; then
     sed -E -i.bak -e "s/versionCode [0-9]+/versionCode ${VERSION_INT}/" -e "s/versionName \"[0-9\.]+\"/versionName \"${VERSION}\"/" Android/app/build.gradle
     rm -f Android/app/build.gradle.bak
 
+    # Insert the calibration server upload URL and authentication tokens on the Java side. On the C/C++ side, this is done by in CMakeLists.txt.
+    if [[ ! -z "${ARTOOLKITX_CSUU}" && ! -z "${ARTOOLKITX_CSAT}" ]]; then
+        sed -E -i.bak -e "s/ARTOOLKITX_CSUU *= *\".*\"/ARTOOLKITX_CSUU = \"${ARTOOLKITX_CSUU////\/}\"/" Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/Config.java
+        sed -E -i.bak -e "s/ARTOOLKITX_CSAT *= *\".*\"/ARTOOLKITX_CSAT = \"${ARTOOLKITX_CSAT//&/\&}\"/" Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/Config.java
+        rm -f Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/Config.java.bak
+    fi
+
     (cd "${OURDIR}/Android"
     echo "Building Android project"
     ./gradlew assembleRelease

prefsAndroid.cpp

@@ -92,7 +92,7 @@ void *initPreferences(void)
     if (packageNameC) {
         free(prefsFileName);
         prefsFileName = NULL;
-        if (asprintf(&prefsFileName, "%s_preferences", packageNameC) != -1) {
+        if (asprintf(&prefsFileName, "%s_preferences", packageNameC) < 0) {
             ARLOGe("initPreferences error\n");
         }
     }