setup conan build

TomTasche · TomTasche · commit e58c4e3c514e · 2021-12-29T20:03:31.000+01:00
diff --git a/.github/workflows/ios_main.yml b/.github/workflows/ios_main.yml
@@ -26,6 +26,8 @@ jobs:
         run: gem install bundler:1.17.3
       - name: fastlane
         run: bundle install
+      - name: conan
+        run: python3 -m ensurepip && pip install conan
 
       - name: run tests
         run: bundle exec fastlane tests
diff --git a/.gitignore b/.gitignore
@@ -70,3 +70,8 @@ fastlane/test_output
 .DS_Store
 
 fastlane/report.xml
+
+conanbuildinfo.*
+conaninfo.txt
+conan.lock
+graph_info.json
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "OpenDocument.core"]
-	path = OpenDocument.core
-	url = https://github.com/andiwand/OpenDocument.core.git
 [submodule "ios-cmake"]
 	path = ios-cmake
 	url = https://github.com/leetal/ios-cmake.git
diff --git a/OpenDocument.core b/OpenDocument.core
diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj
diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 It's Android's first OpenOffice Document Reader... for iOS!
 
 ## Setup
-1. run "git submodule update --init --recursive"
-2. run "pod install"
-3. run "bash build-simulator.sh" or "bash build-device.sh"
-4. open workspace in Xcode
+1. run "pod install"
+2. run "bash build-simulator.sh" or "bash build-device.sh"
+3. open workspace in Xcode
diff --git a/build-device.sh b/build-device.sh
@@ -4,9 +4,4 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd $DIR
 
-rm -rf build
-
-mkdir build/
-cd build/
-cmake -G "Xcode" -DCMAKE_TOOLCHAIN_FILE=../ios-cmake/ios.toolchain.cmake -DIOS_DEPLOYMENT_TARGET=14.0 -DPLATFORM=OS64COMBINED ../
-cd ../
+conan install . --profile ios --build missing
diff --git a/build-simulator.sh b/build-simulator.sh
@@ -4,9 +4,4 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd $DIR
 
-rm -rf build
-
-mkdir build/
-cd build/
-cmake -G "Xcode" -DGIT_EXECUTABLE=/usr/bin/git -DCMAKE_TOOLCHAIN_FILE=../ios-cmake/ios.toolchain.cmake -DIOS_DEPLOYMENT_TARGET=14.0 -DPLATFORM=OS64COMBINED ../ -DDISABLE_ASM=ON
-cd ../
+conan install . --profile ios-simulator --build missing
diff --git a/conanfile.txt b/conanfile.txt
@@ -0,0 +1,6 @@
+[requires]
+odr.core/1.0.0@
+
+[generators]
+xcode
+
diff --git a/debug-lite.xcconfig b/debug-lite.xcconfig
@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug lite.xcconfig"
+#include "conanbuildinfo.xcconfig"
diff --git a/debug.xcconfig b/debug.xcconfig
@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug.xcconfig"
+#include "conanbuildinfo.xcconfig"
diff --git a/ios b/ios
@@ -0,0 +1,10 @@
+include(default)
+
+[settings]
+os=iOS
+os.version=14.0
+arch=armv8
+build_type=Release
+
+[build_requires]
+darwin-toolchain/1.0.8@theodelrieu/testing
diff --git a/ios-simulator b/ios-simulator
@@ -0,0 +1,10 @@
+include(default)
+
+[settings]
+os=iOS
+os.version=14.0
+arch=x86_64
+build_type=Release
+
+[build_requires]
+darwin-toolchain/1.0.8@theodelrieu/testing
diff --git a/release-lite.xcconfig b/release-lite.xcconfig
@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release lite.xcconfig"
+#include "conanbuildinfo.xcconfig"
diff --git a/release.xcconfig b/release.xcconfig
@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release.xcconfig"
+#include "conanbuildinfo.xcconfig"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#include "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug lite.xcconfig"`
	`2`	`+#include "conanbuildinfo.xcconfig"`