diff --git a/GAJavaScriptTracker.xcodeproj/project.pbxproj b/GAJavaScriptTracker.xcodeproj/project.pbxproj index f9e4c73..88419c8 100644 --- a/GAJavaScriptTracker.xcodeproj/project.pbxproj +++ b/GAJavaScriptTracker.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ B41129571598A17E00FAC856 /* GAJavaScriptTracker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B431A386159893FC00277663 /* GAJavaScriptTracker.framework */; }; - B411295A1598A18B00FAC856 /* GAJavaScriptTracker.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B431A386159893FC00277663 /* GAJavaScriptTracker.framework */; }; + B411295A1598A18B00FAC856 /* GAJavaScriptTracker.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B431A386159893FC00277663 /* GAJavaScriptTracker.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; B411295B1598A1E200FAC856 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B431A388159893FC00277663 /* Cocoa.framework */; }; B411295D1598B19000FAC856 /* GAJavaScriptTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = B431A395159893FC00277663 /* GAJavaScriptTracker.h */; settings = {ATTRIBUTES = (Public, ); }; }; B411295F1598B3E600FAC856 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B411295E1598B3E600FAC856 /* WebKit.framework */; }; @@ -221,7 +221,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = QR; - LastUpgradeCheck = 0450; + LastUpgradeCheck = 0610; ORGANIZATIONNAME = net.doo; }; buildConfigurationList = B431A35A1598939500277663 /* Build configuration list for PBXProject "GAJavaScriptTracker" */; @@ -294,7 +294,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -315,7 +314,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx10.7; + SDKROOT = macosx; }; name = Debug; }; @@ -323,7 +322,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -337,7 +335,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; - SDKROOT = macosx10.7; + SDKROOT = macosx; }; name = Release; }; @@ -349,6 +347,7 @@ INFOPLIST_FILE = "GAJavaScriptTrackerApp/GAJavaScriptTracker-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; WRAPPER_EXTENSION = app; }; name = Debug; @@ -361,6 +360,7 @@ INFOPLIST_FILE = "GAJavaScriptTrackerApp/GAJavaScriptTracker-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; WRAPPER_EXTENSION = app; }; name = Release; @@ -368,6 +368,7 @@ B431A399159893FC00277663 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; @@ -376,6 +377,8 @@ INFOPLIST_FILE = "GAJavaScriptTracker/GAJavaScriptTracker-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; + SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -383,6 +386,7 @@ B431A39A159893FC00277663 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; @@ -391,6 +395,8 @@ INFOPLIST_FILE = "GAJavaScriptTracker/GAJavaScriptTracker-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; + SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; name = Release; diff --git a/GAJavaScriptTracker/GAJSWebViewEngine.m b/GAJavaScriptTracker/GAJSWebViewEngine.m index 55a38de..a7ea0b2 100755 --- a/GAJavaScriptTracker/GAJSWebViewEngine.m +++ b/GAJavaScriptTracker/GAJSWebViewEngine.m @@ -8,8 +8,6 @@ #import "GAJSWebViewEngine.h" -#define ELog(x,...) /* NSLog */ - @interface GAJSWebViewEngine () @property(nonatomic, readwrite) WebView *webView; @end @@ -123,10 +121,10 @@ - (void)sendOffBatchedJS { if(_webviewLoaded) { for(id aJSString in _webViewPendingScripts) { //run it - NSLog(@"[JSC] Evaluate JS: %@ %@ %@", aJSString, _webView.customUserAgent, _webView.applicationNameForUserAgent); + DLog(@"[JSC] Evaluate JS: %@ %@ %@", aJSString, _webView.customUserAgent, _webView.applicationNameForUserAgent); NSString *result = [_webView stringByEvaluatingJavaScriptFromString:aJSString]; if (!result) { - ELog(@"[JSC] No result returned"); + DLog(@"[JSC] No result returned"); } } [_webViewPendingScripts removeAllObjects]; @@ -195,7 +193,7 @@ - (void)loadJSLibraryFromURL:(NSURL*)url { userInfo:nil]; } - ELog(@"[JSC] loading library %@...", url.lastPathComponent); + DLog(@"[JSC] loading library %@...", url.lastPathComponent); [self runJS:library]; } @@ -208,7 +206,7 @@ - (void)flushJS { #pragma mark - - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { - ELog(@"did load webview"); + DLog(@"did load webview"); _webviewLoaded = YES; if(_webViewPendingScripts.count >= _batchSize) { @@ -218,16 +216,16 @@ - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { #if DEBUG_WEBVIEW_ENGINE - (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame { - ELog(@"[javascript-alert] %@", message); + DLog(@"[javascript-alert] %@", message); } - (NSURLRequest *)webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource { - ELog(@"[request] %@", request); + DLog(@"[request] %@", request); return request; } - (void)webView:(WebView *)sender resource:(id)identifier didReceiveResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)dataSource { - ELog(@"[response] %@", response); + DLog(@"[response] %@", response); } #endif diff --git a/GAJavaScriptTracker/GAJavaScriptTracker-Prefix.pch b/GAJavaScriptTracker/GAJavaScriptTracker-Prefix.pch index d35c72c..d7105b7 100644 --- a/GAJavaScriptTracker/GAJavaScriptTracker-Prefix.pch +++ b/GAJavaScriptTracker/GAJavaScriptTracker-Prefix.pch @@ -5,3 +5,10 @@ #ifdef __OBJC__ #import #endif + +#ifdef DEBUG +# define DLog(...) NSLog(__VA_ARGS__) +#else +# define DLog(...) /* */ +#endif +#define ALog(...) NSLog(__VA_ARGS__) \ No newline at end of file diff --git a/GAJavaScriptTracker/GAJavaScriptTracker.m b/GAJavaScriptTracker/GAJavaScriptTracker.m index a3fb4c7..3da7eee 100644 --- a/GAJavaScriptTracker/GAJavaScriptTracker.m +++ b/GAJavaScriptTracker/GAJavaScriptTracker.m @@ -83,7 +83,7 @@ -(void)start { assert(!_JSEngine); if(self.debug) - NSLog(@"[GAJST] allocate engine"); + DLog(@"[GAJST] allocate engine"); _JSEngine = [[GAJSWebViewEngine alloc] init]; if(!_JSEngine) { @@ -100,7 +100,7 @@ -(void)start { %@", _accountID, _anonymizeIp ? anonymize : @""]; if(self.debug) - NSLog(@"[GAJST] Load html and set INITIAL_GA: %@", str); + DLog(@"[GAJST] Load html and set INITIAL_GA: %@", str); _JSEngine.htmlName = @"main"; _JSEngine.htmlVariables = [NSDictionary dictionaryWithObject:str forKey:@"INITIAL_GA"]; @@ -118,11 +118,11 @@ -(void)stop { assert(_JSEngine); if(self.debug) - NSLog(@"[GAJST] flush the engine [if the webview is not loaded, this may loose a batch.]"); + DLog(@"[GAJST] flush the engine [if the webview is not loaded, this may loose a batch.]"); [_JSEngine flushJS]; if(self.debug) - NSLog(@"[GAJST] release engine"); + DLog(@"[GAJST] release engine"); _JSEngine = nil; } @@ -130,7 +130,7 @@ -(void)stop { //is it running? - (BOOL)isRunning { if(self.debug) - NSLog(@"[GAJST] checking for engine"); + DLog(@"[GAJST] checking for engine"); return (_JSEngine!=NULL); } @@ -153,7 +153,7 @@ - (void)setBatchInterval:(NSTimeInterval)batchInterval { - (BOOL)executeScript:(NSString*)js { if(self.debug) - NSLog(@"[GAJST] execute %@", js); + DLog(@"[GAJST] execute %@", js); if(!self.dryRun) { [_JSEngine runJS:js];