Merge pull request #67 from dmsurti/remove-lfs

Yay, Travis wakes up from his slumber 👍

.gitattributes

@@ -1,3 +1,2 @@
 AssimpKit/assets/* linguist-vendored=true
 AssimpKit/Assimp/* linguist-vendored=true
-*.a filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -58,3 +58,9 @@ fastlane/screenshots
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
+
+# ignore assimp libs extracted
+libassimp-fat.a
+libIrrXML-fat.a
+libassimp.a
+libIrrXML.a

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode8.3
 
 env:
   global:
@@ -9,18 +9,28 @@ env:
 before_install:
     - env
     - locale
-    - brew update && brew install git-lfs
-    - git lfs install
+    - brew update
+    - brew install p7zip
     - xcpretty --version
     - xcodebuild -version
     - xcodebuild -showsdks
 
-before_script:
-    - git lfs pull
+install:
+    - echo Extracting iOS fat libs...
+    - 7z x ${TRAVIS_BUILD_DIR}/AssimpKit/Assimp/lib/ios/libassimp-fat.7z
+    - mv ${TRAVIS_BUILD_DIR}/libassimp-fat.a ${TRAVIS_BUILD_DIR}/AssimpKit/Assimp/lib/ios/
+    - 7z x ${TRAVIS_BUILD_DIR}/AssimpKit/Assimp/lib/ios/libIrrXML-fat.7z
+    - mv ${TRAVIS_BUILD_DIR}/libIrrXML-fat.a ${TRAVIS_BUILD_DIR}/AssimpKit/Assimp/lib/ios/
+
+    - echo Extracting macOS libs...
+    - 7z x ${TRAVIS_BUILD_DIR}/AssimpKit/Assimp/lib/osx/libassimp.7z
+    - mv ${TRAVIS_BUILD_DIR}/libassimp.a ${TRAVIS_BUILD_DIR}/AssimpKit/Assimp/lib/osx/
+    - 7z x ${TRAVIS_BUILD_DIR}/AssimpKit/Assimp/lib/osx/libIrrXML.7z
+    - mv ${TRAVIS_BUILD_DIR}/libIrrXML.a ${TRAVIS_BUILD_DIR}/AssimpKit/Assimp/lib/osx/
 
 script:
-#  - echo : Test the AssimpSceneKit static library for macOS
-#  - xcodebuild -project AssimpKit/Library/Library.xcodeproj -scheme AssimpKitTests_macOS -destination 'platform=OS X,arch=x86_64' GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test
+  - echo Test the AssimpSceneKit static library for macOS
+  - xcodebuild -project AssimpKit/Library/Library.xcodeproj -scheme AssimpKitTests_macOS -destination 'platform=OS X,arch=x86_64' GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test
 
   - echo Test the AssimpSceneKit static library for iOS
   - xcodebuild -project AssimpKit/Library/Library.xcodeproj -scheme AssimpKitTests_iOS -destination 'platform=iOS Simulator,OS=10.0,name=iPhone 6' clean test

AssimpKit/Library/Library.xcodeproj/xcshareddata/xcschemes/AssimpKit-iOS.xcscheme

@@ -1,10 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0810"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "#!/bin/sh&#10;echo Extracting iOS fat lib...&#10;cd $PROJECT_DIR&#10;rm $PROJECT_DIR/../Assimp/lib/ios/libassimp-fat.a&#10;7z x $PROJECT_DIR/../Assimp/lib/ios/libassimp-fat.7z&#10;mv $PROJECT_DIR/libassimp-fat.a $PROJECT_DIR/../Assimp/lib/ios/">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "779DF1D21DDF29F200DED366"
+                     BuildableName = "AssimpKit.framework"
+                     BlueprintName = "AssimpKit-iOS"
+                     ReferencedContainer = "container:Library.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "#!/bin/sh&#10;echo Extracting iOS fat lib...&#10;cd $PROJECT_DIR&#10;rm $PROJECT_DIR/../Assimp/lib/ios/libIrrXML-fat.a&#10;7z x $PROJECT_DIR/../Assimp/lib/ios/libIrrXML-fat.7z&#10;mv $PROJECT_DIR/libIrrXML-fat.a $PROJECT_DIR/../Assimp/lib/ios/">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "779DF1D21DDF29F200DED366"
+                     BuildableName = "AssimpKit.framework"
+                     BlueprintName = "AssimpKit-iOS"
+                     ReferencedContainer = "container:Library.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

AssimpKit/Library/Library.xcodeproj/xcshareddata/xcschemes/AssimpKit-macOS.xcscheme

@@ -1,10 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0810"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "#!/bin/sh&#10;echo Extracting macOS fat lib...&#10;cd $PROJECT_DIR&#10;rm $PROJECT_DIR/../Assimp/lib/osx/libassimp.a&#10;7z x $PROJECT_DIR/../Assimp/lib/osx/libassimp.7z&#10;mv $PROJECT_DIR/libassimp.a $PROJECT_DIR/../Assimp/lib/osx/">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "779DF1FA1DDF2B8700DED366"
+                     BuildableName = "AssimpKit.framework"
+                     BlueprintName = "AssimpKit-macOS"
+                     ReferencedContainer = "container:Library.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "#!/bin/sh&#10;echo Extracting macOS fat lib...&#10;cd $PROJECT_DIR&#10;rm $PROJECT_DIR/../Assimp/lib/osx/libIrrXML.a&#10;7z x $PROJECT_DIR/../Assimp/lib/osx/libIrrXML.7z&#10;mv $PROJECT_DIR/libIrrXML.a $PROJECT_DIR/../Assimp/lib/osx/">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "779DF1FA1DDF2B8700DED366"
+                     BuildableName = "AssimpKit.framework"
+                     BlueprintName = "AssimpKit-macOS"
+                     ReferencedContainer = "container:Library.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

README.md

@@ -73,12 +73,6 @@ Important Build Setting for `iOS` applications only
 
 If you are developing an `iOS` application, set the `Enable Bitcode` under `Build Settings->Build Options` of your target to `NO`.
 
-Git LFS
----
-
-If you fork or clone this project, ensure you have `git lfs` installed as it 
-is used for the dependent static libs.
-
 Getting Started with AssimpKit
 ---