updated build script to copy the framework to the project root folder

agoncalvesos · Jul 17, 2019 · 00364b3 · 00364b3
1 parent edaff99
commit 00364b3
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 2 deletions.
diff --git a/...SPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/...SPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
diff --git a/...PhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/...PhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/ColorCollectionViewCell.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/ColorCollectionViewCell.nib
diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/EmojiCollectionViewCell.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/EmojiCollectionViewCell.nib
diff --git a/...otoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/...otoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
diff --git a/...toEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/...toEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
diff --git a/...s/OSPhotoEditor/OSPhotoEditor.framework/Modules/OSPhotoEditor.swiftmodule/arm.swiftmodule b/...s/OSPhotoEditor/OSPhotoEditor.framework/Modules/OSPhotoEditor.swiftmodule/arm.swiftmodule
diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/OSPhotoEditor b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/OSPhotoEditor
diff --git a/...ibs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/objects-11.0+.nib b/...ibs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/objects-11.0+.nib
diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/runtime.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/runtime.nib
diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickerCollectionViewCell.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickerCollectionViewCell.nib
diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickersViewController.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickersViewController.nib
diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.pbxproj b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.pbxproj
@@ -299,7 +299,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# 1\n# Set bash script to exit immediately if any commands fail.\nset -e\n# 2\n# Setup some constants for use later on.\nFRAMEWORK_NAME=\"OSPhotoEditor\"\nOUTPUT_DIR=\"${SRCROOT}/build\"\n# 3\n# If remnants from a previous build exist, delete them.\nif [ -d \"${OUTPUT_DIR}\" ]; then\nrm -rf \"${OUTPUT_DIR}\"\nfi\n# 4\n# Build the framework for device and for simulator (using\n# all needed architectures).\n\nxcodebuild -project \"${FRAMEWORK_NAME}.xcodeproj\" -scheme \"${FRAMEWORK_NAME}\" -configuration Release -arch arm64 -arch armv7 -arch armv7s only_active_arch=no defines_module=yes -sdk \"iphoneos\" -derivedDataPath \"${OUTPUT_DIR}\"\nxcodebuild -project \"${FRAMEWORK_NAME}.xcodeproj\" -scheme \"${FRAMEWORK_NAME}\" -configuration Release -arch x86_64 -arch i386 only_active_arch=no defines_module=yes -sdk \"iphonesimulator\" -derivedDataPath \"${OUTPUT_DIR}\"\n\n# 5\n# Remove .framework file if exists from previous run.\nif [ -d \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\" ]; then\nrm -rf \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\"\nfi\n# 6\n# Copy the device version of framework.\ncp -r \"${OUTPUT_DIR}/Build/Products/Release-iphoneos/${FRAMEWORK_NAME}.framework\" \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\"\n# 7\n# Replace the framework executable within the framework with\n# a new version created by merging the device and simulator\n# frameworks' executables with lipo.\nlipo -create -output \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${OUTPUT_DIR}/Build/Products/Release-iphoneos/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${OUTPUT_DIR}/Build/Products/Release-iphonesimulator/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\"\n# 8\n# Copy the Swift module mappings for the simulator into the\n# framework. The device mappings already exist from step 6.\ncp -r \"${OUTPUT_DIR}/Build/Products/Release-iphonesimulator/${FRAMEWORK_NAME}.framework/Modules/${FRAMEWORK_NAME}.swiftmodule/\" \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework/Modules/${FRAMEWORK_NAME}.swiftmodule\"\n";
+			shellScript = "# 1\n# Set bash script to exit immediately if any commands fail.\nset -e\n# 2\n# Setup some constants for use later on.\nFRAMEWORK_NAME=\"OSPhotoEditor\"\nOUTPUT_DIR=\"${SRCROOT}/build\"\n# 3\n# If remnants from a previous build exist, delete them.\nif [ -d \"${OUTPUT_DIR}\" ]; then\nrm -rf \"${OUTPUT_DIR}\"\nfi\n# 4\n# Build the framework for device and for simulator (using\n# all needed architectures).\n\nxcodebuild -project \"${FRAMEWORK_NAME}.xcodeproj\" -scheme \"${FRAMEWORK_NAME}\" -configuration Release -arch arm64 -arch armv7 -arch armv7s only_active_arch=no defines_module=yes -sdk \"iphoneos\" -derivedDataPath \"${OUTPUT_DIR}\"\nxcodebuild -project \"${FRAMEWORK_NAME}.xcodeproj\" -scheme \"${FRAMEWORK_NAME}\" -configuration Release -arch x86_64 -arch i386 only_active_arch=no defines_module=yes -sdk \"iphonesimulator\" -derivedDataPath \"${OUTPUT_DIR}\"\n\n# 5\n# Remove .framework file if exists from previous run.\nif [ -d \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\" ]; then\nrm -rf \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\"\nfi\n# 6\n# Copy the device version of framework.\ncp -r \"${OUTPUT_DIR}/Build/Products/Release-iphoneos/${FRAMEWORK_NAME}.framework\" \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\"\n# 7\n# Replace the framework executable within the framework with\n# a new version created by merging the device and simulator\n# frameworks' executables with lipo.\nlipo -create -output \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${OUTPUT_DIR}/Build/Products/Release-iphoneos/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${OUTPUT_DIR}/Build/Products/Release-iphonesimulator/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\"\n# 8\n# Copy the Swift module mappings for the simulator into the\n# framework. The device mappings already exist from step 6.\ncp -r \"${OUTPUT_DIR}/Build/Products/Release-iphonesimulator/${FRAMEWORK_NAME}.framework/Modules/${FRAMEWORK_NAME}.swiftmodule/\" \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework/Modules/${FRAMEWORK_NAME}.swiftmodule\"\n\n# 9 delete the old framework\nif [ -d \"${FRAMEWORK_NAME}.framework\" ]; then\nrm -rf \"${FRAMEWORK_NAME}.framework\"\nfi\n# 10\n# Copy the universal framework to the project root folder\ncp -r \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\" \".\"\n\n# 11 delete the build folder as we only need the .framework \nif [ -d \"${OUTPUT_DIR}\" ]; then\nrm -rf \"${OUTPUT_DIR}\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/...codeproj/project.xcworkspace/xcuserdata/veyron.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/veyron.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor/PhotoEditor+Controls.swift b/src/ios/libs/OSPhotoEditor/OSPhotoEditor/PhotoEditor+Controls.swift
@@ -135,5 +135,4 @@ extension PhotoEditorViewController {
             }
         }
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,5 +135,4 @@ extension PhotoEditorViewController { @@
                 }
             }
         }
     }