打包脚本优化

Author: karisli

Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
-  - QCloudCore (5.8.6):
-    - QCloudCore/Default (= 5.8.6)
-  - QCloudCore/Default (5.8.6)
-  - QCloudCOSXML (5.8.6):
-    - QCloudCOSXML/Default (= 5.8.6)
-  - QCloudCOSXML/Default (5.8.6):
-    - QCloudCore (= 5.8.6)
+  - QCloudCore (5.9.2):
+    - QCloudCore/Default (= 5.9.2)
+  - QCloudCore/Default (5.9.2)
+  - QCloudCOSXML (5.9.2):
+    - QCloudCOSXML/Default (= 5.9.2)
+  - QCloudCOSXML/Default (5.9.2):
+    - QCloudCore (= 5.9.2)
 
 DEPENDENCIES:
   - QCloudCore (from `.`)
@@ -18,8 +18,8 @@ EXTERNAL SOURCES:
     :path: "."
 
 SPEC CHECKSUMS:
-  QCloudCore: bb327d2ad5f2d6b47e35ca73e50206557efd5a60
-  QCloudCOSXML: 4294d95d48f90ca45999b71e2a71a7a63ebcf803
+  QCloudCore: 33df4009082e850b680f3fac7870d95c3a2cc93e
+  QCloudCOSXML: e42da05e524767ceb65db5ca87e291af1813e2a8
 
 PODFILE CHECKSUM: 384b99448c6c2fa2f931b43a3eacbd13f1ec5751
 

QCloudCOSXMLDemo.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 		7F069E0A21DDF7BD005F1AFA /* QCloudSTSPolicyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F069E0921DDF7BC005F1AFA /* QCloudSTSPolicyTests.m */; };
 		7F26A8E7213557200078097B /* QCloudCOSCSPTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F26A8E6213557200078097B /* QCloudCOSCSPTest.m */; };
 		7F2923D52338ADB8008CE707 /* key.json in Resources */ = {isa = PBXBuildFile; fileRef = 7F2923D42338ADB8008CE707 /* key.json */; };
+		7F2AFADD2689D05B006F2A46 /* QCloudTestUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F2AFADC2689D05B006F2A46 /* QCloudTestUtility.m */; };
 		7F41127E2338A97100A3276E /* SecretStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F41127B2338A92200A3276E /* SecretStorage.m */; };
 		7F43AE97213932EA0025DD1B /* QCloudCSPCOSXMLTestUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F43AE96213932EA0025DD1B /* QCloudCSPCOSXMLTestUtility.m */; };
 		A7C6A89E254A6FCB002BF20E /* key.json in Resources */ = {isa = PBXBuildFile; fileRef = 7F2923D42338ADB8008CE707 /* key.json */; platformFilter = ios; };
@@ -95,6 +96,8 @@
 		7F0A723C2488EBDF0063FE1E /* TestCommonDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestCommonDefine.h; sourceTree = "<group>"; };
 		7F26A8E6213557200078097B /* QCloudCOSCSPTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QCloudCOSCSPTest.m; sourceTree = "<group>"; };
 		7F2923D42338ADB8008CE707 /* key.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = key.json; sourceTree = "<group>"; };
+		7F2AFADB2689D05B006F2A46 /* QCloudTestUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QCloudTestUtility.h; sourceTree = "<group>"; };
+		7F2AFADC2689D05B006F2A46 /* QCloudTestUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QCloudTestUtility.m; sourceTree = "<group>"; };
 		7F41127B2338A92200A3276E /* SecretStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecretStorage.m; sourceTree = "<group>"; };
 		7F41127C2338A92200A3276E /* SecretStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecretStorage.h; sourceTree = "<group>"; };
 		7F43AE95213932EA0025DD1B /* QCloudCSPCOSXMLTestUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QCloudCSPCOSXMLTestUtility.h; sourceTree = "<group>"; };
@@ -200,6 +203,7 @@
 		1AB143EE1E601E0500830F93 /* QCloudCOSXMLDemo */ = {
 			isa = PBXGroup;
 			children = (
+				7F2AFADA2689D05B006F2A46 /* TestUtility */,
 				D2B7008B247227A000F59994 /* Categroy */,
 				D22FB26F246E8D9600C04C54 /* BucketDetail */,
 				D22FB269246E304700C04C54 /* MyBucket */,
@@ -295,6 +299,15 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
+		7F2AFADA2689D05B006F2A46 /* TestUtility */ = {
+			isa = PBXGroup;
+			children = (
+				7F2AFADB2689D05B006F2A46 /* QCloudTestUtility.h */,
+				7F2AFADC2689D05B006F2A46 /* QCloudTestUtility.m */,
+			);
+			path = TestUtility;
+			sourceTree = "<group>";
+		};
 		A808A8971F25CD5100116AAC /* Download */ = {
 			isa = PBXGroup;
 			children = (
@@ -511,6 +524,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A89945D22091D21300FEFF28 /* QCloudTaskImformation.m in Sources */,
+				7F2AFADD2689D05B006F2A46 /* QCloudTestUtility.m in Sources */,
 				A89945CF2091CF6A00FEFF28 /* QCloudDownloadFinishViewController.m in Sources */,
 				A801AD42201990DC004D1B9A /* QCloudTestTempVariables.m in Sources */,
 				D22FB26C246E3FBF00C04C54 /* QCCouldMyBucketCell.m in Sources */,

QCloudCOSXMLDemo/SecretStorage.h

@@ -7,14 +7,17 @@
 //
 
 #import <Foundation/Foundation.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface SecretStorage : NSObject
 + (instancetype)sharedInstance;
-@property (nonatomic, copy) NSString* appID;
-@property (nonatomic, copy) NSString* secretID;
-@property (nonatomic, copy) NSString* secretKey;
 
+@property (nonatomic, copy) NSString *appID;
+@property (nonatomic, copy) NSString *secretID;
+@property (nonatomic, copy) NSString *secretKey;
+@property (nonatomic, copy) NSString *uin;
+@property (nonatomic, copy) NSString *region;
 @end
 
 NS_ASSUME_NONNULL_END

QCloudCOSXMLDemo/SecretStorage.m

@@ -7,36 +7,27 @@
 //
 
 #import "SecretStorage.h"
+
 @implementation SecretStorage
-+(instancetype)sharedInstance {
-    static SecretStorage* instance;
++ (instancetype)sharedInstance {
+    static SecretStorage *instance;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         instance = [[SecretStorage alloc] init];
     });
-    return  instance;
+    return instance;
 }
--(instancetype) init {
+
+- (instancetype)init {
     self = [super init];
-    NSString* path = [[NSBundle mainBundle] pathForResource:@"key" ofType:@"json"];
-    NSData* jsonData = [[NSData alloc] initWithContentsOfFile:path];
-    NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:jsonData options:kNilOptions error:nil];
-    
+    NSString *path = [[NSBundle mainBundle] pathForResource:@"key" ofType:@"json"];
+    NSData *jsonData = [[NSData alloc] initWithContentsOfFile:path];
+    NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:jsonData options:kNilOptions error:nil];
     self.secretID = dict[@"secretID"];
-    if (!self.secretID) {
-        self.secretID = [NSString stringWithUTF8String:getenv("COS_SECRET_ID")];
-    }
-    
     self.secretKey = dict[@"secretKey"];
-    if (!self.secretKey) {
-        self.secretKey = [NSString stringWithUTF8String:getenv("COS_SECRET_KEY") ];
-    }
-    
     self.appID = dict[@"appId"];
-    if (!self.appID) {
-        self.appID = [NSString stringWithUTF8String:getenv("COS_APP_ID") ];
-    }
-    
-    return  self;
+    self.uin = dict[@"uin"];
+    self.region = dict[@"region"];
+    return self;
 }
 @end

package.sh

@@ -1,4 +1,5 @@
 echo "开始运行打包脚本，该打包脚本依赖cocoapods，请确保打包机器安装了cocoapods"
+rm -rf build
 mkdir build
 cd build
 echo "开始打包QCloudCore..."
@@ -7,6 +8,10 @@ echo "QCloudCore打包完成"
 echo "开始打包QCloudCOSXML..."
 pod package ../QCloudCOSXML.podspec --no-mangle --exclude-deps --force
 echo "QCloudCOSXML打包完成"
-mkdir temp
-mv QCloud*/ios/*.framework ./temp
+mkdir result
+cd result
+mkdir ios
+mv ../QCloud*/ios/*.framework ./ios
 
+mkdir osx
+mv ../QCloud*/osx/*.framework ./osx