Skip to content

Commit

Permalink
Merge pull request #75 from dmsurti/fix-7z
Browse files Browse the repository at this point in the history
Merge, not waiting for tortoise Travis
  • Loading branch information
dmsurti committed Sep 19, 2017
2 parents 2448eeb + e429f02 commit 8d5997c
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
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/">
scriptText = "#!/bin/sh&#10;echo Extracting iOS fat lib...&#10;if ! [ -x &quot;$(command -v 7z)&quot; ]; then&#10; echo &apos;error: 7z is not installed.&apos; &gt;&amp;2&#10; echo &apos;fix: Install 7z with brew ...&apos; &gt;&amp;2&#10; echo &apos;fix: Please run: brew install p7zip&apos; &gt;&amp;2&#10; exit 1&#10;fi&#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"
Expand All @@ -26,7 +26,7 @@
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/">
scriptText = "#!/bin/sh&#10;echo Extracting iOS fat lib...&#10;if ! [ -x &quot;$(command -v 7z)&quot; ]; then&#10; echo &apos;error: 7z is not installed.&apos; &gt;&amp;2&#10; echo &apos;fix: Install 7z with brew ...&apos; &gt;&amp;2&#10; echo &apos;fix: Please run: brew install p7zip&apos; &gt;&amp;2&#10; exit 1&#10;fi&#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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
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/">
scriptText = "#!/bin/sh&#10;echo Extracting macOS fat lib...&#10;if ! [ -x &quot;$(command -v 7z)&quot; ]; then&#10; echo &apos;error: 7z is not installed.&apos; &gt;&amp;2&#10; echo &apos;fix: Install 7z with brew ...&apos; &gt;&amp;2&#10; echo &apos;fix: Please run: brew install p7zip&apos; &gt;&amp;2&#10; exit 1&#10;fi&#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"
Expand All @@ -26,7 +26,7 @@
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/">
scriptText = "#!/bin/sh&#10;echo Extracting macOS fat lib...&#10;if ! [ -x &quot;$(command -v 7z)&quot; ]; then&#10; echo &apos;error: 7z is not installed.&apos; &gt;&amp;2&#10; echo &apos;fix: Install 7z with brew ...&apos; &gt;&amp;2&#10; echo &apos;fix: Please run: brew install p7zip&apos; &gt;&amp;2&#10; exit 1&#10;fi&#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"
Expand Down
27 changes: 26 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,34 @@ Requirements
- ObjC 2.0
- iOS 10.0 or later
- macOS 10.11 or later
- 7z

Installation with Carthage (iOS 10.0+, macOS 10.11+)
---

---
1. PreRequiste: Install 7z
---

The build process depends on 7z to extract static library archives. Please ensure 7z is installed.

You can check if 7z is installed with:

```
type 7z
```
command on the Terminal.

To install, you can use brew as such:

```
brew update && brew install p7zip
```

---
2. Using Carthage
---

[Carthage](https://github.com/Carthage/Carthage) is a lightweight dependency
manager for Swift and Objective-C. It leverages CocoaTouch modules and is less
invasive than CocoaPods.
Expand All @@ -68,7 +92,8 @@ After `carthage update`, add the appropriate platform framework (iOS, macOS) to
your project. The frameworks are placed in `iOS` and `Mac` subdirectories under
the `Carthage/Build` directory of your project.

Important Build Setting for `iOS` applications only
---
3. 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`.
Expand Down
23 changes: 23 additions & 0 deletions docs/user/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,32 @@ Requirements

.. _installation-label:



Installation
============

PreRequiste: Install 7z
-----------------------

The build process depends on 7z to extract static library archives. Please ensure 7z is installed.

You can check if 7z is installed with:

```
type 7z
```
command on the Terminal.

To install, you can use brew as such:

```
brew update && brew install p7zip
```

Using Carthage
--------------

AssimpKit is `Carthage`_ compatible.

To install with Carthage, follow the instructions on Carthage.
Expand Down

0 comments on commit 8d5997c

Please sign in to comment.