Build time RPATH check & Reinstate EvalApp eexample

johnno1962 · Sep 30, 2020 · b97fee4 · b97fee4
1 parent 09e3b9a
commit b97fee4
Show file tree

Hide file tree

Showing 8 changed files with 181 additions and 21 deletions.
diff --git a/EvalApp/AppDelegate.swift b/EvalApp/AppDelegate.swift
@@ -34,7 +34,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
  // Insert code here to initialize your application
  SwiftEval.instance.evalError = {
  let err = $0
- if !err.hasPrefix("Compiling ") {
+ if !err.hasPrefix("💉 Compiling ") {
  DispatchQueue.main.async {
  self.textView.string = err
  }

diff --git a/EvalApp/Assets.xcassets/Contents.json b/EvalApp/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/EvalApp/EvalApp.entitlements b/EvalApp/EvalApp.entitlements
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+ <key>com.apple.security.cs.disable-library-validation</key>
+ <true/>
+</dict>
 </plist>
diff --git a/EvalApp/Info.plist b/EvalApp/Info.plist
@@ -7,7 +7,7 @@
  <key>CFBundleExecutable</key>
  <string>$(EXECUTABLE_NAME)</string>
  <key>CFBundleIconFile</key>
- <string></string>
+ <string>App.icns</string>
  <key>CFBundleIdentifier</key>
  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
  <key>CFBundleInfoDictionaryVersion</key>

diff --git a/InjectionBundle/SwiftEval.swift b/InjectionBundle/SwiftEval.swift
@@ -5,7 +5,7 @@
 // Created by John Holdsworth on 02/11/2017.
 // Copyright © 2017 John Holdsworth. All rights reserved.
 //
-// $Id: //depot/ResidentEval/InjectionBundle/SwiftEval.swift#139 $
+// $Id: //depot/ResidentEval/InjectionBundle/SwiftEval.swift#144 $
 //
 // Basic implementation of a Swift "eval()" including the
 // mechanics of recompiling a class and loading the new
@@ -375,13 +375,13 @@ public class SwiftEval: NSObject {
 
  let projectDir = projectFile.deletingLastPathComponent().path
 
- _ = evalError("Compiling \(sourceFile)")
+ _ = evalError("💉 Compiling \(sourceFile)")
 
  guard shell(command: """
  (cd "\(projectDir.escaping("$"))" && \(compileCommand) -o \(tmpfile).o >\(logfile) 2>&1)
  """) else {
  compileByClass.removeValue(forKey: classNameOrFile)
- throw evalError("Re-compilation failed (\(tmpDir)/command.sh)\n\(try! String(contentsOfFile: logfile))")
+ throw evalError("Re-compilation failed (see: \(tmpDir)/command.sh)\n\(try! String(contentsOfFile: logfile))")
  }
 
  compileByClass[classNameOrFile] = (compileCommand, sourceFile)