Merge branch 'master' into canonical

Author: philip-lamb

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

@@ -32,8 +32,12 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_library(main SHARED)
 
-add_definitions("-DARTOOLKITX_CSUU=\"https://calibration.artoolkitx.org/app/calib_camera/upload.php\"")
-add_definitions("-DARTOOLKITX_CSAT=\"auth_token\"")
+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")

Linux/CMakeLists.txt

@@ -36,6 +36,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

iOS/Info.plist

@@ -41,8 +41,6 @@
 	</dict>
 	<key>UIRequiresFullScreen</key>
 	<true/>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -51,5 +49,7 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<true/>
 </dict>
 </plist>

iOS/artoolkitX Camera Calibration Utility.xcodeproj/project.pbxproj

@@ -625,13 +625,15 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "Camera Calibration";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.artoolkitx.arx.utilities.calib-camera-ios";
+				PRODUCT_BUNDLE_IDENTIFIER = org.artoolkitx.utilities.calibcameraios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -647,13 +649,15 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "Camera Calibration";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.artoolkitx.arx.utilities.calib-camera-ios";
+				PRODUCT_BUNDLE_IDENTIFIER = org.artoolkitx.utilities.calibcameraios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

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");
         }
     }

version.h

@@ -42,7 +42,7 @@
 extern "C" {
 #endif
 
-#define VERSION_STRING "1.1"
+#define VERSION_STRING "1.1.2"
 
 #ifdef __cplusplus
 }