Skip to content

Commit e89536c

Browse files
ksherlockksherlock
committed
version bump, add host.fst.po, move mame-data.tgz to the shared support directory.
1 parent d2b592c commit e89536c

File tree

4 files changed

+35
-12
lines changed

4 files changed

+35
-12
lines changed

‎Ample.xcodeproj/project.pbxproj

+24-10
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
B6374AC5260EBC5A0045CA16 /* pty_shell in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6374ABD260EBBC90045CA16 /* pty_shell */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
4141
B63C1B8B24FF4BF700511A71 /* Ample.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B8A24FF4BF700511A71 /* Ample.m */; };
4242
B63C1B8C24FF4BF700511A71 /* Ample.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B8A24FF4BF700511A71 /* Ample.m */; };
43-
B63C1B8E25004C6D00511A71 /* mame-data.tgz in Resources */ = {isa = PBXBuildFile; fileRef = B63C1B8D25004C6D00511A71 /* mame-data.tgz */; };
4443
B63C1B9425008A2700511A71 /* DownloadWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B9225008A2700511A71 /* DownloadWindowController.m */; };
4544
B63C1B9525008A2700511A71 /* DownloadWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B9225008A2700511A71 /* DownloadWindowController.m */; };
4645
B63C1B9625008A2700511A71 /* DownloadWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B63C1B9325008A2700511A71 /* DownloadWindow.xib */; };
@@ -432,6 +431,8 @@
432431
B6D6DE3B24FACF4F00661A5F /* Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6D6DE3A24FACF4F00661A5F /* Defaults.plist */; };
433432
B6D6DE3E24FADF8B00661A5F /* LaunchWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6D6DE3C24FADF8B00661A5F /* LaunchWindow.xib */; };
434433
B6D6DE4124FADFAC00661A5F /* LaunchWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D6DE4024FADFAC00661A5F /* LaunchWindowController.m */; };
434+
B6DD93972BB4F5DC00921359 /* Host.FST.po in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6DD93942BB4F0FC00921359 /* Host.FST.po */; };
435+
B6DD93982BB4F65200921359 /* mame-data.tgz in CopyFiles */ = {isa = PBXBuildFile; fileRef = B63C1B8D25004C6D00511A71 /* mame-data.tgz */; };
435436
B6DDECC025057A550093587A /* drag-handle-4x10.png in Resources */ = {isa = PBXBuildFile; fileRef = B6DDECBD25057A550093587A /* drag-handle-4x10.png */; };
436437
B6DDECC125057A550093587A /* drag-handle-4x10.png in Resources */ = {isa = PBXBuildFile; fileRef = B6DDECBD25057A550093587A /* drag-handle-4x10.png */; };
437438
B6DDECC225057A550093587A /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = B6DDECBE25057A550093587A /* [email protected] */; };
@@ -571,6 +572,17 @@
571572
);
572573
runOnlyForDeploymentPostprocessing = 1;
573574
};
575+
B6DD93962BB4F5B700921359 /* CopyFiles */ = {
576+
isa = PBXCopyFilesBuildPhase;
577+
buildActionMask = 2147483647;
578+
dstPath = "";
579+
dstSubfolderSpec = 12;
580+
files = (
581+
B6DD93982BB4F65200921359 /* mame-data.tgz in CopyFiles */,
582+
B6DD93972BB4F5DC00921359 /* Host.FST.po in CopyFiles */,
583+
);
584+
runOnlyForDeploymentPostprocessing = 0;
585+
};
574586
B6E4B5F324FDE2670094A35C /* Embed Frameworks */ = {
575587
isa = PBXCopyFilesBuildPhase;
576588
buildActionMask = 2147483647;
@@ -885,6 +897,7 @@
885897
B6D6DE3F24FADFAC00661A5F /* LaunchWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LaunchWindowController.h; sourceTree = "<group>"; };
886898
B6D6DE4024FADFAC00661A5F /* LaunchWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LaunchWindowController.m; sourceTree = "<group>"; };
887899
B6DD1FE725B407E6004A3242 /* maclc.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc.plist; sourceTree = "<group>"; };
900+
B6DD93942BB4F0FC00921359 /* Host.FST.po */ = {isa = PBXFileReference; lastKnownFileType = file; name = Host.FST.po; path = embedded/Host.FST.po; sourceTree = "<group>"; };
888901
B6DDECBD25057A550093587A /* drag-handle-4x10.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-handle-4x10.png"; sourceTree = "<group>"; };
889902
B6DDECBE25057A550093587A /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
890903
B6DDECBF25057A550093587A /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -1274,6 +1287,7 @@
12741287
B66236BD24FDA7EA006CABD7 /* Embedded Content */ = {
12751288
isa = PBXGroup;
12761289
children = (
1290+
B6DD93942BB4F0FC00921359 /* Host.FST.po */,
12771291
B63C1B8D25004C6D00511A71 /* mame-data.tgz */,
12781292
B66236B824FDA698006CABD7 /* mame64 */,
12791293
B635C09C26784A4800B23BFD /* Sparkle.framework */,
@@ -1495,6 +1509,7 @@
14951509
B6152B5C25F6F4F800605E6E /* ShellScript */,
14961510
B66236BB24FDA71D006CABD7 /* CopyFiles */,
14971511
B611BA3D26796483008597B5 /* ShellScript */,
1512+
B6DD93962BB4F5B700921359 /* CopyFiles */,
14981513
);
14991514
buildRules = (
15001515
);
@@ -1772,7 +1787,6 @@
17721787
B67878AD2B01732700CFACF2 /* macse30.plist in Resources */,
17731788
B67878E12B01732700CFACF2 /* elppa.plist in Resources */,
17741789
B66236C124FDB7A6006CABD7 /* Credits.rtf in Resources */,
1775-
B63C1B8E25004C6D00511A71 /* mame-data.tgz in Resources */,
17761790
B67878832B01732700CFACF2 /* hp9k332.plist in Resources */,
17771791
B678786E2B01732700CFACF2 /* apple2.plist in Resources */,
17781792
B67879232B0195DB00CFACF2 /* sun4_50.plist in Resources */,
@@ -2422,7 +2436,7 @@
24222436
CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
24232437
CODE_SIGN_STYLE = Automatic;
24242438
COMBINE_HIDPI_IMAGES = YES;
2425-
CURRENT_PROJECT_VERSION = 55;
2439+
CURRENT_PROJECT_VERSION = 56;
24262440
DEVELOPMENT_TEAM = 583V9CR5RE;
24272441
ENABLE_HARDENED_RUNTIME = YES;
24282442
FRAMEWORK_SEARCH_PATHS = (
@@ -2435,7 +2449,7 @@
24352449
"@executable_path/../Frameworks",
24362450
);
24372451
MACOSX_DEPLOYMENT_TARGET = 10.13;
2438-
MARKETING_VERSION = "0.263-u2";
2452+
MARKETING_VERSION = "0.264-u2";
24392453
PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
24402454
PRODUCT_NAME = "$(TARGET_NAME)";
24412455
};
@@ -2448,7 +2462,7 @@
24482462
CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
24492463
CODE_SIGN_STYLE = Automatic;
24502464
COMBINE_HIDPI_IMAGES = YES;
2451-
CURRENT_PROJECT_VERSION = 55;
2465+
CURRENT_PROJECT_VERSION = 56;
24522466
DEVELOPMENT_TEAM = 583V9CR5RE;
24532467
ENABLE_HARDENED_RUNTIME = YES;
24542468
FRAMEWORK_SEARCH_PATHS = (
@@ -2461,7 +2475,7 @@
24612475
"@executable_path/../Frameworks",
24622476
);
24632477
MACOSX_DEPLOYMENT_TARGET = 10.13;
2464-
MARKETING_VERSION = "0.263-u2";
2478+
MARKETING_VERSION = "0.264-u2";
24652479
PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
24662480
PRODUCT_NAME = "$(TARGET_NAME)";
24672481
};
@@ -2474,7 +2488,7 @@
24742488
CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
24752489
CODE_SIGN_STYLE = Automatic;
24762490
COMBINE_HIDPI_IMAGES = YES;
2477-
CURRENT_PROJECT_VERSION = 55;
2491+
CURRENT_PROJECT_VERSION = 56;
24782492
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
24792493
GCC_PREPROCESSOR_DEFINITIONS = (
24802494
"DEBUG=1",
@@ -2487,7 +2501,7 @@
24872501
"@executable_path/../Frameworks",
24882502
);
24892503
MACOSX_DEPLOYMENT_TARGET = 10.13;
2490-
MARKETING_VERSION = 0.263;
2504+
MARKETING_VERSION = 0.264;
24912505
PRODUCT_BUNDLE_IDENTIFIER = "com.ksherlock.ample-lite";
24922506
PRODUCT_NAME = "$(TARGET_NAME)";
24932507
};
@@ -2500,7 +2514,7 @@
25002514
CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
25012515
CODE_SIGN_STYLE = Automatic;
25022516
COMBINE_HIDPI_IMAGES = YES;
2503-
CURRENT_PROJECT_VERSION = 55;
2517+
CURRENT_PROJECT_VERSION = 56;
25042518
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
25052519
GCC_PREPROCESSOR_DEFINITIONS = "AMPLE_LITE=1";
25062520
INFOPLIST_FILE = Ample/Info.plist;
@@ -2509,7 +2523,7 @@
25092523
"@executable_path/../Frameworks",
25102524
);
25112525
MACOSX_DEPLOYMENT_TARGET = 10.13;
2512-
MARKETING_VERSION = 0.263;
2526+
MARKETING_VERSION = 0.264;
25132527
PRODUCT_BUNDLE_IDENTIFIER = "com.ksherlock.ample-lite";
25142528
PRODUCT_NAME = "$(TARGET_NAME)";
25152529
};

‎Ample/AppDelegate.m

+10-1
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,21 @@ -(BOOL)installMameComponents {
8888
NSDate *newDate = [defaults objectForKey: kMameComponentsDate];
8989
if (![newDate isKindOfClass: [NSDate class]])
9090
newDate = nil;
91-
91+
92+
93+
9294
if (!newDate) return YES; //????
9395
if (oldDate && [oldDate compare: newDate] >= 0) return YES;
9496

97+
#if 0
9598
NSString *path = [bundle pathForResource: @"mame-data" ofType: @"tgz"];
9699
if (!path) return YES; // Ample Lite?
100+
#endif
101+
102+
NSString *ssp = [bundle sharedSupportPath];
103+
NSString *path = [ssp stringByAppendingPathComponent: @"mame-data.tgz"];
104+
if (![[NSFileManager defaultManager] fileExistsAtPath: path])
105+
return YES; // Ample Lite?
97106

98107

99108
NSWindow *win = _installWindow;

‎Ample/Defaults.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>MameComponentsDate</key>
6-
<date>2024-02-29T12:00:00Z</date>
6+
<date>2024-03-27T12:00:00Z</date>
77
<key>UseCustomMame</key>
88
<false/>
99
<key>AutoCloseLogWindow</key>

‎embedded/Host.FST.po

800 KB
Binary file not shown.

0 commit comments

Comments
 (0)