Skip to content

Commit b9d0d91

Browse files
imotheeimothee
committed
Update to arc, add folder autocreation
1 parent 3cedccc commit b9d0d91

17 files changed

+962
-1603
lines changed

‎TmpDisk.xcodeproj/project.pbxproj‎

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
412EC7E7146DF1C600D569F1 /* eject_a.png in Resources */ = {isa = PBXBuildFile; fileRef = 412EC7E6146DF1C600D569F1 /* eject_a.png */; };
1515
413A37551470B12500C07D59 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 413A37541470B12500C07D59 /* CoreServices.framework */; };
1616
418320CA14722C1D000D8488 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 418320C914722C1D000D8488 /* Sparkle.framework */; };
17-
418320CC14722C41000D8488 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 418320C914722C1D000D8488 /* Sparkle.framework */; };
17+
418320CC14722C41000D8488 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 418320C914722C1D000D8488 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
1818
418320CE14722EB5000D8488 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 418320CD14722EB5000D8488 /* dsa_pub.pem */; };
1919
418A2895144299DE00D4BCB0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 418A2894144299DE00D4BCB0 /* Cocoa.framework */; };
2020
418A289F144299DE00D4BCB0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 418A289D144299DE00D4BCB0 /* InfoPlist.strings */; };
@@ -290,15 +290,16 @@
290290
name = TmpDiskTests;
291291
productName = TmpDiskTests;
292292
productReference = 418A28B1144299DF00D4BCB0 /* TmpDiskTests.octest */;
293-
productType = "com.apple.product-type.bundle";
293+
productType = "com.apple.product-type.bundle.ocunit-test";
294294
};
295295
/* End PBXNativeTarget section */
296296

297297
/* Begin PBXProject section */
298298
418A2887144299DE00D4BCB0 /* Project object */ = {
299299
isa = PBXProject;
300300
attributes = {
301-
LastUpgradeCheck = 0440;
301+
LastTestingUpgradeCheck = 0720;
302+
LastUpgradeCheck = 0720;
302303
ORGANIZATIONNAME = "Ink Scribbles Pty Ltd";
303304
};
304305
buildConfigurationList = 418A288A144299DE00D4BCB0 /* Build configuration list for PBXProject "TmpDisk" */;
@@ -453,11 +454,20 @@
453454
isa = XCBuildConfiguration;
454455
buildSettings = {
455456
ALWAYS_SEARCH_USER_PATHS = NO;
456-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
457+
CLANG_WARN_BOOL_CONVERSION = YES;
458+
CLANG_WARN_CONSTANT_CONVERSION = YES;
459+
CLANG_WARN_EMPTY_BODY = YES;
460+
CLANG_WARN_ENUM_CONVERSION = YES;
461+
CLANG_WARN_INT_CONVERSION = YES;
462+
CLANG_WARN_UNREACHABLE_CODE = YES;
463+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
457464
COPY_PHASE_STRIP = NO;
465+
ENABLE_STRICT_OBJC_MSGSEND = YES;
466+
ENABLE_TESTABILITY = YES;
458467
GCC_C_LANGUAGE_STANDARD = gnu99;
459468
GCC_DYNAMIC_NO_PIC = NO;
460469
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
470+
GCC_NO_COMMON_BLOCKS = YES;
461471
GCC_OPTIMIZATION_LEVEL = 0;
462472
GCC_PREPROCESSOR_DEFINITIONS = (
463473
"DEBUG=1",
@@ -468,6 +478,9 @@
468478
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
469479
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
470480
GCC_WARN_ABOUT_RETURN_TYPE = YES;
481+
GCC_WARN_UNDECLARED_SELECTOR = YES;
482+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
483+
GCC_WARN_UNUSED_FUNCTION = YES;
471484
GCC_WARN_UNUSED_VARIABLE = YES;
472485
MACOSX_DEPLOYMENT_TARGET = 10.6;
473486
ONLY_ACTIVE_ARCH = YES;
@@ -479,15 +492,26 @@
479492
isa = XCBuildConfiguration;
480493
buildSettings = {
481494
ALWAYS_SEARCH_USER_PATHS = NO;
482-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
495+
CLANG_WARN_BOOL_CONVERSION = YES;
496+
CLANG_WARN_CONSTANT_CONVERSION = YES;
497+
CLANG_WARN_EMPTY_BODY = YES;
498+
CLANG_WARN_ENUM_CONVERSION = YES;
499+
CLANG_WARN_INT_CONVERSION = YES;
500+
CLANG_WARN_UNREACHABLE_CODE = YES;
501+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
483502
COPY_PHASE_STRIP = YES;
484503
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
504+
ENABLE_STRICT_OBJC_MSGSEND = YES;
485505
GCC_C_LANGUAGE_STANDARD = gnu99;
486506
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
507+
GCC_NO_COMMON_BLOCKS = YES;
487508
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
488509
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
489510
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
490511
GCC_WARN_ABOUT_RETURN_TYPE = YES;
512+
GCC_WARN_UNDECLARED_SELECTOR = YES;
513+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
514+
GCC_WARN_UNUSED_FUNCTION = YES;
491515
GCC_WARN_UNUSED_VARIABLE = YES;
492516
MACOSX_DEPLOYMENT_TARGET = 10.6;
493517
SDKROOT = macosx;
@@ -497,16 +521,18 @@
497521
418A28C3144299DF00D4BCB0 /* Debug */ = {
498522
isa = XCBuildConfiguration;
499523
buildSettings = {
500-
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
524+
CLANG_ENABLE_OBJC_ARC = YES;
525+
CODE_SIGN_IDENTITY = "";
501526
COMBINE_HIDPI_IMAGES = YES;
502527
FRAMEWORK_SEARCH_PATHS = (
503528
"$(inherited)",
504529
"\"$(SRCROOT)\"",
505530
);
506-
GCC_ENABLE_OBJC_GC = supported;
531+
GCC_ENABLE_OBJC_GC = unsupported;
507532
GCC_PRECOMPILE_PREFIX_HEADER = YES;
508533
GCC_PREFIX_HEADER = "TmpDisk/TmpDisk-Prefix.pch";
509534
INFOPLIST_FILE = "TmpDisk/TmpDisk-Info.plist";
535+
PRODUCT_BUNDLE_IDENTIFIER = "com.inkscribbles.${PRODUCT_NAME:rfc1034identifier}";
510536
PRODUCT_NAME = "$(TARGET_NAME)";
511537
WRAPPER_EXTENSION = app;
512538
};
@@ -515,16 +541,18 @@
515541
418A28C4144299DF00D4BCB0 /* Release */ = {
516542
isa = XCBuildConfiguration;
517543
buildSettings = {
518-
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
544+
CLANG_ENABLE_OBJC_ARC = YES;
545+
CODE_SIGN_IDENTITY = "";
519546
COMBINE_HIDPI_IMAGES = YES;
520547
FRAMEWORK_SEARCH_PATHS = (
521548
"$(inherited)",
522549
"\"$(SRCROOT)\"",
523550
);
524-
GCC_ENABLE_OBJC_GC = supported;
551+
GCC_ENABLE_OBJC_GC = unsupported;
525552
GCC_PRECOMPILE_PREFIX_HEADER = YES;
526553
GCC_PREFIX_HEADER = "TmpDisk/TmpDisk-Prefix.pch";
527554
INFOPLIST_FILE = "TmpDisk/TmpDisk-Info.plist";
555+
PRODUCT_BUNDLE_IDENTIFIER = "com.inkscribbles.${PRODUCT_NAME:rfc1034identifier}";
528556
PRODUCT_NAME = "$(TARGET_NAME)";
529557
WRAPPER_EXTENSION = app;
530558
};
@@ -539,6 +567,7 @@
539567
GCC_PRECOMPILE_PREFIX_HEADER = YES;
540568
GCC_PREFIX_HEADER = "TmpDisk/TmpDisk-Prefix.pch";
541569
INFOPLIST_FILE = "TmpDiskTests/TmpDiskTests-Info.plist";
570+
PRODUCT_BUNDLE_IDENTIFIER = "com.inkscribbles.${PRODUCT_NAME:rfc1034identifier}";
542571
PRODUCT_NAME = "$(TARGET_NAME)";
543572
TEST_HOST = "$(BUNDLE_LOADER)";
544573
WRAPPER_EXTENSION = octest;
@@ -554,6 +583,7 @@
554583
GCC_PRECOMPILE_PREFIX_HEADER = YES;
555584
GCC_PREFIX_HEADER = "TmpDisk/TmpDisk-Prefix.pch";
556585
INFOPLIST_FILE = "TmpDiskTests/TmpDiskTests-Info.plist";
586+
PRODUCT_BUNDLE_IDENTIFIER = "com.inkscribbles.${PRODUCT_NAME:rfc1034identifier}";
557587
PRODUCT_NAME = "$(TARGET_NAME)";
558588
TEST_HOST = "$(BUNDLE_LOADER)";
559589
WRAPPER_EXTENSION = octest;

‎TmpDisk/AppDelegate.h‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
// Copyright (c) 2011 Ink Scribbles Pty Ltd.
77
//
88
// This file is part of TmpDisk.
9-
//
9+
//
1010
// TmpDisk is free software: you can redistribute it and/or modify
1111
// it under the terms of the GNU General Public License as published by
1212
// the Free Software Foundation, either version 3 of the License, or
1313
// (at your option) any later version.
14-
//
14+
//
1515
// TmpDisk is distributed in the hope that it will be useful,
1616
// but WITHOUT ANY WARRANTY; without even the implied warranty of
1717
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1818
// GNU General Public License for more details.
19-
//
19+
//
2020
// You should have received a copy of the GNU General Public License
2121
// along with TmpDisk. If not, see <http://www.gnu.org/licenses/>.
2222

@@ -26,13 +26,12 @@
2626
#import "TmpDiskManager.h"
2727

2828
@interface AppDelegate : NSObject <NSApplicationDelegate> {
29-
30-
IBOutlet NSMenu *statusMenu;
31-
IBOutlet NSMenu *diskMenu;
32-
NSStatusItem * statusItem;
29+
IBOutlet NSMenu *statusMenu;
30+
IBOutlet NSMenu *diskMenu;
31+
NSStatusItem * statusItem;
3332
}
3433

35-
@property (assign) IBOutlet NSWindow *window;
34+
@property (strong) IBOutlet NSWindow *window;
3635

3736
- (void)diskUnmounted:(NSNotification *)notification;
3837
- (void)newTmpDiskCreated:(NSNotification *)notification;

0 commit comments

Comments
 (0)