Merge pull request #265 from varp/improve-debugging

Improve debug capabilities in the Safari context by listing of configuration file(s) in the developer tools sidebar

CHANGELOG.md

@@ -9,6 +9,8 @@ Release: dd.mm.yyyy
 ### Changes
 
 - Improve first launch experience by removing custom alert before accessibility prompt and terminating Phoenix.
+- Improve debug capabilites in the Safari context by listing of configuration file(s) in the
+developer tools sidebar
 
 2.6.4
 -----

Phoenix.xcodeproj/project.pbxproj

@@ -395,8 +395,8 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = A79C46741B5BF31200C460CF /* Build configuration list for PBXNativeTarget "Phoenix" */;
 			buildPhases = (
-				A7A6F57F1D1AD4CD000A0E5E /* Build Library */,
 				A32B0CB41F9B8F1C428EE663 /* [CP] Check Pods Manifest.lock */,
+				A7A6F57F1D1AD4CD000A0E5E /* Build Library */,
 				A79C46531B5BF31100C460CF /* Sources */,
 				A79C46541B5BF31100C460CF /* Frameworks */,
 				A79C46551B5BF31100C460CF /* Resources */,
@@ -437,7 +437,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = PH;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = Phoenix;
 				TargetAttributes = {
 					A79C46561B5BF31100C460CF = {
@@ -654,6 +654,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -709,6 +710,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

Phoenix.xcodeproj/xcshareddata/xcschemes/Phoenix.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Phoenix/PHContext.m

@@ -157,6 +157,7 @@ - (void) loadScript:(NSString *)path {
 
     NSError *error;
     NSString *script = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:&error];
+    NSURL *url = [NSURL fileURLWithPath:path relativeToURL:[NSURL fileURLWithPath:path.stringByDeletingLastPathComponent isDirectory:true]];
 
     if (error) {
         script = @"";
@@ -172,7 +173,7 @@ - (void) loadScript:(NSString *)path {
         [PHNotificationHelper deliver:@"Preprocessing failed. Refer to the logs for more information."];
     }
 
-    [self.context evaluateScript:script];
+    [self.context evaluateScript:script withSourceURL:url];
     [self.configurationPaths addObject:path];
 }