Build system update

Author: tiennou

ObjectiveGitFramework.xcodeproj/project.pbxproj

@@ -1243,11 +1243,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjectiveGit-Mac" */;
 			buildPhases = (
+				79262F0F13C697BE00A4B1EA /* Copy git2 Headers */,
+				BEF7E4DF1A3A47450035BB8E /* Copy git2 Headers again */,
 				8DC2EF540486A6940098B216 /* Sources */,
 				8DC2EF520486A6940098B216 /* Resources */,
 				8DC2EF560486A6940098B216 /* Frameworks */,
-				79262F0F13C697BE00A4B1EA /* Copy git2 Headers */,
-				BEF7E4DF1A3A47450035BB8E /* Copy git2 Headers again */,
 				8DC2EF500486A6940098B216 /* Headers */,
 				4D751E9D215D765D003CD3CE /* Package external libraries */,
 			);

script/cibuild

@@ -69,9 +69,9 @@ elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then
 
   xcodebuild -workspace "$XCWORKSPACE" \
     -scheme "$SCHEME" \
-    -destination "platform=iOS Simulator,name=iPhone 5" \
+    -destination "platform=iOS Simulator,name=iPhone 12" \
     -sdk iphonesimulator \
     ${XCODE_OPTIONS[*]} \
     build test \
-    2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
+    2>&1 #| xcpretty $XCPRETTY_FORMAT_OPTIONS
 fi

script/ios_build_functions.sh

@@ -39,7 +39,7 @@ function setup_build_environment ()
         CAN_BUILD_64BIT="1"
     fi
 
-    ARCHS="i386 armv7 armv7s"
+    ARCHS="armv7 armv7s"
     if [ "${CAN_BUILD_64BIT}" -eq "1" ]
     then
         # For some stupid reason cmake needs simulator
@@ -72,20 +72,13 @@ function build_all_archs ()
     do
         if [ "${ARCH}" == "i386" ] || [ "${ARCH}" == "x86_64" ]
         then
-            PLATFORM="iphonesimulator"
+            PLATFORM="iPhoneSimulator"
         else
-            PLATFORM="iphoneos"
+            PLATFORM="iPhoneOS"
         fi
 
         SDKVERSION=$(ios_sdk_version)
 
-        if [ "${ARCH}" == "arm64" ]
-        then
-            HOST="aarch64-apple-darwin"
-        else
-            HOST="${ARCH}-apple-darwin"
-        fi
-
         SDKNAME="${PLATFORM}${SDKVERSION}"
         SDKROOT="$(ios_sdk_path ${SDKNAME})"
 

script/update_libgit2_ios

@@ -46,7 +46,7 @@ function build_libgit2 ()
         -DCMAKE_INSTALL_PREFIX:PATH="${ARCH_INSTALL_PATH}/" \
         -DBUILD_CLAR:BOOL=OFF \
         -DTHREADSAFE:BOOL=ON \
-        -DCURL:BOOL=OFF \
+        -DREGEX_BACKEND=builtin \
         -DCMAKE_C_FLAGS:STRING="-fembed-bitcode" \
         "${SYS_ROOT}" \
         -DCMAKE_OSX_ARCHITECTURES:STRING="${ARCH}" \

script/update_libssh2_ios

@@ -21,11 +21,18 @@ function build_ssh2 ()
     cp -R "${ROOT_PATH}/External/libssh2" "${ARCH_INSTALL_PATH}/libssh2"
     pushd "${ARCH_INSTALL_PATH}/libssh2" > /dev/null
 
+    if [ "${ARCH}" == "arm64" ]
+    then
+        HOST="aarch64-apple-darwin"
+    else
+        HOST="${ARCH}-apple-darwin"
+    fi
+
     export CFLAGS="-arch ${ARCH} -fembed-bitcode -pipe -no-cpp-precomp -isysroot ${SDKROOT} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
     export CPPFLAGS="-arch ${ARCH} -fembed-bitcode -pipe -no-cpp-precomp -isysroot ${SDKROOT} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
 
     ./buildconf >> "${LOG}" 2>&1
-    ./configure --host=${HOST} --prefix="${ARCH_INSTALL_PATH}" --with-openssl --with-libssl-prefix="${INSTALL_PATH}" --disable-shared --enable-static >> "${LOG}" 2>&1
+    ./configure --host=${HOST} --prefix="${ARCH_INSTALL_PATH}" --with-libssl-prefix="${INSTALL_PATH}" --disable-shared --enable-static >> "${LOG}" 2>&1
     make >> "${LOG}" 2>&1
     make install >> "${LOG}" 2>&1
     popd > /dev/null

script/update_libssl_ios

@@ -21,28 +21,39 @@ function setup ()
 
 function build_ssl ()
 {
-    cp -r "${ROOT_PATH}/External/openssl" "${ARCH_INSTALL_PATH}/openssl"
-    pushd "${ARCH_INSTALL_PATH}/openssl" > /dev/null
+  if [ -f "${ARCH_INSTALL_PATH}/lib/libssl.a" -a \
+       -f "${ARCH_INSTALL_PATH}/lib/libcrypto.a" ]; then
+         echo "No building needed." 2>&1
+     else
 
-    if [ "${ARCH}" == "arm64" ] || [ "${ARCH}" == "x86_64" ]
-    then
-        HOST="BSD-generic64"
-        CONFIG="no-gost no-asm enable-ec_nistp_64_gcc_128"
-    else
-        HOST="BSD-generic32"
-        CONFIG="no-gost no-asm"
-        perl -i -pe 's|static volatile sig_atomic_t intr_signal|static volatile int intr_signal|' crypto/ui/ui_openssl.c
-    fi
+      cp -r "${ROOT_PATH}/External/openssl" "${ARCH_INSTALL_PATH}/openssl"
+      pushd "${ARCH_INSTALL_PATH}/openssl" > /dev/null
 
-    ./Configure ${HOST} ${CONFIG} --openssldir="${ARCH_INSTALL_PATH}" >> "${LOG}" 2>&1
-    perl -i -pe "s|^CC= gcc|CC= ${CLANG} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET} -arch ${ARCH} -fembed-bitcode |g" Makefile >> "${LOG}" 2>&1
-    perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${SDKROOT} \$1|g" Makefile >> "${LOG}" 2>&1
-    make >> "${LOG}" 2>&1
+      if [ "${ARCH}" == "x86_64" ]; then
+          HOST="iossimulator-xcrun"
+          CONFIG=""
+      elif [ "${ARCH}" == "arm64" ]; then
+          HOST="ios64-cross"
+          CONFIG=""
+      elif [ "${ARCH}" == "armv7" ] || [ "${ARCH}" == "armv7s" ]; then
+          HOST="ios-cross"
+          CONFIG=""
+      else
+          echo "Unhandled ARCH: ${ARCH}"
+          exit -1
+      fi
 
-    make install_sw >> "${LOG}" 2>&1
-    popd > /dev/null
+      echo "./Configure ${HOST} ${CONFIG} --prefix=\"${ARCH_INSTALL_PATH}\" --openssldir=\"${ARCH_INSTALL_PATH}\" >> \"${LOG}\" 2>&1"
+      ./Configure ${HOST} ${CONFIG} --prefix=${ARCH_INSTALL_PATH} --openssldir="${ARCH_INSTALL_PATH}" >> "${LOG}" 2>&1
+      perl -i -pe "s|^CFLAGS=(.*)|CFLAGS= -arch ${ARCH} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET} -isysroot ${SDKROOT} -fembed-bitcode \$1|g" Makefile >> "${LOG}" 2>&1
+      perl -i -pe "s|-arch (\w+)|-arch ${ARCH}|g" Makefile >> "${LOG}" 2>&1
+      make >> "${LOG}" 2>&1
 
-    rm -rf "${ARCH_INSTALL_PATH}/openssl"
+      make install_sw >> "${LOG}" 2>&1
+      popd > /dev/null
+
+      rm -rf "${ARCH_INSTALL_PATH}/openssl"
+    fi
 
     BUILT_CRYPTO_PATHS+=("${ARCH_INSTALL_PATH}/lib/libcrypto.a")
     BUILT_SSL_PATHS+=("${ARCH_INSTALL_PATH}/lib/libssl.a")