Adding support for iOS.

Author: nfrechette

.travis.yml

@@ -28,12 +28,12 @@ matrix:
     # OS X xcode8
     - os: osx
       osx_image: xcode8.3
-      env: COMPILER=xcode
+      env: COMPILER=osx
 
     # OS X xcode9
     - os: osx
       osx_image: xcode9.2
-      env: COMPILER=xcode
+      env: COMPILER=osx
 
 before_install:
     - if [ "$COMPILER" = "clang4" ]; then curl -sSL "http://apt.llvm.org/llvm-snapshot.gpg.key" | sudo -E apt-key add - ; fi
@@ -50,3 +50,5 @@ script:
     - python3 make.py -clean -build -unit_test -${COMPILER} -Release -x86
     - python3 make.py -clean -build -unit_test -${COMPILER} -Debug -x64
     - python3 make.py -clean -build -unit_test -${COMPILER} -Release -x64
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then python3 make.py -clean -build -ios -Debug ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then python3 make.py -clean -build -ios -Release; fi

README.md

@@ -38,6 +38,9 @@ Unicode formats other than UTF-8 aren't supported.
 *  Linux (gcc5, gcc6, gcc7, clang4, clang5) x86 and x64
 *  OS X (Xcode 8.3, Xcode 9.2) x86 and x64
 *  Android (NVIDIA CodeWorks) ARMv7-A
+*  iOS (Xcode 8.3, Xcode 9.2) ARM64
+
+The above supported platform list is only what is tested every release but if it compiles, it should run just fine.
 
 ## External dependencies
 
@@ -59,6 +62,10 @@ See [here](./external) for details on the ones we do include.
 
 For Android, the steps are identical to Windows, Linux, and OS X but you also need to install NVIDIA CodeWorks 1R5 (or higher).
 
+### iOS
+
+For iOS, the steps are identical to the other platforms but due to code signing, you will need to perform the builds from Xcode manually. Note that this is only an issue if you attempt to use the tools or run the unit tests locally.
+
 ## Authors
 
 *  [Nicholas Frechette](https://github.com/nfrechette)

cmake/CMakePlatforms.cmake

@@ -5,8 +5,12 @@ if( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
 	set(PLATFORM_WINDOWS 1)
 	set(PLATFORM_NAME "Windows")
 elseif( ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" )
-	set(PLATFORM_OSX 1)
-	set(PLATFORM_NAME "OS X")
+	if(PLATFORM_IOS)
+		set(PLATFORM_NAME "iOS")
+	else()
+		set(PLATFORM_OSX 1)
+		set(PLATFORM_NAME "OS X")
+	endif()
 elseif( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
 	set(PLATFORM_LINUX 1)
 	set(PLATFORM_NAME "Linux")

cmake/Toolchain-iOS.cmake

@@ -0,0 +1,16 @@
+cmake_minimum_required (VERSION 3.2)
+
+set(CMAKE_SYSTEM_NAME Darwin)
+
+# Set here instead of CMakePlatforms.cmake since we can't distinguis otherwise
+set(PLATFORM_IOS 1)
+
+# Find and set the C/C++ compiler paths, cmake doesn't seem to do this properly on its own
+execute_process(COMMAND xcrun --sdk iphoneos --find clang OUTPUT_VARIABLE CMAKE_C_COMPILER OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND xcrun --sdk iphoneos --find clang++ OUTPUT_VARIABLE CMAKE_CXX_COMPILER OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(CMAKE_MACOSX_BUNDLE YES)
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED NO)
+set(CMAKE_OSX_SYSROOT iphoneos CACHE STRING "")
+set(CMAKE_OSX_ARCHITECTURES arm64 CACHE STRING "")
+set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET 11.0)

make.py

@@ -60,8 +60,11 @@ def parse_argv():
 		if value == '-gcc7':
 			options['compiler'] = 'gcc7'
 
-		if value == '-xcode':
-			options['compiler'] = 'xcode'
+		if value == '-osx':
+			options['compiler'] = 'osx'
+
+		if value == '-ios':
+			options['compiler'] = 'ios'
 
 		# TODO: Refactor to use the form: -config=Release
 		if value_upper == '-DEBUG':
@@ -77,6 +80,21 @@ def parse_argv():
 		if value == '-x64':
 			options['cpu'] = 'x64'
 
+	# Sanitize and validate our options
+	if options['compiler'] == 'android':
+		options['cpu'] = 'armv7-a'
+
+		if not platform.system() == 'Windows':
+			print('Android is only supported on Windows')
+			sys.exit(1)
+
+	if options['compiler'] == 'ios':
+		options['cpu'] = 'arm64'
+
+		if not platform.system() == 'Darwin':
+			print('iOS is only supported on OS X')
+			sys.exit(1)
+
 	return options
 
 def get_cmake_exes():
@@ -103,14 +121,23 @@ def get_generator(compiler, cpu):
 		elif compiler == 'android':
 			return 'Visual Studio 14'
 	elif platform.system() == 'Darwin':
-		if compiler == 'xcode':
+		if compiler == 'osx' or compiler == 'ios':
 			return 'Xcode'
 	else:
 		return 'Unix Makefiles'
 
 	print('Unknown compiler: {}'.format(compiler))
 	sys.exit(1)
 
+def get_toolchain(compiler):
+	if platform.system() == 'Windows' and compiler == 'android':
+		return 'Toolchain-Android.cmake'
+	elif platform.system() == 'Darwin' and compiler == 'ios':
+		return 'Toolchain-iOS.cmake'
+
+	# No toolchain
+	return None
+
 def set_compiler_env(compiler, options):
 	if platform.system() == 'Linux':
 		os.environ['MAKEFLAGS'] = '-j{}'.format(options['num_threads'])
@@ -141,15 +168,16 @@ def do_generate_solution(cmake_exe, build_dir, cmake_script_dir, options):
 	if not compiler == None:
 		set_compiler_env(compiler, options)
 
-	extra_switches = []
+	extra_switches = ['--no-warn-unused-cli']
 	if not platform.system() == 'Windows':
 		extra_switches.append('-DCPU_INSTRUCTION_SET:STRING={}'.format(cpu))
 
 	if not platform.system() == 'Windows' and not platform.system() == 'Darwin':
 		extra_switches.append('-DCMAKE_BUILD_TYPE={}'.format(config.upper()))
 
-	if platform.system() == 'Windows' and compiler == 'android':
-		extra_switches.append('-DCMAKE_TOOLCHAIN_FILE={} --no-warn-unused-cli'.format(os.path.join(cmake_script_dir, 'Toolchain-Android.cmake')))
+	toolchain = get_toolchain(compiler)
+	if not toolchain == None:
+		extra_switches.append('-DCMAKE_TOOLCHAIN_FILE={}'.format(os.path.join(cmake_script_dir, toolchain)))
 
 	# Generate IDE solution
 	print('Generating build files ...')
@@ -176,7 +204,10 @@ def do_build(cmake_exe, options):
 		else:
 			cmake_cmd += ' --config {} --target INSTALL'.format(config)
 	elif platform.system() == 'Darwin':
-		cmake_cmd += ' --config {} --target install'.format(config)
+		if options['compiler'] == 'ios':
+			cmake_cmd += ' --config {}'.format(config)
+		else:
+			cmake_cmd += ' --config {} --target install'.format(config)
 	else:
 		cmake_cmd += ' --target install'
 
@@ -227,8 +258,7 @@ def do_tests(ctest_exe, options):
 	if not compiler == None:
 		print('Using compiler: {}'.format(compiler))
 
-	if options['build'] or not options['unit_test']:
-		do_generate_solution(cmake_exe, build_dir, cmake_script_dir, options)
+	do_generate_solution(cmake_exe, build_dir, cmake_script_dir, options)
 
 	if options['build']:
 		do_build(cmake_exe, options)

tests/CMakeLists.txt

@@ -3,6 +3,8 @@ project(sjson-cpp_unit_tests_root)
 
 if(PLATFORM_ANDROID)
 	add_subdirectory("${PROJECT_SOURCE_DIR}/main_android")
+elseif(PLATFORM_IOS)
+	add_subdirectory("${PROJECT_SOURCE_DIR}/main_ios")
 else()
 	add_subdirectory("${PROJECT_SOURCE_DIR}/main_generic")
 endif()

tests/main_ios/CMakeLists.txt

@@ -0,0 +1,34 @@
+cmake_minimum_required (VERSION 3.2)
+project(sjson-cpp_unit_tests)
+
+# iOS cmake toolchain does not support CMAKE_CXX_STANDARD
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
+# Force enable debug symbols
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+
+# Enable optimizations in Release
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
+
+set(MACOSX_BUNDLE_EXECUTABLE_NAME ${PROJECT_NAME})
+set(MACOSX_BUNDLE_INFO_STRING "com.sjson.cpp.unit-tests")
+set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.sjson.cpp.unit-tests")
+set(MACOSX_BUNDLE_BUNDLE_NAME "sjson-cpp-unit-tests")
+
+include_directories("${PROJECT_SOURCE_DIR}/../../includes")
+include_directories("${PROJECT_SOURCE_DIR}/../../external/catch-1.9.6")
+
+# Grab all of our test source files
+file(GLOB_RECURSE ALL_TEST_SOURCE_FILES LIST_DIRECTORIES false
+	${PROJECT_SOURCE_DIR}/../sources/*.h
+	${PROJECT_SOURCE_DIR}/../sources/*.cpp)
+
+create_source_groups("${ALL_TEST_SOURCE_FILES}" ${PROJECT_SOURCE_DIR}/..)
+
+# Grab all of our main source files
+file(GLOB_RECURSE ALL_MAIN_SOURCE_FILES LIST_DIRECTORIES false
+	${PROJECT_SOURCE_DIR}/*.cpp)
+
+create_source_groups("${ALL_MAIN_SOURCE_FILES}" ${PROJECT_SOURCE_DIR})
+
+add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${ALL_TEST_SOURCE_FILES} ${ALL_MAIN_SOURCE_FILES})

tests/main_ios/main.cpp

@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+// The MIT License (MIT)
+//
+// Copyright (c) 2018 Nicholas Frechette, Cody Jones, and sjson-cpp contributors
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+////////////////////////////////////////////////////////////////////////////////
+
+#define CATCH_CONFIG_RUNNER
+#include <catch.hpp>
+
+int main(int argc, char* argv[])
+{
+	int result = Catch::Session().run(argc, argv);
+
+	return (result < 0xff ? result : 0xff);
+}