Skip to content

Commit

Permalink
Fixup info.plist & related
Browse files Browse the repository at this point in the history 
- tweak placeholder text
- stop exporting headers (This was preventing us from creating an
app archive :?)
- fix duplicate scheme issue
  • Loading branch information
@cmyr
cmyr committed Apr 25, 2019
1 parent 3f3885a commit fdb5744
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 22 deletions.
32 changes: 19 additions & 13 deletions RustPlayground/RustPlayground.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
6018ED18225FB15600B5DF38 /* Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6018ED17225FB15600B5DF38 /* Style.swift */; };
603B05992272068F00FBD7FC /* libximodal.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = 603B05982272068F00FBD7FC /* libximodal.a */; };
603B059B227206C200FBD7FC /* libplayground.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = 603B059A227206C200FBD7FC /* libplayground.a */; };
603B059C2272413700FBD7FC /* libximodal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 609A225F22404CF900A3F007 /* libximodal.a */; };
604B0F6022405C88007038E6 /* XiCoreProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 604B0F5F22405C88007038E6 /* XiCoreProxy.swift */; };
604C7ACC226E572C00F6B277 /* playground.h in Headers */ = {isa = PBXBuildFile; fileRef = 604C7ACB226E572C00F6B277 /* playground.h */; settings = {ATTRIBUTES = (Public, ); }; };
604C7ACC226E572C00F6B277 /* playground.h in Headers */ = {isa = PBXBuildFile; fileRef = 604C7ACB226E572C00F6B277 /* playground.h */; };
604C7ACE226E582C00F6B277 /* libplayground.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 604C7AC7226E56DC00F6B277 /* libplayground.a */; };
604C7AD0226E597700F6B277 /* Playground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 604C7ACF226E597700F6B277 /* Playground.swift */; };
604C7ADB226F60FA00F6B277 /* CompilerTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 604C7ADA226F60FA00F6B277 /* CompilerTask.swift */; };
Expand All @@ -23,11 +24,10 @@
606644FE223FFED9006215A0 /* ModalInputTestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 606644FD223FFED9006215A0 /* ModalInputTestTests.swift */; };
608A1D4022657604001A79EB /* MainPlaygroundViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608A1D3F22657604001A79EB /* MainPlaygroundViewController.swift */; };
608A1D42226627D2001A79EB /* OutputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608A1D41226627D2001A79EB /* OutputViewController.swift */; };
609A22672240504100A3F007 /* libximodal.h in Headers */ = {isa = PBXBuildFile; fileRef = 609A22662240504100A3F007 /* libximodal.h */; settings = {ATTRIBUTES = (Public, ); }; };
609A22672240504100A3F007 /* libximodal.h in Headers */ = {isa = PBXBuildFile; fileRef = 609A22662240504100A3F007 /* libximodal.h */; };
60A91D1522650D0100240CC6 /* Runner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60A91D1422650D0100240CC6 /* Runner.swift */; };
60A91D172265115E00240CC6 /* BundleResources.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60A91D162265115E00240CC6 /* BundleResources.swift */; };
60BF2285225012DD002C0352 /* EditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60BF2284225012DD002C0352 /* EditView.swift */; };
60BF2286225511BD002C0352 /* libximodal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 609A225F22404CF900A3F007 /* libximodal.a */; };
60CC174F224591840075FDE5 /* XiWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60CC174E224591840075FDE5 /* XiWindow.swift */; };
60D05FAD226A7ED10045615B /* PreferencesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60D05FAC226A7ED10045615B /* PreferencesWindowController.swift */; };
60D05FAF226B9B410045615B /* PreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60D05FAE226B9B410045615B /* PreferencesViewController.swift */; };
Expand Down Expand Up @@ -95,7 +95,7 @@
604C7AD5226E654400F6B277 /* libcurl.3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcurl.3.tbd; path = usr/lib/libcurl.3.tbd; sourceTree = SDKROOT; };
604C7ADA226F60FA00F6B277 /* CompilerTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompilerTask.swift; sourceTree = "<group>"; };
604C7ADC22710CA600F6B277 /* MissingRustupInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MissingRustupInfoView.swift; sourceTree = "<group>"; };
606644E7223FFED7006215A0 /* RustPlayground.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RustPlayground.app; sourceTree = BUILT_PRODUCTS_DIR; };
606644E7223FFED7006215A0 /* Rust Playground.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Rust Playground.app"; sourceTree = BUILT_PRODUCTS_DIR; };
606644EA223FFED7006215A0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
606644EC223FFED7006215A0 /* EditViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditViewController.swift; sourceTree = "<group>"; };
606644EE223FFED8006215A0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand Down Expand Up @@ -124,7 +124,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
60BF2286225511BD002C0352 /* libximodal.a in Frameworks */,
603B059C2272413700FBD7FC /* libximodal.a in Frameworks */,
604C7ACE226E582C00F6B277 /* libplayground.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -168,7 +168,7 @@
606644E8223FFED7006215A0 /* Products */ = {
isa = PBXGroup;
children = (
606644E7223FFED7006215A0 /* RustPlayground.app */,
606644E7223FFED7006215A0 /* Rust Playground.app */,
606644F9223FFED9006215A0 /* RustPlaygroundTests.xctest */,
609A225F22404CF900A3F007 /* libximodal.a */,
604C7AC7226E56DC00F6B277 /* libplayground.a */,
Expand Down Expand Up @@ -275,7 +275,7 @@
);
name = RustPlayground;
productName = ModalInputTest;
productReference = 606644E7223FFED7006215A0 /* RustPlayground.app */;
productReference = 606644E7223FFED7006215A0 /* Rust Playground.app */;
productType = "com.apple.product-type.application";
};
606644F8223FFED9006215A0 /* RustPlaygroundTests */ = {
Expand Down Expand Up @@ -562,6 +562,7 @@
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand Down Expand Up @@ -616,6 +617,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
};
Expand All @@ -628,7 +630,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "$(SRCROOT)/RustPlayground/Assets/Info.plist";
INFOPLIST_FILE = RustPlayground/Assets/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
Expand All @@ -637,8 +639,10 @@
"$(inherited)",
"${BUILT_PRODUCTS_DIR}",
);
PRODUCT_BUNDLE_IDENTIFIER = net.cmyr.ModalInputTest;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = net.cmyr.RustPlayground;
PRODUCT_MODULE_NAME = RustPlayground;
PRODUCT_NAME = "Rust Playground";
SKIP_INSTALL = NO;
SWIFT_OBJC_BRIDGING_HEADER = "ModalInputTest-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -652,7 +656,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "$(SRCROOT)/RustPlayground/Assets/Info.plist";
INFOPLIST_FILE = RustPlayground/Assets/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
Expand All @@ -661,8 +665,10 @@
"$(inherited)",
"${BUILT_PRODUCTS_DIR}",
);
PRODUCT_BUNDLE_IDENTIFIER = net.cmyr.ModalInputTest;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = net.cmyr.RustPlayground;
PRODUCT_MODULE_NAME = RustPlayground;
PRODUCT_NAME = "Rust Playground";
SKIP_INSTALL = NO;
SWIFT_OBJC_BRIDGING_HEADER = "ModalInputTest-Bridging-Header.h";
SWIFT_VERSION = 5.0;
};
Expand Down
8 changes: 4 additions & 4 deletions ...reddata/xcschemes/ModalInputTest.xcscheme → ...reddata/xcschemes/RustPlayground.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "606644E6223FFED7006215A0"
BuildableName = "RustPlayground.app"
BuildableName = "Rust Playground.app"
BlueprintName = "RustPlayground"
ReferencedContainer = "container:RustPlayground.xcodeproj">
</BuildableReference>
Expand Down Expand Up @@ -43,7 +43,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "606644E6223FFED7006215A0"
BuildableName = "RustPlayground.app"
BuildableName = "Rust Playground.app"
BlueprintName = "RustPlayground"
ReferencedContainer = "container:RustPlayground.xcodeproj">
</BuildableReference>
Expand All @@ -66,7 +66,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "606644E6223FFED7006215A0"
BuildableName = "RustPlayground.app"
BuildableName = "Rust Playground.app"
BlueprintName = "RustPlayground"
ReferencedContainer = "container:RustPlayground.xcodeproj">
</BuildableReference>
Expand Down Expand Up @@ -102,7 +102,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "606644E6223FFED7006215A0"
BuildableName = "RustPlayground.app"
BuildableName = "Rust Playground.app"
BlueprintName = "RustPlayground"
ReferencedContainer = "container:RustPlayground.xcodeproj">
</BuildableReference>
Expand Down
8 changes: 4 additions & 4 deletions RustPlayground/RustPlayground/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {

func insertPlaceholderText() {
let placeholderProgram = """
//! Welcome to Rust Playground!
//! Welcome to the Rust Playground!
//!
//! To use external crates, start a line with:
//! '//~' + 'use crate = "1.0".
//! (The version is optional; we default to the latest)
//! '//~ use crate [= "1.0"]'
// Equivalent to `rand = "*"` in Cargo.toml:
//
//~ use rand
fn main() {
Expand Down
6 changes: 5 additions & 1 deletion RustPlayground/RustPlayground/Assets/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Rust Playground</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIconFile</key>
Expand All @@ -17,9 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>0.1</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
Expand Down

0 comments on commit fdb5744

Please # to comment.