Merge pull request #185 from AquaGeek/release-configuration

Add release configuration

Author: mxcl

Sources/Xcodeproj/Module+PBXProj.swift

@@ -14,9 +14,9 @@
   1. Unique reference identifiers
   2. Human readable reference identifiers
   3. Stable reference identifiers
- 
+
  (as opposed to the generated UUIDs Xcode typically generates)
- 
+
  We create identifiers with a constant-length unique prefix and
  a unique suffix where the suffix is the filename or module name
  and since we guarantee uniqueness at the PackageDescription
@@ -29,7 +29,8 @@ import PackageType
 
 let rootObjectReference =                           "__RootObject_"
 let rootBuildConfigurationListReference =           "___RootConfs_"
-let rootBuildConfigurationReference =               "_______Debug_"
+let rootDebugBuildConfigurationReference =          "_______Debug_"
+let rootReleaseBuildConfigurationReference =        "_____Release_"
 let rootGroupReference =                            "___RootGroup_"
 let productsGroupReference =                        "____Products_"
 let testProductsGroupReference =                    "TestProducts_"
@@ -40,14 +41,15 @@ let sourceGroupFileRefPrefix =                      "__PBXFileRef_"
 let compilePhaseFileRefPrefix =                     "__src_cc_ref_"
 
 extension Module {
-    var dependencyReference: String        { return "__Dependency_\(c99name)" }
-    var productReference: String           { return "_____Product_\(c99name)" }
-    var targetReference: String            { return "______Target_\(c99name)" }
-    var groupReference: String             { return "_______Group_\(c99name)" }
-    var configurationListReference: String { return "_______Confs_\(c99name)" }
-    var configurationReference: String     { return "___DebugConf_\(c99name)" }
-    var compilePhaseReference: String      { return "CompilePhase_\(c99name)" }
-    var linkPhaseReference: String         { return "___LinkPhase_\(c99name)" }
+    var dependencyReference: String           { return "__Dependency_\(c99name)" }
+    var productReference: String              { return "_____Product_\(c99name)" }
+    var targetReference: String               { return "______Target_\(c99name)" }
+    var groupReference: String                { return "_______Group_\(c99name)" }
+    var configurationListReference: String    { return "_______Confs_\(c99name)" }
+    var debugConfigurationReference: String   { return "___DebugConf_\(c99name)" }
+    var releaseConfigurationReference: String { return "_ReleaseConf_\(c99name)" }
+    var compilePhaseReference: String         { return "CompilePhase_\(c99name)" }
+    var linkPhaseReference: String            { return "___LinkPhase_\(c99name)" }
 }
 
 func fileRef(forLinkPhaseChild module: Module) -> String {
@@ -139,12 +141,23 @@ extension SwiftModule {
         }
     }
 
-    var buildSettings: String {
+    var debugBuildSettings: String {
+        var buildSettings = commonBuildSettings
+        buildSettings["SWIFT_OPTIMIZATION_LEVEL"] = "-Onone"
+
+        return buildSettings.map{ "\($0) = \($1);" }.joined(separator: " ")
+    }
+
+    var releaseBuildSettings: String {
+        let buildSettings = commonBuildSettings
+        return buildSettings.map{ "\($0) = \($1);" }.joined(separator: " ")
+    }
+
+    private var commonBuildSettings: [String: String] {
         var buildSettings = ["PRODUCT_NAME": productName]
         buildSettings["PRODUCT_MODULE_NAME"] = c99name
         buildSettings["OTHER_SWIFT_FLAGS"] = "-DXcode"
         buildSettings["MACOSX_DEPLOYMENT_TARGET"] = "'10.10'"
-        buildSettings["SWIFT_OPTIMIZATION_LEVEL"] = "-Onone"
 
         // prevents Xcode project upgrade warnings
         buildSettings["COMBINE_HIDPI_IMAGES"] = "YES"
@@ -176,7 +189,7 @@ extension SwiftModule {
             }
         }
 
-        return buildSettings.map{ "\($0) = \($1);" }.joined(separator: " ")
+        return buildSettings
     }
 }
 

Sources/Xcodeproj/TODO.md

@@ -5,6 +5,5 @@ The following features are welcome, please submit a PR:
 * Split out tests and non-tests in Products group
 * Enable code coverage
 * Allow frameworks instead of dylibs and add a command line toggle
-* Release configuration
 * Nest Groups for module sources, eg. Sources/Bar/Foo/Baz.swift would be in Xcode groups: Source -> Bar -> Foo -> Baz.swift
 * Put dependencies in Package-named sub groups of a group called "Dependencies"

Sources/Xcodeproj/pbxproj().swift

@@ -119,15 +119,20 @@ public func pbxproj(srcroot srcroot: String, projectRoot: String, modules: [Swif
         // the target build configuration
         print("        \(module.configurationListReference) = {")
         print("            isa = XCConfigurationList;")
-        print("            buildConfigurations = (\(module.configurationReference));")
+        print("            buildConfigurations = (\(module.debugConfigurationReference), \(module.releaseConfigurationReference));")
         print("            defaultConfigurationIsVisible = 0;")
         print("            defaultConfigurationName = Debug;")
         print("        };")
-        print("        \(module.configurationReference) = {")
+        print("        \(module.debugConfigurationReference) = {")
         print("            isa = XCBuildConfiguration;")
-        print("            buildSettings = { \(module.buildSettings) };")
+        print("            buildSettings = { \(module.debugBuildSettings) };")
         print("            name = Debug;")
         print("        };")
+        print("        \(module.releaseConfigurationReference) = {")
+        print("            isa = XCBuildConfiguration;")
+        print("            buildSettings = { \(module.releaseBuildSettings) };")
+        print("            name = Release;")
+        print("        };")
 
         //TODO ^^ probably can consolidate this into the three kinds
         //TODO we use rather than have one per module
@@ -189,19 +194,24 @@ public func pbxproj(srcroot srcroot: String, projectRoot: String, modules: [Swif
     print("        };")
 
 ////// primary build configurations
-    print("        \(rootBuildConfigurationReference) = {")
+    print("        \(rootDebugBuildConfigurationReference) = {")
     print("            isa = XCBuildConfiguration;")
     print("            buildSettings = {};")
     print("            name = Debug;")
     print("        };")
+    print("        \(rootReleaseBuildConfigurationReference) = {")
+    print("            isa = XCBuildConfiguration;")
+    print("            buildSettings = {};")
+    print("            name = Release;")
+    print("        };")
     print("        \(rootBuildConfigurationListReference) = {")
     print("            isa = XCConfigurationList;")
-    print("            buildConfigurations = (\(rootBuildConfigurationReference));")
+    print("            buildConfigurations = (\(rootDebugBuildConfigurationReference), \(rootReleaseBuildConfigurationReference));")
     print("            defaultConfigurationIsVisible = 0;")
     print("            defaultConfigurationName = Debug;")
     print("        };")
     print("    };")
-    
+
 ////// done!
     print("}")
 }

Tests/Xcodeproj/TestGeneration.swift

@@ -58,7 +58,7 @@ class TestGeneration: XCTestCase {
 
             let output = try popen(["xcodebuild", "-list", "-project", outpath])
 
-            let expectedOutput = "Information about project \"DummyProjectName\":\n    Targets:\n        DummyModuleName\n\n    Build Configurations:\n        Debug\n\n    If no build configuration is specified and -scheme is not passed then \"Debug\" is used.\n\n    Schemes:\n        DummyProjectName\n"
+            let expectedOutput = "Information about project \"DummyProjectName\":\n    Targets:\n        DummyModuleName\n\n    Build Configurations:\n        Debug\n        Release\n\n    If no build configuration is specified and -scheme is not passed then \"Debug\" is used.\n\n    Schemes:\n        DummyProjectName\n"
 
             XCTAssertEqual(output, expectedOutput)
         }