C: Fix ios.Storyboards to allow the storyboard files to be optional

jamplus · Feb 27, 2017 · 04de325 · 04de325
1 parent 1f66e07
commit 04de325
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bin/modules/c/toolchain/clang/ios-shared.jam b/bin/modules/c/toolchain/clang/ios-shared.jam
@@ -1342,8 +1342,12 @@ rule ios.Storyboards TARGET : LANGUAGE_DIRECTORY : STORYBOARD_FILES {
     SEARCH on $(storyboards) = $(LANGUAGE_DIRECTORY) ;
     ios.Storyboard $(TARGET) : $(storyboards) ;
 
-    ios.BundleInfoString : UILaunchStoryboardName : $(STORYBOARD_FILES[1]) ;
-    ios.BundleInfoString : UIMainStoryboardFile : $(STORYBOARD_FILES[2]) ;
+    if $(STORYBOARD_FILES[1]) {
+        ios.BundleInfoString : UILaunchStoryboardName : $(STORYBOARD_FILES[1]) ;
+    }
+    if $(STORYBOARD_FILES[2]) {
+        ios.BundleInfoString : UIMainStoryboardFile : $(STORYBOARD_FILES[2]) ;
+    }
 }
 
 

diff --git a/docs/module_ios.dox b/docs/module_ios.dox
@@ -756,7 +756,7 @@ Sets the iOS \c SDK_VERSION for the toolchain. Call this before any other <tt>io
 
 
 <hr>
-\section rule_ios_Storyboards rule ios.Storyboards TARGET : LANGUAGE_DIRECTORY : STORYBOARD_FILES
+\section rule_ios_Storyboards rule ios.Storyboards TARGET : LANGUAGE_DIRECTORY [ : STORYBOARD_FILES ]
 \addindex rule_ios_AssetCatalog
 
 Compiles a directory of storyboards.