iOS build: more progress

Most of the dependencies build now.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

packaging/ios/build.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 set -e
 
-PWD=$(pwd)
+TOP=$(pwd)
 
-mkdir -p $PWD/install-root/lib $PWD/install-root/bin $PWD/install-root/include
+SUBSURFACE_SOURCE=${TOP}/../subsurface
-PKG_CONFIG_LIBDIR=$PWD/install-root/lib/pkgconfig
+IOS_QT=${TOP}/Qt
+
+mkdir -p $TOP/install-root/lib $TOP/install-root/bin $TOP/install-root/include
+PKG_CONFIG_LIBDIR=$TOP/install-root/lib/pkgconfig
 
 # Build architecture,  [armv7|armv7s|arm64|i386|x86_64]
 export ARCH=i386
@@ -12,14 +15,15 @@ export ARCH=i386
 #arm-apple-darwin, arch64-apple-darwin, i386-apple-darwin*, x86_64-apple-darwin*
 export BUILDCHAIN=i386-apple-darwin*
 
-#iphonesimulator or iphoneos
+#iphonesimulator or iphoneos  // SIMULATOR or OS
 export SDK=iphonesimulator
+export IOS_PLATFORM=SIMULATOR
 
 export SDKVERSION=$(xcrun --sdk $SDK --show-sdk-version) # current version
 export SDKROOT=$(xcrun --sdk $SDK --show-sdk-path) # current version
 
 #make subsurface set this to a saner value
-export PREFIX=$PWD/install-root
+export PREFIX=$TOP/install-root
 
 # Binaries
 export CC=$(xcrun --sdk $SDK --find gcc)
@@ -151,48 +155,65 @@ if [ ! -e $PKG_CONFIG_LIBDIR/libssl.pc ] ; then
 	popd
 fi
 
-# if [ ! -e libssh2-${LIBSSH2_VERSION}.tar.gz ] ; then
+if [ ! -e libssh2-${LIBSSH2_VERSION}.tar.gz ] ; then
-# 	wget http://www.libssh2.org/download/libssh2-${LIBSSH2_VERSION}.tar.gz
+	wget http://www.libssh2.org/download/libssh2-${LIBSSH2_VERSION}.tar.gz
-# fi
+fi
-# if [ ! -e libssh2-${LIBSSH2_VERSION} ] ; then
+if [ ! -e libssh2-${LIBSSH2_VERSION} ] ; then
-# 	tar -zxf libssh2-${LIBSSH2_VERSION}.tar.gz
+	tar -zxf libssh2-${LIBSSH2_VERSION}.tar.gz
-# fi
+fi
-# if [ ! -e $PKG_CONFIG_LIBDIR/libssh2.pc ] ; then
+if [ ! -e $PKG_CONFIG_LIBDIR/libssh2.pc ] ; then
-# 	mkdir -p libssh2-build-$ARCH
+	mkdir -p libssh2-build-$ARCH
-# 	pushd libssh2-build-$ARCH
+	pushd libssh2-build-$ARCH
-# 	../libssh2-${LIBSSH2_VERSION}/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared
+	../libssh2-${LIBSSH2_VERSION}/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared
-# 	make
+	make
-# 	make install
+	make install
-# 	# Patch away pkg-config dependency to zlib, its there, i promise
+	# Patch away pkg-config dependency to zlib, its there, i promise
-# 	perl -pi -e 's/^(Requires.private:.*),zlib$/$1 $2/' $PKG_CONFIG_LIBDIR/libssh2.pc
+	perl -pi -e 's/^(Requires.private:.*),zlib$/$1 $2/' $PKG_CONFIG_LIBDIR/libssh2.pc
-# 	popd
+	popd
-# fi
+fi
-#
+
-# if [ ! -e libgit2-${LIBGIT2_VERSION}.tar.gz ] ; then
+# ios cmake toolchain
-# 	wget -O libgit2-${LIBGIT2_VERSION}.tar.gz https://github.com/libgit2/libgit2/archive/v${LIBGIT2_VERSION}.tar.gz
+
-# fi
+if [ ! -e ios-cmake-master.tar.gz ] ; then
-# if [ ! -e libgit2-${LIBGIT2_VERSION} ] ; then
+	wget -O ios-cmake-master.tar.gz https://github.com/cristeab/ios-cmake/archive/master.tar.gz
-# 	tar -zxf libgit2-${LIBGIT2_VERSION}.tar.gz
+fi
-# fi
+if [ ! -e ios-cmake-master ] ; then
-# if [ ! -e $PKG_CONFIG_LIBDIR/libgit2.pc ] ; then
+	tar -zxf ios-cmake-master.tar.gz
-# 	mkdir -p libgit2-build-$ARCH
+fi
-# 	pushd libgit2-build-$ARCH
+
-# 	cmake -DCMAKE_SYSTEM_NAME=Android -DSHA1_TYPE=builtin \
+if [ ! -e libgit2-${LIBGIT2_VERSION}.tar.gz ] ; then
-# 		-DBUILD_CLAR=OFF -DBUILD_SHARED_LIBS=OFF \
+	wget -O libgit2-${LIBGIT2_VERSION}.tar.gz https://github.com/libgit2/libgit2/archive/v${LIBGIT2_VERSION}.tar.gz
-# 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
+fi
-# 		-DCURL=OFF \
+if [ ! -e libgit2-${LIBGIT2_VERSION} ] ; then
-# 		-DUSE_SSH=ON \
+	tar -zxf libgit2-${LIBGIT2_VERSION}.tar.gz
-# 		-DOPENSSL_SSL_LIBRARY=${PREFIX}/lib/libssl.a \
+fi
-# 		-DOPENSSL_CRYPTO_LIBRARY=${PREFIX}/lib/libcrypto.a \
+if [ ! -e $PKG_CONFIG_LIBDIR/libgit2.pc ] ; then
-# 		-DOPENSSL_INCLUDE_DIR=${PREFIX}/include/openssl \
+	mkdir -p libgit2-build-$ARCH
-# 		-D_OPENSSL_VERSION=1.0.1p \
+	pushd libgit2-build-$ARCH
-# 		../libgit2-${LIBGIT2_VERSION}/
+	PKGCONF=$(which pkg-config)
-# 	make
+	cmake -DCMAKE_TOOLCHAIN_FILE=${TOP}/ios-cmake-master/toolchain/iOS.cmake -DIOS_PLATFORM=${IOS_PLATFORM} \
-# 	make install
+		-DCMAKE_SIZEOF_VOID_P=4 \
-# 	# Patch away pkg-config dependency to zlib, its there, i promise
+		-DPKG_CONFIG_EXECUTABLE=${PKGCONF} \
-# 	perl -pi -e 's/^(Requires.private:.*)zlib(.*)$/$1 $2/' $PKG_CONFIG_LIBDIR/libgit2.pc
+		-DSHA1_TYPE=builtin \
-# 	popd
+		-DBUILD_CLAR=OFF -DBUILD_SHARED_LIBS=OFF \
-# fi
+		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
+		-DCMAKE_PREFIX_PATH=${PREFIX} \
+		-DCURL=OFF \
+		-DUSE_SSH=ON \
+		-DOPENSSL_SSL_LIBRARY=${PREFIX}/lib/libssl.a \
+		-DOPENSSL_CRYPTO_LIBRARY=${PREFIX}/lib/libcrypto.a \
+		-DOPENSSL_INCLUDE_DIR=${PREFIX}/include/openssl \
+		-D_OPENSSL_VERSION=1.0.1p \
+		../libgit2-${LIBGIT2_VERSION}/
+	make
+	make install
+	# Patch away pkg-config dependency to zlib, its there, i promise
+	perl -pi -e 's/^(Requires.private:.*)zlib(.*)$/$1 $2/' $PKG_CONFIG_LIBDIR/libgit2.pc
+	popd
+fi
+
+# let's skip libusb and libftdi for the moment...
+# not sure if / when we'll be able to use USB devices on iOS
 #
 # if [ ! -e libusb-${LIBUSB_VERSION}.tar.gz ] ; then
 # 	wget -O libusb-${LIBUSB_VERSION}.tar.gz https://github.com/libusb/libusb/archive/v${LIBUSB_VERSION}.tar.gz