From ebd6a7b0bba50a415f8ea703165b0bf8b8e24b7a Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Thu, 10 Jan 2019 16:58:13 +0000
Subject: [PATCH] Projucer:  Don't add ".storyboard" extension when adding the
 launch storyboard name to the plist

---
 examples/DemoRunner/Builds/iOS/Info-App.plist             | 2 +-
 extras/AudioPerformanceTest/Builds/iOS/Info-App.plist     | 2 +-
 extras/AudioPluginHost/Builds/iOS/Info-App.plist          | 2 +-
 extras/NetworkGraphicsDemo/Builds/iOS/Info-App.plist      | 2 +-
 .../Source/ProjectSaving/jucer_ProjectExport_Xcode.h      | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/DemoRunner/Builds/iOS/Info-App.plist b/examples/DemoRunner/Builds/iOS/Info-App.plist
index ddbf99d224..42cc8a027a 100644
--- a/examples/DemoRunner/Builds/iOS/Info-App.plist
+++ b/examples/DemoRunner/Builds/iOS/Info-App.plist
@@ -12,7 +12,7 @@
     <key>UIViewControllerBasedStatusBarAppearance</key>
     <false/>
     <key>UILaunchStoryboardName</key>
-    <string>LaunchScreen.storyboard</string>
+    <string>LaunchScreen</string>
     <key>CFBundleExecutable</key>
     <string>${EXECUTABLE_NAME}</string>
     <key>CFBundleIdentifier</key>
diff --git a/extras/AudioPerformanceTest/Builds/iOS/Info-App.plist b/extras/AudioPerformanceTest/Builds/iOS/Info-App.plist
index 2126fac824..0834f3fb46 100644
--- a/extras/AudioPerformanceTest/Builds/iOS/Info-App.plist
+++ b/extras/AudioPerformanceTest/Builds/iOS/Info-App.plist
@@ -8,7 +8,7 @@
     <key>UIViewControllerBasedStatusBarAppearance</key>
     <false/>
     <key>UILaunchStoryboardName</key>
-    <string>LaunchScreen.storyboard</string>
+    <string>LaunchScreen</string>
     <key>CFBundleExecutable</key>
     <string>${EXECUTABLE_NAME}</string>
     <key>CFBundleIdentifier</key>
diff --git a/extras/AudioPluginHost/Builds/iOS/Info-App.plist b/extras/AudioPluginHost/Builds/iOS/Info-App.plist
index ce22cadc4e..6d0ce7492e 100644
--- a/extras/AudioPluginHost/Builds/iOS/Info-App.plist
+++ b/extras/AudioPluginHost/Builds/iOS/Info-App.plist
@@ -10,7 +10,7 @@
     <key>UIViewControllerBasedStatusBarAppearance</key>
     <false/>
     <key>UILaunchStoryboardName</key>
-    <string>LaunchScreen.storyboard</string>
+    <string>LaunchScreen</string>
     <key>CFBundleExecutable</key>
     <string>${EXECUTABLE_NAME}</string>
     <key>CFBundleIdentifier</key>
diff --git a/extras/NetworkGraphicsDemo/Builds/iOS/Info-App.plist b/extras/NetworkGraphicsDemo/Builds/iOS/Info-App.plist
index 834c3ad85a..72c9f8a7ab 100644
--- a/extras/NetworkGraphicsDemo/Builds/iOS/Info-App.plist
+++ b/extras/NetworkGraphicsDemo/Builds/iOS/Info-App.plist
@@ -8,7 +8,7 @@
     <key>UIViewControllerBasedStatusBarAppearance</key>
     <false/>
     <key>UILaunchStoryboardName</key>
-    <string>LaunchScreen.storyboard</string>
+    <string>LaunchScreen</string>
     <key>CFBundleExecutable</key>
     <string>${EXECUTABLE_NAME}</string>
     <key>CFBundleIdentifier</key>
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
index 0ff39a5764..09703b6511 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
@@ -155,7 +155,7 @@ public:
     String getIosDevelopmentTeamIDString() const     { return iosDevelopmentTeamIDValue.get(); }
     String getAppGroupIdString() const               { return iosAppGroupsIDValue.get(); }
 
-    String getDefaultLaunchStoryboardName() const    { jassert (iOS); return "LaunchScreen.storyboard"; }
+    String getDefaultLaunchStoryboardName() const    { jassert (iOS); return "LaunchScreen"; }
 
     //==============================================================================
     bool usesMMFiles() const override                       { return true; }
@@ -213,8 +213,8 @@ public:
 
             props.add (new TextPropertyComponent (customLaunchStoryboardValue, "Custom Launch Storyboard", 256, false),
                        "If this field is not empty then the specified launch storyboard will be used for the app's launch screen, "
-                       "otherwise a default blank launch storyboard will be generated. This should just be the file name and the "
-                       "file should be added to the project's Xcode resources.");
+                       "otherwise a default blank launch storyboard will be generated. This should be the filename without the "
+                       "\".storyboard\" extension and the file should be added to the project's Xcode resources.");
         }
 
         props.add (new TextPropertyComponent (customXcodeResourceFoldersValue, "Custom Xcode Resource Folders", 8192, true),
@@ -3423,7 +3423,7 @@ private:
 
     void writeDefaultLaunchStoryboardFile() const
     {
-        auto storyboardFile = getTargetFolder().getChildFile (getDefaultLaunchStoryboardName());
+        auto storyboardFile = getTargetFolder().getChildFile (getDefaultLaunchStoryboardName() + ".storyboard");
 
         MemoryOutputStream mo;
         mo.setNewLineString ("\n");