Fix legacy build uitest (#41)

* change button title when user wants to change output dir * fix xcodeproj output dir is not saved to disk * save delete previous xcodeproj option to disk * fix recent document sometimes empty * use modulemap name for PRODUCT_NAME * bump version * code sign allowed if legacy build system * update project * update * bump version
wendyliga · Dec 16, 2021 · 2689fae · 2689fae
1 parent 2827d19
commit 2689fae
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.7.1
+<h2>Tulsi++ 0.7.1 🎅 </h2>
+<h4>Bug Fixes:</h4> 
+<ol> 
+    <li>fix fail building uitest on legacy build</li>
+</ol>
+
+----
+
 ## 0.7.0
 <h2>Tulsi++ 0.7.0 🎅 </h2>
 <h4>Bug Fixes:</h4> 

diff --git a/Tulsi.tulsiproj/Configs/Tulsi.tulsigen b/Tulsi.tulsiproj/Configs/Tulsi.tulsigen
@@ -26,6 +26,9 @@
     },
     "ProjectPrioritizesSwift" : {
       "p" : "YES"
+    },
+    "UseLegacyBuildSystem" : {
+      "p" : "YES"
     }
   },
   "projectName" : "Tulsi",

diff --git a/Tulsi.tulsiproj/wendy.liga.tulsiconf-user b/Tulsi.tulsiproj/wendy.liga.tulsiconf-user
@@ -0,0 +1,16 @@
+{
+  "optionSet" : {
+    "BazelPath" : {
+      "p" : "/opt/homebrew/Cellar/bazelisk/1.10.1/bin/bazelisk"
+    },
+    "DeletePreviousXcodeproj" : {
+      "p" : "YES"
+    },
+    "WorkspaceRootPath" : {
+      "p" : "/Users/wendy.liga/Developer/tulsi-plus-plus"
+    },
+    "XcodeprojOutputPath" : {
+      "p" : "/Users/wendy.liga/Developer/tulsi-plus-plus"
+    }
+  }
+}
diff --git a/Tulsi.tulsiproj/wendyliga.tulsiconf-user b/Tulsi.tulsiproj/wendyliga.tulsiconf-user
diff --git a/src/TulsiGenerator/PBXTargetGenerator.swift b/src/TulsiGenerator/PBXTargetGenerator.swift
@@ -781,7 +781,9 @@ final class PBXTargetGenerator: PBXTargetGeneratorProtocol {
     // Bazel takes care of signing the generated applications, so Xcode's signing must be disabled.
     buildSettings["CODE_SIGNING_REQUIRED"] = "NO"
     // as bazel takes care of signing the application, will silent error when using new build system `An empty identity is not valid when signing a binary for the product type 'Aplication'`
-    buildSettings["CODE_SIGNING_ALLOWED"] = "NO"
+    let useLegacyBuildSystem = options[.UseLegacyBuildSystem].commonValueAsBool == true
+    buildSettings["CODE_SIGNING_ALLOWED"] = useLegacyBuildSystem ? "YES" : "NO"
+
     buildSettings["CODE_SIGN_IDENTITY"] = ""
 
     // Explicitly setting the FRAMEWORK_SEARCH_PATHS will allow Xcode to resolve references to the
@@ -1683,8 +1685,8 @@ final class PBXTargetGenerator: PBXTargetGeneratorProtocol {
     // CODE_SIGNING_REQUIRED=NO so disable code signing and let bazel_build.py do the necessary
     // signing.
     if pbxTargetType == .AppClip {
-      buildSettings["CODE_SIGNING_ALLOWED"] = "NO"
-      buildSettings["CODE_SIGNING_ALLOWED"] = "NO"
+      let useLegacyBuildSystem = options[.UseLegacyBuildSystem].commonValueAsBool == true
+      buildSettings["CODE_SIGNING_ALLOWED"] = useLegacyBuildSystem ? "YES" : "NO"
     }
 
     // bazel_build.py uses this to determine if it needs to pass the --xcode_version flag, as the

diff --git a/version.bzl b/version.bzl
@@ -4,7 +4,7 @@
 # Version number (recorded into the Info.plist)
 TULSI_VERSION_MAJOR = "0"
 TULSI_VERSION_MINOR = "7"
-TULSI_VERSION_FIXLEVEL = "0"
+TULSI_VERSION_FIXLEVEL = "1"
 
 TULSI_VERSION_COPYRIGHT = "2021"
 TULSI_PRODUCT_NAME = "Tulsi++"