From 1bc5932c0e43eabef74d78f737f459025765b163 Mon Sep 17 00:00:00 2001 From: Aaron Smith Date: Sun, 14 Feb 2010 16:43:39 -0800 Subject: [PATCH] doc updates --- docs/latex/doxygen.sty | 4 ++-- docs/latex/refman.tex | 2 +- .../CrashReporter.xcodeproj/project.pbxproj | 2 ++ examples/CrashReporter/Info.plist | 2 +- examples/CrashReporter/versioning/version | 2 +- gdkit.xcodeproj/project.pbxproj | 2 ++ python/sendcrashreport.py | 10 +++++----- python/sendcrashreport.pyc | Bin 2334 -> 2334 bytes source/GDASLLog.m | 2 +- source/GDCrashReporter.h | 11 +++-------- source/GDCrashReporter.m | 10 ++++++---- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/docs/latex/doxygen.sty b/docs/latex/doxygen.sty index 7244420..c0f2270 100644 --- a/docs/latex/doxygen.sty +++ b/docs/latex/doxygen.sty @@ -27,9 +27,9 @@ \fancyplain{}{\bfseries\thepage}% } \rfoot[\fancyplain{}{\bfseries\scriptsize% - Generated on Wed Jan 27 15:17:53 2010 for GDKit by Doxygen }]{} + Generated on Wed Jan 27 18:18:07 2010 for GDKit by Doxygen }]{} \lfoot[]{\fancyplain{}{\bfseries\scriptsize% - Generated on Wed Jan 27 15:17:53 2010 for GDKit by Doxygen }} + Generated on Wed Jan 27 18:18:07 2010 for GDKit by Doxygen }} \cfoot{} %---------- Internal commands used in this style file ---------------- diff --git a/docs/latex/refman.tex b/docs/latex/refman.tex index 8f42889..769a49e 100644 --- a/docs/latex/refman.tex +++ b/docs/latex/refman.tex @@ -41,7 +41,7 @@ \vspace*{1cm} {\large Generated by Doxygen 1.6.1}\\ \vspace*{0.5cm} -{\small Wed Jan 27 15:17:53 2010}\\ +{\small Wed Jan 27 18:18:07 2010}\\ \end{center} \end{titlepage} \clearemptydoublepage diff --git a/examples/CrashReporter/CrashReporter.xcodeproj/project.pbxproj b/examples/CrashReporter/CrashReporter.xcodeproj/project.pbxproj index 51aa12f..7b24f6f 100644 --- a/examples/CrashReporter/CrashReporter.xcodeproj/project.pbxproj +++ b/examples/CrashReporter/CrashReporter.xcodeproj/project.pbxproj @@ -973,6 +973,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEPLOYMENT_POSTPROCESSING = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../../build/Release\"", @@ -983,6 +984,7 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_NAME = CrashReporter; + STRIP_STYLE = all; }; name = Release; }; diff --git a/examples/CrashReporter/Info.plist b/examples/CrashReporter/Info.plist index a050a1d..222c26d 100644 --- a/examples/CrashReporter/Info.plist +++ b/examples/CrashReporter/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 108 + 118 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSMainNibFile diff --git a/examples/CrashReporter/versioning/version b/examples/CrashReporter/versioning/version index d7e6fdb..5e4f761 100644 --- a/examples/CrashReporter/versioning/version +++ b/examples/CrashReporter/versioning/version @@ -1,4 +1,4 @@ 0 0 0 -108 \ No newline at end of file +118 \ No newline at end of file diff --git a/gdkit.xcodeproj/project.pbxproj b/gdkit.xcodeproj/project.pbxproj index 94b1275..0a61923 100644 --- a/gdkit.xcodeproj/project.pbxproj +++ b/gdkit.xcodeproj/project.pbxproj @@ -959,6 +959,7 @@ COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEPLOYMENT_POSTPROCESSING = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = 1; @@ -981,6 +982,7 @@ PRODUCT_NAME = GDKit; RUN_CLANG_STATIC_ANALYZER = YES; SKIP_INSTALL = YES; + STRIP_STYLE = debugging; VALID_ARCHS = "i386 ppc ppc64 x86_64"; ZERO_LINK = NO; }; diff --git a/python/sendcrashreport.py b/python/sendcrashreport.py index cba6e1b..c7a6ed9 100644 --- a/python/sendcrashreport.py +++ b/python/sendcrashreport.py @@ -33,9 +33,9 @@ if not os.path.exists(corefile): exit(0) if comments and not os.path.exists(comments): comments=False msg=MIMEMultipart() - msg['From']="FROM_EMAIL" - msg['To']="TO_EMAIL" - msg['Subject']="SUBJECT" + msg['From']="gitybot@macendeavor.com" + msg['To']="support@macendeavor.com" + msg['Subject']="GityBot: Crash Report" if comments: msg.attach(MIMEText( open(comments,"r").read() )) else: msg.attach(MIMEText(" ")) part=MIMEBase('application','octet-stream') @@ -47,8 +47,8 @@ mailServer.ehlo() mailServer.starttls() mailServer.ehlo() - mailServer.login('EMAIL','PASS') - mailServer.sendmail('FROM_EMAIL','TO_EMAIL',msg.as_string()) + mailServer.login('gitybot@macendeavor.com','dl49ope093ld98') + mailServer.sendmail('gitybot@macendeavor.com','support@macendeavor.com',msg.as_string()) mailServer.close() if comments: os.unlink(comments) except Exception,e: diff --git a/python/sendcrashreport.pyc b/python/sendcrashreport.pyc index 9a4ffc5d3b2a8d2a62af4767105de5d0f8068566..d67ceb3bcc747fd0107dd98f3738ff5480fcbd06 100644 GIT binary patch delta 15 WcmbOyG*5`_;wN4%oy!~9Bsc*q{RJ2R delta 15 WcmbOyG*5`_;wN4%$CDe`Bsc*rNd+SS diff --git a/source/GDASLLog.m b/source/GDASLLog.m index 31cee05..35041db 100644 --- a/source/GDASLLog.m +++ b/source/GDASLLog.m @@ -92,7 +92,7 @@ - (void) warning:(NSString *) message { } - (void) close { - asl_remove_log_file(client,fd); + if(fd>0)asl_remove_log_file(client,fd); asl_close(client); } diff --git a/source/GDCrashReporter.h b/source/GDCrashReporter.h index 5eda966..2799966 100644 --- a/source/GDCrashReporter.h +++ b/source/GDCrashReporter.h @@ -10,17 +10,9 @@ * Header file for GDCrashReporter. */ -/** - * The GDExternalNibController is a controller used to manage - * an external nib. It has shortcuts for showing the nib, or showing - * it as a sheet, and can auto dispose of the nib resources when - * it's closed. - */ - /** * The GDCrashReporter is a controller that implements post-trauma-pre-usage * crash reporting. - * */ @interface GDCrashReporter : NSObject { BOOL hasCrash; @@ -86,6 +78,9 @@ */ @property (copy,nonatomic) NSString * companyName; +/** + * Whether or not the crash report should be deleted after it's reported. + */ @property (assign,nonatomic) BOOL deleteCrashReport; /** diff --git a/source/GDCrashReporter.m b/source/GDCrashReporter.m index a5159d2..b5c5fef 100644 --- a/source/GDCrashReporter.m +++ b/source/GDCrashReporter.m @@ -28,6 +28,7 @@ - (id) initWithUserDefaultsPrefix:(NSString *) _prefix { - (void) forceCrash { signal(SIGBUS,SIG_DFL); + //*(long*)0 = 0xDEADBEEF; abort(); } @@ -82,7 +83,7 @@ - (void) searchForCrashReports { files = [fman contentsOfDirectoryAtPath:path error:nil]; if(files and [files count]>0) { for(file in files) { - if([file hasPrefix:app]){ + if([file hasPrefix:app]) { fullPath = [path stringByAppendingPathComponent:file]; attributes = [fman attributesOfItemAtPath:fullPath error:nil]; if(!attributes) continue; @@ -146,7 +147,7 @@ - (void) addCrashSearchPath:(NSString *) _searchPath { if(!_searchPath) return; NSString * c = [_searchPath copy]; [searchPaths addObject:c]; - [c release]; + [c release]; } - (void) _deleteCrashReport { @@ -158,7 +159,7 @@ - (IBAction) onsend:(id) sender { [window orderOut:nil]; NSString * pyc; NSBundle * mb = [NSBundle bundleForClass:[self class]]; - if(task) [task terminate]; + if(task and [task isRunning]) [task terminate]; GDRelease(task); task = [[NSTask alloc] init]; NSMutableArray * args = [[NSMutableArray alloc] init]; @@ -169,7 +170,7 @@ - (IBAction) onsend:(id) sender { if(!pyc)pyc=[mb pathForResource:@"sendcrashreport" ofType:@"pyc" inDirectory:@"Scripts"]; [args addObject:pyc]; [args addObject:[@"-f " stringByAppendingString:crashFile]]; - if([comms length] > 0 && ![comms isEqual:@"Optionally provide any details you can to replicate the crash"]) { + if([comms length] > 0 && ![comms isEqual:placeHolderComm]) { NSString * tmpFileName = [NSFileHandle tmpFileName]; NSFileHandle * tmp = [NSFileHandle tmpFile:tmpFileName]; NSData * cdata = [comms dataUsingEncoding:NSUTF8StringEncoding]; @@ -208,6 +209,7 @@ - (void) dealloc { #endif hasCrash=false; GDRelease(placeHolderComm); + if(task and [task isRunning]) [task terminate]; GDRelease(task); GDRelease(searchPaths); GDRelease(userDefaultsPrefix);