Skip to content

Commit fdb5744

Browse files
cmyrcmyr
committed
Fixup info.plist & related
- tweak placeholder text - stop exporting headers (This was preventing us from creating an app archive :?) - fix duplicate scheme issue
1 parent 3f3885a commit fdb5744

File tree

4 files changed

+32
-22
lines changed

4 files changed

+32
-22
lines changed

‎RustPlayground/RustPlayground.xcodeproj/project.pbxproj

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
6018ED18225FB15600B5DF38 /* Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6018ED17225FB15600B5DF38 /* Style.swift */; };
1111
603B05992272068F00FBD7FC /* libximodal.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = 603B05982272068F00FBD7FC /* libximodal.a */; };
1212
603B059B227206C200FBD7FC /* libplayground.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = 603B059A227206C200FBD7FC /* libplayground.a */; };
13+
603B059C2272413700FBD7FC /* libximodal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 609A225F22404CF900A3F007 /* libximodal.a */; };
1314
604B0F6022405C88007038E6 /* XiCoreProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 604B0F5F22405C88007038E6 /* XiCoreProxy.swift */; };
14-
604C7ACC226E572C00F6B277 /* playground.h in Headers */ = {isa = PBXBuildFile; fileRef = 604C7ACB226E572C00F6B277 /* playground.h */; settings = {ATTRIBUTES = (Public, ); }; };
15+
604C7ACC226E572C00F6B277 /* playground.h in Headers */ = {isa = PBXBuildFile; fileRef = 604C7ACB226E572C00F6B277 /* playground.h */; };
1516
604C7ACE226E582C00F6B277 /* libplayground.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 604C7AC7226E56DC00F6B277 /* libplayground.a */; };
1617
604C7AD0226E597700F6B277 /* Playground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 604C7ACF226E597700F6B277 /* Playground.swift */; };
1718
604C7ADB226F60FA00F6B277 /* CompilerTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 604C7ADA226F60FA00F6B277 /* CompilerTask.swift */; };
@@ -23,11 +24,10 @@
2324
606644FE223FFED9006215A0 /* ModalInputTestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 606644FD223FFED9006215A0 /* ModalInputTestTests.swift */; };
2425
608A1D4022657604001A79EB /* MainPlaygroundViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608A1D3F22657604001A79EB /* MainPlaygroundViewController.swift */; };
2526
608A1D42226627D2001A79EB /* OutputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608A1D41226627D2001A79EB /* OutputViewController.swift */; };
26-
609A22672240504100A3F007 /* libximodal.h in Headers */ = {isa = PBXBuildFile; fileRef = 609A22662240504100A3F007 /* libximodal.h */; settings = {ATTRIBUTES = (Public, ); }; };
27+
609A22672240504100A3F007 /* libximodal.h in Headers */ = {isa = PBXBuildFile; fileRef = 609A22662240504100A3F007 /* libximodal.h */; };
2728
60A91D1522650D0100240CC6 /* Runner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60A91D1422650D0100240CC6 /* Runner.swift */; };
2829
60A91D172265115E00240CC6 /* BundleResources.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60A91D162265115E00240CC6 /* BundleResources.swift */; };
2930
60BF2285225012DD002C0352 /* EditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60BF2284225012DD002C0352 /* EditView.swift */; };
30-
60BF2286225511BD002C0352 /* libximodal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 609A225F22404CF900A3F007 /* libximodal.a */; };
3131
60CC174F224591840075FDE5 /* XiWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60CC174E224591840075FDE5 /* XiWindow.swift */; };
3232
60D05FAD226A7ED10045615B /* PreferencesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60D05FAC226A7ED10045615B /* PreferencesWindowController.swift */; };
3333
60D05FAF226B9B410045615B /* PreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60D05FAE226B9B410045615B /* PreferencesViewController.swift */; };
@@ -95,7 +95,7 @@
9595
604C7AD5226E654400F6B277 /* libcurl.3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcurl.3.tbd; path = usr/lib/libcurl.3.tbd; sourceTree = SDKROOT; };
9696
604C7ADA226F60FA00F6B277 /* CompilerTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompilerTask.swift; sourceTree = "<group>"; };
9797
604C7ADC22710CA600F6B277 /* MissingRustupInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MissingRustupInfoView.swift; sourceTree = "<group>"; };
98-
606644E7223FFED7006215A0 /* RustPlayground.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RustPlayground.app; sourceTree = BUILT_PRODUCTS_DIR; };
98+
606644E7223FFED7006215A0 /* Rust Playground.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Rust Playground.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9999
606644EA223FFED7006215A0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
100100
606644EC223FFED7006215A0 /* EditViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditViewController.swift; sourceTree = "<group>"; };
101101
606644EE223FFED8006215A0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -124,7 +124,7 @@
124124
isa = PBXFrameworksBuildPhase;
125125
buildActionMask = 2147483647;
126126
files = (
127-
60BF2286225511BD002C0352 /* libximodal.a in Frameworks */,
127+
603B059C2272413700FBD7FC /* libximodal.a in Frameworks */,
128128
604C7ACE226E582C00F6B277 /* libplayground.a in Frameworks */,
129129
);
130130
runOnlyForDeploymentPostprocessing = 0;
@@ -168,7 +168,7 @@
168168
606644E8223FFED7006215A0 /* Products */ = {
169169
isa = PBXGroup;
170170
children = (
171-
606644E7223FFED7006215A0 /* RustPlayground.app */,
171+
606644E7223FFED7006215A0 /* Rust Playground.app */,
172172
606644F9223FFED9006215A0 /* RustPlaygroundTests.xctest */,
173173
609A225F22404CF900A3F007 /* libximodal.a */,
174174
604C7AC7226E56DC00F6B277 /* libplayground.a */,
@@ -275,7 +275,7 @@
275275
);
276276
name = RustPlayground;
277277
productName = ModalInputTest;
278-
productReference = 606644E7223FFED7006215A0 /* RustPlayground.app */;
278+
productReference = 606644E7223FFED7006215A0 /* Rust Playground.app */;
279279
productType = "com.apple.product-type.application";
280280
};
281281
606644F8223FFED9006215A0 /* RustPlaygroundTests */ = {
@@ -562,6 +562,7 @@
562562
MTL_FAST_MATH = YES;
563563
ONLY_ACTIVE_ARCH = YES;
564564
SDKROOT = macosx;
565+
SKIP_INSTALL = YES;
565566
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
566567
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
567568
};
@@ -616,6 +617,7 @@
616617
MTL_ENABLE_DEBUG_INFO = NO;
617618
MTL_FAST_MATH = YES;
618619
SDKROOT = macosx;
620+
SKIP_INSTALL = YES;
619621
SWIFT_COMPILATION_MODE = wholemodule;
620622
SWIFT_OPTIMIZATION_LEVEL = "-O";
621623
};
@@ -628,7 +630,7 @@
628630
CLANG_ENABLE_MODULES = YES;
629631
CODE_SIGN_STYLE = Automatic;
630632
COMBINE_HIDPI_IMAGES = YES;
631-
INFOPLIST_FILE = "$(SRCROOT)/RustPlayground/Assets/Info.plist";
633+
INFOPLIST_FILE = RustPlayground/Assets/Info.plist;
632634
LD_RUNPATH_SEARCH_PATHS = (
633635
"$(inherited)",
634636
"@executable_path/../Frameworks",
@@ -637,8 +639,10 @@
637639
"$(inherited)",
638640
"${BUILT_PRODUCTS_DIR}",
639641
);
640-
PRODUCT_BUNDLE_IDENTIFIER = net.cmyr.ModalInputTest;
641-
PRODUCT_NAME = "$(TARGET_NAME)";
642+
PRODUCT_BUNDLE_IDENTIFIER = net.cmyr.RustPlayground;
643+
PRODUCT_MODULE_NAME = RustPlayground;
644+
PRODUCT_NAME = "Rust Playground";
645+
SKIP_INSTALL = NO;
642646
SWIFT_OBJC_BRIDGING_HEADER = "ModalInputTest-Bridging-Header.h";
643647
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
644648
SWIFT_VERSION = 5.0;
@@ -652,7 +656,7 @@
652656
CLANG_ENABLE_MODULES = YES;
653657
CODE_SIGN_STYLE = Automatic;
654658
COMBINE_HIDPI_IMAGES = YES;
655-
INFOPLIST_FILE = "$(SRCROOT)/RustPlayground/Assets/Info.plist";
659+
INFOPLIST_FILE = RustPlayground/Assets/Info.plist;
656660
LD_RUNPATH_SEARCH_PATHS = (
657661
"$(inherited)",
658662
"@executable_path/../Frameworks",
@@ -661,8 +665,10 @@
661665
"$(inherited)",
662666
"${BUILT_PRODUCTS_DIR}",
663667
);
664-
PRODUCT_BUNDLE_IDENTIFIER = net.cmyr.ModalInputTest;
665-
PRODUCT_NAME = "$(TARGET_NAME)";
668+
PRODUCT_BUNDLE_IDENTIFIER = net.cmyr.RustPlayground;
669+
PRODUCT_MODULE_NAME = RustPlayground;
670+
PRODUCT_NAME = "Rust Playground";
671+
SKIP_INSTALL = NO;
666672
SWIFT_OBJC_BRIDGING_HEADER = "ModalInputTest-Bridging-Header.h";
667673
SWIFT_VERSION = 5.0;
668674
};

‎RustPlayground/RustPlayground.xcodeproj/xcshareddata/xcschemes/ModalInputTest.xcscheme renamed to ‎RustPlayground/RustPlayground.xcodeproj/xcshareddata/xcschemes/RustPlayground.xcscheme

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "606644E6223FFED7006215A0"
18-
BuildableName = "RustPlayground.app"
18+
BuildableName = "Rust Playground.app"
1919
BlueprintName = "RustPlayground"
2020
ReferencedContainer = "container:RustPlayground.xcodeproj">
2121
</BuildableReference>
@@ -43,7 +43,7 @@
4343
<BuildableReference
4444
BuildableIdentifier = "primary"
4545
BlueprintIdentifier = "606644E6223FFED7006215A0"
46-
BuildableName = "RustPlayground.app"
46+
BuildableName = "Rust Playground.app"
4747
BlueprintName = "RustPlayground"
4848
ReferencedContainer = "container:RustPlayground.xcodeproj">
4949
</BuildableReference>
@@ -66,7 +66,7 @@
6666
<BuildableReference
6767
BuildableIdentifier = "primary"
6868
BlueprintIdentifier = "606644E6223FFED7006215A0"
69-
BuildableName = "RustPlayground.app"
69+
BuildableName = "Rust Playground.app"
7070
BlueprintName = "RustPlayground"
7171
ReferencedContainer = "container:RustPlayground.xcodeproj">
7272
</BuildableReference>
@@ -102,7 +102,7 @@
102102
<BuildableReference
103103
BuildableIdentifier = "primary"
104104
BlueprintIdentifier = "606644E6223FFED7006215A0"
105-
BuildableName = "RustPlayground.app"
105+
BuildableName = "Rust Playground.app"
106106
BlueprintName = "RustPlayground"
107107
ReferencedContainer = "container:RustPlayground.xcodeproj">
108108
</BuildableReference>

‎RustPlayground/RustPlayground/AppDelegate.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
119119

120120
func insertPlaceholderText() {
121121
let placeholderProgram = """
122-
//! Welcome to Rust Playground!
122+
//! Welcome to the Rust Playground!
123123
//!
124124
//! To use external crates, start a line with:
125-
//! '//~' + 'use crate = "1.0".
126-
//! (The version is optional; we default to the latest)
127-
125+
//! '//~ use crate [= "1.0"]'
128126
127+
// Equivalent to `rand = "*"` in Cargo.toml:
128+
//
129129
//~ use rand
130130
131131
fn main() {

‎RustPlayground/RustPlayground/Assets/Info.plist

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
66
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>Rust Playground</string>
79
<key>CFBundleExecutable</key>
810
<string>$(EXECUTABLE_NAME)</string>
911
<key>CFBundleIconFile</key>
@@ -17,9 +19,11 @@
1719
<key>CFBundlePackageType</key>
1820
<string>APPL</string>
1921
<key>CFBundleShortVersionString</key>
20-
<string>1.0</string>
22+
<string>0.1</string>
2123
<key>CFBundleVersion</key>
2224
<string>1</string>
25+
<key>LSApplicationCategoryType</key>
26+
<string>public.app-category.developer-tools</string>
2327
<key>LSMinimumSystemVersion</key>
2428
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2529
<key>NSHumanReadableCopyright</key>

0 commit comments

Comments
 (0)