Merge branch 'master' into canonical. Remove left-over tokens.

Author: philip-lamb

Linux/CMakeLists.txt

@@ -29,8 +29,6 @@ set(ARTOOLKITX_HOME "${CMAKE_CURRENT_SOURCE_DIR}/../../artoolkitx")
 set(ARTOOLKITX_CAMERA_CALIBRATION_HOME "${CMAKE_CURRENT_SOURCE_DIR}/..")
 
 add_definitions("-DARX_TARGET_PLATFORM_LINUX=1")
-add_definitions("-DARTOOLKITX_CSUU=\"https://calibration.artoolkitx.org/app/calib_camera/upload.php\"")
-add_definitions("-DARTOOLKITX_CSAT=\"auth_token\"")
 
 if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
     add_definitions("-DDEBUG=1")

build.sh

@@ -163,7 +163,7 @@ if [ $BUILD_MACOS ] ; then
 
     # 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
+        echo "GCC_PREPROCESSOR_DEFINITIONS=ARTOOLKITX_CSUU=\\\"${ARTOOLKITX_CSUU////\\/}\\\" ARTOOLKITX_CSAT=\\\"${ARTOOLKITX_CSAT}\\\"" >> macOS/user-config.xcconfig
     fi
 
     (cd macOS
@@ -195,7 +195,7 @@ if [ $BUILD_IOS ] ; then
 
     # 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
+        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
@@ -234,8 +234,8 @@ if [ $BUILD_ANDROID ] ; then
 
     # 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
+        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
 

iOS/user-config-in.xcconfig

@@ -4,4 +4,3 @@
 //
 
 VERSION=@VERSION@
-GCC_PREPROCESSOR_DEFINITIONS=ARTOOLKITX_CSUU="\"https:\/\/calibration.artoolkitx.org\/app\/calib_camera\/upload.php\"" ARTOOLKITX_CSAT="\"auth_token\""

macOS/user-config-in.xcconfig

@@ -4,4 +4,3 @@
 //
 
 VERSION=@VERSION@
-GCC_PREPROCESSOR_DEFINITIONS=ARTOOLKITX_CSUU="\"https:\/\/calibration.artoolkitx.org\/app\/calib_camera\/upload.php\"" ARTOOLKITX_CSAT="\"auth_token\""