removed binary; various small changes
This commit is contained in:
Martin Böttcher
parent
66a60da3b5
commit
d2ac245cfb
34
Makefile
34
Makefile
@ -1,8 +1,26 @@
|
||||
update_metadata:
|
||||
(cd libPhoneNumberTests && ./metadataGenerator) && \
|
||||
(cd libPhoneNumber && ./GeneratePhoneNumberHeader.sh) && \
|
||||
(cp libPhoneNumber/NBGeneratedPhoneNumberMetaData.h MetaDataPlistCreator) && \
|
||||
(cd MetaDataPlistCreator && MetaDataPlistCreator) && \
|
||||
(cp MetaDataPlistCreator/phoneNumberMap.plist libPhoneNumber) &&\
|
||||
(rm MetaDataPlistCreator/phoneNumberMap.plist) &&\
|
||||
(rm libPhoneNumber/NBGeneratedPhoneNumberMetaData.h)
|
||||
update_metadata: MetaDataPlistCreator/createPlistFromHeader
|
||||
@echo "creating plist file..."
|
||||
mv libPhoneNumber/NBGeneratedPhoneNumberMetaData.h MetaDataPlistCreator
|
||||
(cd MetaDataPlistCreator && createPlistFromHeader)
|
||||
mv MetaDataPlistCreator/phoneNumberMap.plist libPhoneNumber
|
||||
rm MetaDataPlistCreator/NBGeneratedPhoneNumberMetaData.h
|
||||
|
||||
MetaDataPlistCreator/createPlistFromHeader: libPhoneNumber/NBGeneratedPhoneNumberMetaData.h
|
||||
@echo "creating binary..."
|
||||
cp libPhoneNumber/NBGeneratedPhoneNumberMetaData.h MetaDataPlistCreator
|
||||
xcodebuild -target MetaDataPlistCreator
|
||||
mv build/Release/createPlistFromHeader MetaDataPlistCreator
|
||||
|
||||
libPhoneNumber/NBGeneratedPhoneNumberMetaData.h:
|
||||
@echo "creating temporary header file..."
|
||||
cd libPhoneNumberTests && ./metadataGenerator
|
||||
cd libPhoneNumber && ./GeneratePhoneNumberHeader.sh
|
||||
|
||||
clean:
|
||||
@echo "deleting all temporary files..."
|
||||
rm -f libPhoneNumber/NBGeneratedPhoneNumberMetaData.h
|
||||
rm -f libPhoneNumber/phoneNumberMap.plist
|
||||
rm -f MetaDataPlistCreator/NBGeneratedPhoneNumberMetaData.h
|
||||
rm -f MetaDataPlistCreator/phoneNumberMap.plist
|
||||
rm -f MetaDataPlistCreator/createPlistFromHeader
|
||||
rm -rf build
|
||||
|
||||
Binary file not shown.
@ -15,20 +15,6 @@
|
||||
|
||||
+ (BOOL) createPlistFile:(NSString*) path;
|
||||
|
||||
+ (NSDictionary *)jsonObjectFromZippedDataWithBytes:(z_const Bytef [])bytes
|
||||
compressedLength:(NSUInteger)compressedLength
|
||||
expandedLength:(NSUInteger)expandedLength;
|
||||
|
||||
+ (NSDictionary<NSObject *, NSObject *> *)deduplicateJsonMap:(NSDictionary<NSObject *, NSObject *> *)inputMap;
|
||||
|
||||
+ (NSObject *)deduplicateJsonValue:(NSObject *)jsonValue valueSet:(NSMutableSet<NSObject *> *)valueSet;
|
||||
|
||||
+ (NSArray<NSObject *> *)deduplicateJsonArray:(NSArray<NSObject *> *)jsonArray
|
||||
valueSet:(NSMutableSet<NSObject *> *)valueSet;
|
||||
|
||||
+ (NSDictionary<NSObject *, NSObject *> *)deduplicateJsonDictionary:(NSDictionary<NSObject *, NSObject *> *)jsonDictionary
|
||||
valueSet:(NSMutableSet<NSObject *> *)valueSet;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* MetaDataPlistCreator_h */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -18,5 +18,6 @@ DESC
|
||||
s.watchos.deployment_target = "2.0"
|
||||
s.tvos.deployment_target = "9.0"
|
||||
s.requires_arc = true
|
||||
s.source_files = 'libPhoneNumber/phoneNumberMap.plist', 'libPhoneNumber/NBPhoneNumberDefines.{h,m}', 'libPhoneNumber/NBPhoneNumber.{h,m}', 'libPhoneNumber/NBNumberFormat.{h,m}', 'libPhoneNumber/NBPhoneNumberDesc.{h,m}', 'libPhoneNumber/NBPhoneMetaData.{h,m}', 'libPhoneNumber/NBPhoneNumberUtil.{h,m}', 'libPhoneNumber/NBMetadataHelper.{h,m}', 'libPhoneNumber/NBAsYouTypeFormatter.{h,m}', 'libPhoneNumber/NSArray+NBAdditions.{h,m}', 'libPhoneNumber/Internal/NBRegExMatcher.{h,m}', 'libPhoneNumber/Internal/NBRegularExpressionCache.{h,m}'
|
||||
s.resources = 'libPhoneNumber/phoneNumberMap.plist'
|
||||
s.source_files = 'libPhoneNumber/NBPhoneNumberDefines.{h,m}', 'libPhoneNumber/NBPhoneNumber.{h,m}', 'libPhoneNumber/NBNumberFormat.{h,m}', 'libPhoneNumber/NBPhoneNumberDesc.{h,m}', 'libPhoneNumber/NBPhoneMetaData.{h,m}', 'libPhoneNumber/NBPhoneNumberUtil.{h,m}', 'libPhoneNumber/NBMetadataHelper.{h,m}', 'libPhoneNumber/NBAsYouTypeFormatter.{h,m}', 'libPhoneNumber/NSArray+NBAdditions.{h,m}', 'libPhoneNumber/Internal/NBRegExMatcher.{h,m}', 'libPhoneNumber/Internal/NBRegularExpressionCache.{h,m}'
|
||||
end
|
||||
|
||||
@ -176,7 +176,7 @@
|
||||
1485C5251E06F4890092F541 /* NBPhoneNumberUtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NBPhoneNumberUtilTest.m; path = libPhoneNumberTests/NBPhoneNumberUtilTest.m; sourceTree = SOURCE_ROOT; };
|
||||
1485C52B1E06F4930092F541 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = libPhoneNumberTests/Info.plist; sourceTree = SOURCE_ROOT; };
|
||||
14B7A2931DE9B65D0051AED7 /* libPhoneNumberiOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = libPhoneNumberiOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
14E06D4E27B3DAFA007754F4 /* MetaDataPlistCreator */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MetaDataPlistCreator; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
14E06D4E27B3DAFA007754F4 /* createPlistFromHeader */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = createPlistFromHeader; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
14E06D5027B3DAFA007754F4 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
|
||||
14E06D5527B3DDDB007754F4 /* MetaDataPlistCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MetaDataPlistCreator.h; sourceTree = "<group>"; };
|
||||
14E06D5627B3DDF0007754F4 /* MetaDataPlistCreator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MetaDataPlistCreator.m; sourceTree = "<group>"; };
|
||||
@ -462,7 +462,7 @@
|
||||
14B7A2931DE9B65D0051AED7 /* libPhoneNumberiOSTests.xctest */,
|
||||
7C72507C1E0EBE7D00F916ED /* libPhoneNumbermacOS.framework */,
|
||||
8B1FEF731EB7BE7C00FBDE87 /* SwiftDemo.app */,
|
||||
14E06D4E27B3DAFA007754F4 /* MetaDataPlistCreator */,
|
||||
14E06D4E27B3DAFA007754F4 /* createPlistFromHeader */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
@ -628,7 +628,7 @@
|
||||
);
|
||||
name = MetaDataPlistCreator;
|
||||
productName = MetaDataPlistCreator;
|
||||
productReference = 14E06D4E27B3DAFA007754F4 /* MetaDataPlistCreator */;
|
||||
productReference = 14E06D4E27B3DAFA007754F4 /* createPlistFromHeader */;
|
||||
productType = "com.apple.product-type.tool";
|
||||
};
|
||||
1F31D5291DDD46B100257818 /* libPhoneNumberwatchOS */ = {
|
||||
@ -1064,11 +1064,12 @@
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = YES;
|
||||
INSTALL_PATH = .;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
MTL_FAST_MATH = YES;
|
||||
ONLY_ACTIVE_ARCH = NO;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PRODUCT_NAME = createPlistFromHeader;
|
||||
SDKROOT = macosx;
|
||||
STRINGS_FILE_OUTPUT_ENCODING = "UTF-8";
|
||||
TARGETED_DEVICE_FAMILY = "";
|
||||
@ -1099,10 +1100,11 @@
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = YES;
|
||||
INSTALL_PATH = .;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
MTL_FAST_MATH = YES;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PRODUCT_NAME = createPlistFromHeader;
|
||||
SDKROOT = macosx;
|
||||
STRINGS_FILE_OUTPUT_ENCODING = "UTF-8";
|
||||
TARGETED_DEVICE_FAMILY = "";
|
||||
|
||||
@ -73,6 +73,7 @@ static NSString *StringByTrimming(NSString *aString) {
|
||||
NSSet *allowedClasses = [NSSet setWithArray:@[NSArray.class, NSDictionary.class, NSNull.class, NSString.class, NSNumber.class]];
|
||||
result = (NSDictionary *)[unarchiver decodeObjectOfClasses:allowedClasses forKey:NSKeyedArchiveRootObjectKey];
|
||||
}
|
||||
NSAssert(result != nil, @"phoneNumberMap.plist missing or corrupt");
|
||||
}
|
||||
});
|
||||
return result;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user