if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2026-08-04 02:13:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: SDA-1531: add support for uppercase URLs in mac installer (#788)

Browse Source 
* SDA-1531: add support for uppercase URLs in mac installer

* SDA-1531: updated xcode team id
This commit is contained in:
Vishwas Shashidhar
2019-10-09 11:38:20 +05:30
committed by GitHub
parent 6a628f5251
commit 1e8afb17ab
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
installer/mac/SymphonySettingsPlugin.bundle/Contents/Info.plist
+8 -6
View File
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>18D109</string>
<string>19A583</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
@@ -27,19 +27,21 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>10B61</string>
<string>11A420a</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>18B71</string>
<string>19A547</string>
<key>DTSDKName</key>
<string>macosx10.14</string>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1010</string>
<string>1100</string>
<key>DTXcodeBuild</key>
<string>10B61</string>
<string>11A420a</string>
<key>InstallerSectionTitle</key>
<string>Pod Settings</string>
<key>LSMinimumSystemVersion</key>
<string>10.10</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Symphony. All rights reserved.</string>
<key>NSMainNibFile</key>
installer/mac/SymphonySettingsPlugin.bundle/Contents/MacOS/SymphonySettingsPlugin
BIN
View File
Binary file not shown.
installer/mac/SymphonySettingsPlugin.bundle/Contents/Resources/Base.lproj/MyInstallerPane.nib
Generated
BIN
View File
Binary file not shown.
installer/mac/SymphonySettingsPlugin.bundle/Contents/_CodeSignature/CodeResources
+3 -3
View File
@@ -6,7 +6,7 @@
<dict>
<key>Resources/Base.lproj/MyInstallerPane.nib</key>
<data>
0rfQ2R1TtL98oNUNRVtEU8xVL7E=
dcj4gA5aqRoIlTrpg4RBKtv6OAE=
</data>
<key>Resources/InstallerSections.plist</key>
<data>
@@ -37,11 +37,11 @@
<dict>
<key>hash</key>
<data>
0rfQ2R1TtL98oNUNRVtEU8xVL7E=
dcj4gA5aqRoIlTrpg4RBKtv6OAE=
</data>
<key>hash2</key>
<data>
zkN0k8vMtcN/J36Zw9mvTd3iMIdVWrJgzvPr5xvwnb4=
NxbgqqTQCF1j4khoNQwudNNGBQ8cT2EXVixlwgFV27Q=
</data>
</dict>
<key>Resources/InstallerSections.plist</key>
installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/project.pbxproj
+8 -6
View File
@@ -92,7 +92,7 @@
3A10EBC71ED4336D0083702F /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1100;
ORGANIZATIONNAME = Symphony;
TargetAttributes = {
3A10EBCE1ED4336D0083702F = {
@@ -104,7 +104,7 @@
};
buildConfigurationList = 3A10EBCA1ED4336D0083702F /* Build configuration list for PBXProject "SymphonySettingsPlugin" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
@@ -177,6 +177,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -222,7 +223,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@@ -233,6 +234,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -272,7 +274,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
@@ -281,7 +283,7 @@
3A10EBE41ED4336D0083702F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "Apple Development";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 7S74264P3V;
INFOPLIST_FILE = SymphonySettingsPlugin/Info.plist;
@@ -297,7 +299,7 @@
3A10EBE51ED4336D0083702F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "Apple Development";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 7S74264P3V;
INFOPLIST_FILE = SymphonySettingsPlugin/Info.plist;
installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/xcuserdata/vishwas.xcuserdatad/xcschemes/SymphonySettingsPlugin.xcscheme
+1 -5
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
@@ -51,8 +49,6 @@
ReferencedContainer = "container:SymphonySettingsPlugin.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.m
+1 -1
View File
@@ -27,7 +27,7 @@
NSString *podUrl = [_podUrlTextBox stringValue];
// Now, validate the url against a url regex
NSString *regex = @"^(https:\\/\\/)?(www.)?[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,}(:[0-9]{1,5})?(\\/[a-zA-Z0-9-_.+!*'(),;\\/?:@=&$]*)?$";
NSString *regex = @"^(https:\\/\\/)?(www.)?[a-zA-Z0-9]+([\\-\\.]{1}[a-zA-Z0-9]+)*\\.[a-zA-Z]{2,}(:[0-9]{1,5})?(\\/[a-zA-Z0-9-_.+!*'(),;\\/?:@=&$]*)?$";
NSPredicate *podUrlTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regex];