OS X El Capitan + SSLv23 + Python Plugin

xchataqua · Oct 15, 2015 · fa953e4 · fa953e4
1 parent 3ba4935
commit fa953e4
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 33 deletions.
diff --git a/Mac/Aqua/Info.plist b/Mac/Aqua/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>xchat.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.sourceforge.xchataqua</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/Mac/Azure/Info.plist b/Mac/Azure/Info.plist
@@ -18,7 +18,7 @@
 		<string>xchat512@2x.icns</string>
 	</array>
 	<key>CFBundleIdentifier</key>
-	<string>org.3rddev.xchatazure</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/Mac/Plugins/python/python-Info.plist b/Mac/Plugins/python/python-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.sourceforge.xchataqua.${PRODUCT_NAME:identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

diff --git a/Mac/Plugins/ruby-Info.plist b/Mac/Plugins/ruby-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.sourceforge.xchataqua.${PRODUCT_NAME:identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

diff --git a/Mac/Plugins/tcl/tcl-Info.plist b/Mac/Plugins/tcl/tcl-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.sourceforge.xchataqua.${PRODUCT_NAME:identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

diff --git a/Mac/Sources/fe-aqua.m b/Mac/Sources/fe-aqua.m
@@ -358,8 +358,11 @@ static void fix_log_files_and_pref ()
 #endif
     [NSApplication sharedApplication];
     NSString *mainNibFile = [[NSBundle mainBundle] infoDictionary][@"NSMainNibFile"];
+    /*
+    NSArray *objects = nil;
+    [[NSBundle mainBundle] loadNibNamed:mainNibFile owner:NSApp topLevelObjects:&objects];
+     */
     [NSBundle loadNibNamed:mainNibFile owner:NSApp];
-
     // Do not connect to network if app is launched while holding the Option key
     if ([NSEvent modifierFlags] & NSAlternateKeyMask) {
         arg_dont_autoconnect = true;

diff --git a/Podfile b/Podfile
@@ -1,22 +1,24 @@
-platform :osx, "10.6"
+platform :osx, "10.9"
 xcodeproj 'XChatAqua.xcodeproj'
 workspace 'XChatAqua'
 
 target :'XChat Azure' do
-	xcodeproj 'XChatAqua.xcodeproj'
-	pod 'FoundationExtension'
-	pod 'libintl-alternative'
+    xcodeproj 'XChatAqua.xcodeproj'
+    pod 'FoundationExtension'
+    pod 'libintl-alternative'
+    pod 'OpenSSL'
 end
 
 target :'XChat Aqua' do
-	xcodeproj 'XChatAqua.xcodeproj'
-	pod 'FoundationExtension'
-	pod 'libintl-alternative'
+    xcodeproj 'XChatAqua.xcodeproj'
+    pod 'FoundationExtension'
+    pod 'libintl-alternative'
+    pod 'OpenSSL'
 end
 
 target :'XChat iPhone' do
-	platform :ios
-	xcodeproj 'XChatTouch.xcodeproj'
-	pod 'FoundationExtension/UIKitExtension'
-	pod 'libintl-alternative'
+    platform :ios
+    xcodeproj 'XChatTouch.xcodeproj'
+    pod 'FoundationExtension/UIKitExtension'
+    pod 'libintl-alternative'
 end
diff --git a/XChatAqua.xcodeproj/project.pbxproj b/XChatAqua.xcodeproj/project.pbxproj
diff --git a/XChatTouch.xcodeproj/project.pbxproj b/XChatTouch.xcodeproj/project.pbxproj
@@ -1498,6 +1498,7 @@
 				8D1107290486CEB800E47090 /* Resources */,
 				0F8EA7C40CFB6EC9001AE9AE /* Copy Frameworks */,
 				0301C87908B940649BC1D167 /* Copy Pods Resources */,
+				B530EF7A6953488CEF31FC99 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -1697,6 +1698,21 @@
 			shellPath = /bin/bash;
 			shellScript = "#!/bin/bash\n\n[ -f ~/.bashrc ] && source ~/.bashrc\n[ -f ~/.profile ] && source ~/.profile\n\necho \"Generating config.package_name.in.h\"\n\ncd \"$PROJECT_DIR\"\n\"tools/gen_xchat_package_name.sh\" > \"xchat/config.package_name.in.h\"";
 		};
+		B530EF7A6953488CEF31FC99 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-XChat iPhone/Pods-XChat iPhone-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/perl-mavericks-Info.plist b/perl-mavericks-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.sourceforge.xchataqua.${PRODUCT_NAME:identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

diff --git a/xchat b/xchat