Skip to content

Commit d529a4d

Browse files
committed
minor changes for newer Xcode, change deployment target to 10.9
1 parent 30ac8b2 commit d529a4d

File tree

5 files changed

+78
-34
lines changed

5 files changed

+78
-34
lines changed

Classes/MBSliderButton.m

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ -(void)setDelegate:(id)d
5050

5151

5252
#import "MBSliderButton.h"
53+
#import "mysqlPref.h"
5354

5455
@implementation MSPPMBSliderButton
5556

@@ -244,4 +245,4 @@ -(IBAction)moveRight:(id)sender
244245
[[self window] invalidateCursorRectsForView:self];
245246
}
246247

247-
@end
248+
@end

English.lproj/mysqlPref.xib

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="13F1096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
33
<dependencies>
4-
<deployment version="1050" identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
4+
<deployment identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
6+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
67
</dependencies>
78
<objects>
89
<customObject id="-2" userLabel="File's Owner" customClass="mysqlPref">
@@ -16,7 +17,7 @@
1617
</customObject>
1718
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
1819
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
19-
<window title="&lt;&lt; do not localize >>" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" deferred="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="12" userLabel="PrefPane">
20+
<window title="&lt;&lt; do not localize &gt;&gt;" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" deferred="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="12" userLabel="PrefPane">
2021
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
2122
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
2223
<rect key="contentRect" x="176" y="715" width="668" height="238"/>
@@ -69,7 +70,7 @@
6970
<box autoresizesSubviews="NO" wantsLayer="YES" borderType="line" titlePosition="noTitle" id="145">
7071
<rect key="frame" x="297" y="16" width="354" height="210"/>
7172
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
72-
<view key="contentView">
73+
<view key="contentView" id="suQ-Ck-7cI">
7374
<rect key="frame" x="1" y="1" width="352" height="208"/>
7475
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
7576
<subviews>
@@ -84,12 +85,9 @@
8485
<action selector="locateBinary:" target="-2" id="189"/>
8586
</connections>
8687
</button>
87-
<box autoresizesSubviews="NO" verticalHuggingPriority="750" alphaValue="0.30000000000000016" title="Box" boxType="separator" borderType="line" titlePosition="noTitle" id="163">
88+
<box verticalHuggingPriority="750" alphaValue="0.30000000000000016" boxType="separator" id="163">
8889
<rect key="frame" x="3" y="153" width="346" height="5"/>
8990
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
90-
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
91-
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
92-
<font key="titleFont" metaFont="system"/>
9391
</box>
9492
<textField verticalHuggingPriority="750" id="164">
9593
<rect key="frame" x="147" y="169" width="187" height="22"/>
@@ -108,11 +106,11 @@
108106
<rect key="frame" x="14" y="23" width="319" height="94"/>
109107
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
110108
<clipView key="contentView" id="Rao-70-wJt">
111-
<rect key="frame" x="1" y="17" width="317" height="76"/>
109+
<rect key="frame" x="1" y="0.0" width="317" height="93"/>
112110
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
113111
<subviews>
114112
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="148" id="150">
115-
<rect key="frame" x="0.0" y="0.0" width="317" height="19"/>
113+
<rect key="frame" x="0.0" y="0.0" width="317" height="76"/>
116114
<autoresizingMask key="autoresizingMask"/>
117115
<size key="intercellSpacing" width="3" height="2"/>
118116
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -164,7 +162,6 @@
164162
</connections>
165163
</tableView>
166164
</subviews>
167-
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
168165
</clipView>
169166
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="149">
170167
<rect key="frame" x="-100" y="-100" width="302" height="15"/>
@@ -203,8 +200,6 @@
203200
</customView>
204201
</subviews>
205202
</view>
206-
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
207-
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
208203
</box>
209204
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Pn8-UM-TcW">
210205
<rect key="frame" x="108" y="62" width="89" height="13"/>

Lib/DaemonController/DaemonController.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#import <Cocoa/Cocoa.h>
99

1010
typedef void (^DaemonStarted)(NSNumber *);
11-
typedef void (^DaemonStopped)();
12-
typedef void (^DaemonIsStarting)();
13-
typedef void (^DaemonIsStopping)();
11+
typedef void (^DaemonStopped)(void);
12+
typedef void (^DaemonIsStarting)(void);
13+
typedef void (^DaemonIsStopping)(void);
1414
typedef void (^DaemonFailedToStart)(NSString *);
1515
typedef void (^DaemonFailedToStop)(NSString *);
1616

MySQL.prefPane.xcodeproj/project.pbxproj

+61-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -257,7 +257,7 @@
257257
089C1669FE841209C02AAC07 /* Project object */ = {
258258
isa = PBXProject;
259259
attributes = {
260-
LastUpgradeCheck = 0620;
260+
LastUpgradeCheck = 1010;
261261
ORGANIZATIONNAME = "Helmut K. C. Tessarek";
262262
TargetAttributes = {
263263
0EB5C3641B252FB100FB9A19 = {
@@ -266,7 +266,7 @@
266266
};
267267
};
268268
buildConfigurationList = 1DBD214C08BA80EA00186707 /* Build configuration list for PBXProject "MySQL.prefPane" */;
269-
compatibilityVersion = "Xcode 3.2";
269+
compatibilityVersion = "Xcode 10.0";
270270
developmentRegion = English;
271271
hasScannedForEncodings = 1;
272272
knownRegions = (
@@ -321,7 +321,7 @@
321321
);
322322
runOnlyForDeploymentPostprocessing = 0;
323323
shellPath = /bin/bash;
324-
shellScript = "GIT=/usr/bin/git\nSEP=\"_\"\nINFOPLIST=Classes/InfoPlist.h\n\n# CFBundleShortVersionString\tx.y[.z]\n# CFBundleVersion\t\t\t\tx.y.z-githash\n\ngithash=`$GIT log -1 --pretty=oneline --abbrev-commit |cut -c1-7`\nrevision=`$GIT log --oneline | wc -l |tr -d [[:space:]]`\n\n# if no tag, set x.y to 0.0\nif [ `$GIT describe --long 2>&1 |cut -c1-5` == \"fatal\" ]\nthen\nversion=0.0\ninternal_version=0.0.0${SEP}$githash\n\nelse\n\n# get tag and long tag name (w/o the githash)\nTAG=`$GIT describe --tags`\nTAGLONG=`$GIT describe --tags --long |sed \"s/-g${githash}//\"`\n\n# remove leading characters\nTAG=`echo $TAG |sed 's/[a-zA-Z]*//'`\nTAGLONG=`echo $TAGLONG |sed 's/[a-zA-Z]*//'`\n\n# get the number of commits since last tag\nTMP1=`expr \"$TAGLONG\" : '.*\\(-[0-9]*\\)'`\n\nif [ \"$TMP1\" == \"0\" ]\nthen\ncommits=0\nelse\ncommits=`echo $TMP1 |cut -c2-`\nfi\n\n# clean tag: remove anything after the version, replace consecutive . with one ., remove trailing .\nTAG=`echo $TAG | sed 's/\\([0-9\\.]*\\).*/\\1/' | sed 's/[\\.]\\{2,\\}/\\./g' | sed 's/\\.*$//'`\n\n# create version and internal_version\nversion=$TAG\n\nif [ \"$commits\" != \"0\" ] # if no commits since tagged, omit the zero in version\nthen\nversion=${TAG}.${commits}\nfi\n\ninternal_version=${TAG}.${commits}${SEP}${githash}\n\nfi\n\necho \"#define VERSION_INFO $version\" > $INFOPLIST\necho \"#define INTERNAL_VERSION_INFO $internal_version\" >> $INFOPLIST\necho \"#define GIT_HASH_INFO $githash\" >> $INFOPLIST\necho \"#define REVISION_INFO $revision\" >> $INFOPLIST\necho \"\" >> $INFOPLIST\necho \"#define VERSION \\\"$version\\\"\" >> $INFOPLIST\necho \"#define INTERNAL_VERSION \\\"$internal_version\\\"\" >> $INFOPLIST\necho \"#define GIT_HASH \\\"$githash\\\"\" >> $INFOPLIST\necho \"#define REVISION \\\"$revision\\\"\" >> $INFOPLIST\n";
324+
shellScript = "GIT=/usr/bin/git\nSEP=\"_\"\nINFOPLIST=Classes/InfoPlist.h\n\n# CFBundleShortVersionString x.y[.z]\n# CFBundleVersion x.y.z-githash\n\ngithash=`$GIT log -1 --pretty=oneline --abbrev-commit |cut -c1-7`\nrevision=`$GIT log --oneline | wc -l |tr -d [[:space:]]`\n\n# if no tag, set x.y to 0.0\nif [ `$GIT describe --long 2>&1 |cut -c1-5` == \"fatal\" ]\nthen\nversion=0.0\ninternal_version=0.0.0${SEP}$githash\n\nelse\n\n# get tag and long tag name (w/o the githash)\nTAG=`$GIT describe --tags`\nTAGLONG=`$GIT describe --tags --long |sed \"s/-g${githash}//\"`\n\n# remove leading characters\nTAG=`echo $TAG |sed 's/[a-zA-Z]*//'`\nTAGLONG=`echo $TAGLONG |sed 's/[a-zA-Z]*//'`\n\n# get the number of commits since last tag\nTMP1=`expr \"$TAGLONG\" : '.*\\(-[0-9]*\\)'`\n\nif [ \"$TMP1\" == \"0\" ]\nthen\ncommits=0\nelse\ncommits=`echo $TMP1 |cut -c2-`\nfi\n\n# clean tag: remove anything after the version, replace consecutive . with one ., remove trailing .\nTAG=`echo $TAG | sed 's/\\([0-9\\.]*\\).*/\\1/' | sed 's/[\\.]\\{2,\\}/\\./g' | sed 's/\\.*$//'`\n\n# create version and internal_version\nversion=$TAG\n\nif [ \"$commits\" != \"0\" ] # if no commits since tagged, omit the zero in version\nthen\nversion=${TAG}.${commits}\nfi\n\ninternal_version=${TAG}.${commits}${SEP}${githash}\n\nfi\n\necho \"#define VERSION_INFO $version\" > $INFOPLIST\necho \"#define INTERNAL_VERSION_INFO $internal_version\" >> $INFOPLIST\necho \"#define GIT_HASH_INFO $githash\" >> $INFOPLIST\necho \"#define REVISION_INFO $revision\" >> $INFOPLIST\necho \"\" >> $INFOPLIST\necho \"#define VERSION \\\"$version\\\"\" >> $INFOPLIST\necho \"#define INTERNAL_VERSION \\\"$internal_version\\\"\" >> $INFOPLIST\necho \"#define GIT_HASH \\\"$githash\\\"\" >> $INFOPLIST\necho \"#define REVISION \\\"$revision\\\"\" >> $INFOPLIST\n";
325325
};
326326
/* End PBXShellScriptBuildPhase section */
327327

@@ -364,21 +364,25 @@
364364
0EB5C3661B252FB200FB9A19 /* Debug */ = {
365365
isa = XCBuildConfiguration;
366366
buildSettings = {
367+
CLANG_ENABLE_OBJC_WEAK = YES;
368+
PRODUCT_BUNDLE_IDENTIFIER = "cx.evermeet.${PRODUCT_NAME:identifier}";
367369
PRODUCT_NAME = "$(TARGET_NAME)";
368370
};
369371
name = Debug;
370372
};
371373
0EB5C3671B252FB200FB9A19 /* Release */ = {
372374
isa = XCBuildConfiguration;
373375
buildSettings = {
376+
CLANG_ENABLE_OBJC_WEAK = YES;
377+
PRODUCT_BUNDLE_IDENTIFIER = "cx.evermeet.${PRODUCT_NAME:identifier}";
374378
PRODUCT_NAME = "$(TARGET_NAME)";
375379
};
376380
name = Release;
377381
};
378382
1DBD214908BA80EA00186707 /* Debug */ = {
379383
isa = XCBuildConfiguration;
380384
buildSettings = {
381-
ARCHS = "$(ARCHS_STANDARD)";
385+
ALWAYS_SEARCH_USER_PATHS = NO;
382386
CLANG_ENABLE_OBJC_ARC = YES;
383387
COPY_PHASE_STRIP = NO;
384388
FRAMEWORK_SEARCH_PATHS = (
@@ -387,13 +391,13 @@
387391
"\"$(SRCROOT)/Lib\"",
388392
);
389393
GCC_DYNAMIC_NO_PIC = NO;
390-
GCC_ENABLE_FIX_AND_CONTINUE = YES;
391394
GCC_OPTIMIZATION_LEVEL = 0;
392395
GCC_PRECOMPILE_PREFIX_HEADER = YES;
393396
GCC_PREFIX_HEADER = "Classes/MySQL-Prefix.pch";
394397
INFOPLIST_FILE = Resources/Info.plist;
395398
INSTALL_PATH = "$(HOME)/Library/PreferencePanes";
396399
MACOSX_DEPLOYMENT_TARGET = 10.9;
400+
PRODUCT_BUNDLE_IDENTIFIER = "cx.evermeet.${PRODUCT_NAME:identifier}";
397401
PRODUCT_NAME = MySQL;
398402
SDKROOT = macosx;
399403
VALID_ARCHS = x86_64;
@@ -405,7 +409,7 @@
405409
1DBD214A08BA80EA00186707 /* Release */ = {
406410
isa = XCBuildConfiguration;
407411
buildSettings = {
408-
ARCHS = "$(ARCHS_STANDARD)";
412+
ALWAYS_SEARCH_USER_PATHS = NO;
409413
CLANG_ENABLE_OBJC_ARC = YES;
410414
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
411415
FRAMEWORK_SEARCH_PATHS = (
@@ -418,6 +422,7 @@
418422
INFOPLIST_FILE = Resources/Info.plist;
419423
INSTALL_PATH = "$(HOME)/Library/PreferencePanes";
420424
MACOSX_DEPLOYMENT_TARGET = 10.9;
425+
PRODUCT_BUNDLE_IDENTIFIER = "cx.evermeet.${PRODUCT_NAME:identifier}";
421426
PRODUCT_NAME = MySQL;
422427
SDKROOT = macosx;
423428
VALID_ARCHS = x86_64;
@@ -428,17 +433,39 @@
428433
1DBD214D08BA80EA00186707 /* Debug */ = {
429434
isa = XCBuildConfiguration;
430435
buildSettings = {
431-
ARCHS = "$(ARCHS_STANDARD)";
436+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
437+
CLANG_WARN_BOOL_CONVERSION = YES;
438+
CLANG_WARN_COMMA = YES;
439+
CLANG_WARN_CONSTANT_CONVERSION = YES;
440+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
441+
CLANG_WARN_EMPTY_BODY = YES;
442+
CLANG_WARN_ENUM_CONVERSION = YES;
443+
CLANG_WARN_INFINITE_RECURSION = YES;
444+
CLANG_WARN_INT_CONVERSION = YES;
445+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
446+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
447+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
448+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
449+
CLANG_WARN_STRICT_PROTOTYPES = YES;
450+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
451+
CLANG_WARN_UNREACHABLE_CODE = YES;
452+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
453+
ENABLE_STRICT_OBJC_MSGSEND = YES;
454+
ENABLE_TESTABILITY = YES;
432455
GCC_C_LANGUAGE_STANDARD = gnu99;
456+
GCC_NO_COMMON_BLOCKS = YES;
457+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
433458
GCC_WARN_ABOUT_RETURN_TYPE = YES;
459+
GCC_WARN_UNDECLARED_SELECTOR = YES;
460+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
461+
GCC_WARN_UNUSED_FUNCTION = YES;
434462
GCC_WARN_UNUSED_VARIABLE = YES;
435463
GENERATE_PKGINFO_FILE = YES;
436464
INFOPLIST_FILE = Resources/Info.plist;
437465
INFOPLIST_PREFIX_HEADER = Classes/InfoPlist.h;
438466
INFOPLIST_PREPROCESS = YES;
439-
MACOSX_DEPLOYMENT_TARGET = 10.6;
467+
MACOSX_DEPLOYMENT_TARGET = 10.9;
440468
ONLY_ACTIVE_ARCH = YES;
441-
PREBINDING = NO;
442469
SDKROOT = macosx;
443470
VALID_ARCHS = x86_64;
444471
};
@@ -447,16 +474,37 @@
447474
1DBD214E08BA80EA00186707 /* Release */ = {
448475
isa = XCBuildConfiguration;
449476
buildSettings = {
450-
ARCHS = "$(ARCHS_STANDARD)";
477+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
478+
CLANG_WARN_BOOL_CONVERSION = YES;
479+
CLANG_WARN_COMMA = YES;
480+
CLANG_WARN_CONSTANT_CONVERSION = YES;
481+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
482+
CLANG_WARN_EMPTY_BODY = YES;
483+
CLANG_WARN_ENUM_CONVERSION = YES;
484+
CLANG_WARN_INFINITE_RECURSION = YES;
485+
CLANG_WARN_INT_CONVERSION = YES;
486+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
487+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
488+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
489+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
490+
CLANG_WARN_STRICT_PROTOTYPES = YES;
491+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
492+
CLANG_WARN_UNREACHABLE_CODE = YES;
493+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
494+
ENABLE_STRICT_OBJC_MSGSEND = YES;
451495
GCC_C_LANGUAGE_STANDARD = gnu99;
496+
GCC_NO_COMMON_BLOCKS = YES;
497+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
452498
GCC_WARN_ABOUT_RETURN_TYPE = YES;
499+
GCC_WARN_UNDECLARED_SELECTOR = YES;
500+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
501+
GCC_WARN_UNUSED_FUNCTION = YES;
453502
GCC_WARN_UNUSED_VARIABLE = YES;
454503
GENERATE_PKGINFO_FILE = YES;
455504
INFOPLIST_FILE = Resources/Info.plist;
456505
INFOPLIST_PREFIX_HEADER = Classes/InfoPlist.h;
457506
INFOPLIST_PREPROCESS = YES;
458-
MACOSX_DEPLOYMENT_TARGET = 10.6;
459-
PREBINDING = NO;
507+
MACOSX_DEPLOYMENT_TARGET = 10.9;
460508
SDKROOT = macosx;
461509
VALID_ARCHS = x86_64;
462510
};

Resources/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleIconFile</key>
1010
<string>mysqlPref.tiff</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>cx.evermeet.${PRODUCT_NAME:identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
@@ -25,7 +25,7 @@
2525
<key>GitHash</key>
2626
<string>GIT_HASH_INFO</string>
2727
<key>NSHumanReadableCopyright</key>
28-
<string>© Helmut K. C. Tessarek, 2015</string>
28+
<string>© Helmut K. C. Tessarek, 2015-2018</string>
2929
<key>NSMainNibFile</key>
3030
<string>mysqlPref</string>
3131
<key>NSPrefPaneIconFile</key>

0 commit comments

Comments
 (0)