Changeset 216


Ignore:
Timestamp:
05/01/06 09:11:28 (19 years ago)
Author:
Nicholas Riley
Message:

VERSION: Starting with 1.4.3d1.

APE.icns: Generic APE icon (not sure whether we care).

SmartCrashReportsAPI.[ho]: SCR 1.1.

ICeCoffEEWebKit.m: -elementAtPoint: isn't in current
development WebKit; switch to the version in WebHTMLView.

Info-APE Module.plist: Update version to 1.4.3d1.

ICeCoffEE.xcodeproj: Xcode 2 version of project, required fixing
script which copies the APE bundle into the installer. We're still
building for 10.3.9 and later on PowerPC only for this release.

English.lproj/APEInfo.rtfd: Small clarifications, update release notes
and version information.

English.lproj/InfoPlist.strings: Update version to 1.4.3d1.

ICeCoffEEShared.h: Use varargs macros to finally fix the stupid
warnings when ICCF_DEBUG is 0.

ICeCoffEE APE.xcode: Removed.

ICeCoffEETerminal.m: Fixes crash on clicking disabled close/minimize
widgets in Open dialog (invalid super method call) by implementing
overridden methods in the faked superclass.

ape_install: APE 1.5.1.

Info-APEManagerPrefPane.plist: Update version number.

APEMain.m: Implement SCR. Fix a comment typo. Remove some useless
uses of the comma operator so the new warning-less ICapeprintf works.

package-ICeCoffEE.sh: Use new xcodebuild syntax and build layout.
Remove a useless use of the semicolon. Nuke localizations on
development builds.

Location:
trunk/ICeCoffEE
Files:
9 added
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ICeCoffEE/ICeCoffEE/APEMain.m

    r183 r216  
    1616#import <ApplicationEnhancer/APETools.h>
    1717#import <objc/objc-runtime.h>
     18#import "SmartCrashReportsAPI.h"
    1819#import "ICeCoffEE.h"
    1920#import "ICeCoffEETextEdit.h"
    … …  
    6768CFBundleRef ICCF_bundle;
    6869
    69 // With APE 1.3, if we're in the exclude list, APEBundleMainEarlyLoad doesn't get invoked; don't need to use APETools.  But we need to do our own management to avoid loading in non-GUI appllications.
     70// With APE 1.3, if we're in the exclude list, APEBundleMainEarlyLoad doesn't get invoked; don't need to use APETools.  But we need to do our own management to avoid loading in non-GUI applications.
    7071Boolean ICCF_shouldLoad;
    7172
    7273void APEBundleMainEarlyLoad(CFBundleRef inBundle, CFStringRef inAPEToolsApplicationID)
    7374{
     75    OSStatus err;
     76
     77    err = UnsanitySCR_RegisterMatchSpecifier(kICBundleIdentifier, CFSTR("Nicholas Riley"),
     78                                             NULL, CFSTR("SCR-5E5C696784"), NULL);
     79    if (err != noErr) {
     80        apeprintf("ICeCoffEE APE: Can't register with Smart Crash Reports (error %ld)\n", err);
     81    }
     82   
    7483    ICCF_MigratePrefs();
    7584
    … …  
    8392
    8493    CPSProcessSerNum psn;
    85     OSStatus err = CPSGetCurrentProcess(&psn);
     94    err = CPSGetCurrentProcess(&psn);
    8695    if (err != noErr) {
    8796#if ICCF_DEBUG
    … …  
    92101#endif
    93102    }
    94    
     103
    95104    CPSProcessInfoRec info;
    96105    err = CPSGetProcessInfo(&psn, &info, NULL, 0, NULL, NULL, 0);
    … …  
    128137        if (ICCF_CFBundleIDMatches(bundleID, CFSTR("com.apple.xcode"))) {
    129138            ICCF_PatchMethod("PBXTextView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
    130             ICapeprintf("ICeCoffEE APE: loaded in PBXTextView for PB!\n");
     139            ICapeprintf("ICeCoffEE APE: loaded in PBXTextView for Xcode\n");
    131140            shouldLoadInNSTextView = NO;
    132141        } else if (ICCF_CFBundleIDMatches(bundleID, CFSTR("com.apple.terminal"))) {
    … …  
    137146            ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "mouseUp:") &&
    138147            ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "draggingEntered:") &&
    139             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "_optionClickEvent:::") ,
    140             ICapeprintf("ICeCoffEE APE: loaded in TermSubview for Terminal!\n");
    141         } else if (ICCF_CFBundleIDMatches(bundleID, CFSTR("org.mozilla.navigator"))) {
     148            ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "_optionClickEvent:::");
     149            ICapeprintf("ICeCoffEE APE: loaded in TermSubview for Terminal\n");
     150        } else if (ICCF_CFBundleIDMatches(bundleID, CFSTR("org.mozilla.camino"))) {
    142151            ICCF_PatchMethod("ChildView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
    143152            ICapeprintf("ICeCoffEE APE: loaded in ChildView for Camino\n");
    … …  
    147156    ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "mouseUp:") &&
    148157        ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "mouseDown:") &&
    149         ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "menuForEvent:"),
     158        ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "menuForEvent:");
    150159        ICapeprintf("ICeCoffEE APE: loaded in WebHTMLView for WebKit/Safari\n");
    151160   
    152161    if (shouldLoadInNSTextView) {
    153162        ICCF_PatchMethod("NSTextView", "ICeCoffEE", "ICeCoffEESuper", "mouseDown:") &&
    154         ICCF_PatchMethod("NSTextView", "ICeCoffEE", "ICeCoffEESuper", "menuForEvent:") ,
     163        ICCF_PatchMethod("NSTextView", "ICeCoffEE", "ICeCoffEESuper", "menuForEvent:");
    155164        ICapeprintf("ICeCoffEE APE: loaded generic NSTextView support\n");
    156165    }

  • trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEShared.h

    r183 r216  
    1919#define ICapeprintf apeprintf
    2020#else
    21 #define ICLog (void)
    22 #define ICapeprintf (void)
     21#define ICLog(args...) ;
     22#define ICapeprintf(args...) ;
    2323#endif
    2424

  • trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m

    r183 r216  
    5656// misc. other stuff
    5757- (void)_optionClickEvent:(NSEvent *)event:(unsigned int)row:(unsigned short)column {}
    58 - (void)setNeedsDisplay; {}
     58- (void)setNeedsDisplay {}
     59// NSView methods (needed to avoid crash in super invocation)
     60- (void)mouseUp:(NSEvent *)e { [super mouseUp: e]; }
     61- (void)mouseDown:(NSEvent *)e { [super mouseDown: e]; }
    5962@end
    6063

  • trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

    r183 r216  
    1313@interface WebCoreBridge : NSObject
    1414
    15 - (NSDictionary *)elementAtPoint:(NSPoint)point;
    1615- (NSString *)selectedString;
    1716- (NSRect)selectionRect;
    … …  
    2827
    2928- (NSRange)selectedRange;
     29
     30- (NSDictionary *)elementAtPoint:(NSPoint)point;
    3031
    3132@end
    … …  
    6970
    7071        NS_DURING
     72            NSPoint viewClickPt = [self convertPoint: downPt fromView: nil];
     73            NSDictionary *elementDict = [(WebHTMLView *)self elementAtPoint: viewClickPt];
    7174            WebCoreBridge *bridge = [(WebHTMLView *)self _bridge];
    72             NSPoint viewClickPt = [self convertPoint: downPt fromView: nil];
    73             NSDictionary *elementDict = [bridge elementAtPoint: viewClickPt];
    7475            ICLog(@"elementDict: %@", elementDict);
    7576            NSAssert([elementDict count] != 0, @"Internal error: Got empty element dictionary from WebHTMLView");

  • trunk/ICeCoffEE/ICeCoffEE/Info-APE Module.plist

    r185 r216  
    1919        <string></string>
    2020        <key>CFBundleIconFile</key>
    21         <string></string>
     21        <string>APE</string>
    2222        <key>CFBundleIdentifier</key>
    2323        <string>net.sabi.ICeCoffEE</string>
    … …  
    3333        <string>ICCF</string>
    3434        <key>CFBundleVersion</key>
    35         <string>1.4.2</string>
     35        <string>1.4.3d1</string>
    3636</dict>
    3737</plist>

  • trunk/ICeCoffEE/ICeCoffEE/Info-APEManagerPrefPane.plist

    r185 r216  
    2424        <string>????</string>
    2525        <key>CFBundleVersion</key>
    26         <string>1.4.2</string>
     26        <string>1.4.3d1</string>
    2727        <key>NSMainNibFile</key>
    2828        <string>APE Manager plugin</string>

  • trunk/ICeCoffEE/ICeCoffEE/VERSION

    r185 r216  
    1 1.4.2
     11.4.3d1

  • trunk/ICeCoffEE/package-ICeCoffEE.sh

    r184 r216  
    1414sudo rm -rf build/ && \
    1515rm -rf build/ && \
    16 xcodebuild -target "ICeCoffEE Installer" -buildstyle Deployment "DSTROOT=$DSTROOT" DEPLOYMENT_LOCATION=YES install && \
     16xcodebuild -target "ICeCoffEE Installer" -configuration Deployment "DSTROOT=$DSTROOT" DEPLOYMENT_LOCATION=YES install && \
    1717mkdir "$DSTROOT" && \
    18 mv "build/$PRODUCT Installer.app" "$DSTROOT/$PRODUCT $VERSION Installer.app" && \
     18mv "build/Deployment/$PRODUCT Installer.app" "$DSTROOT/$PRODUCT $VERSION Installer.app" && \
    1919sudo rm -rf build/ && \
    20 find "$DSTROOT" -name ".svn" -type d -exec sudo /bin/rm -rf "{}" \; ; \
     20find "$DSTROOT" -name ".svn" -type d -exec sudo /bin/rm -rf "{}" \;
     21# uncomment to include localizations
     22find "$DSTROOT" -name \*.lproj -type d -and -not -name English.lproj -exec sudo rm -rf "{}" \;
    2123cd "$PACKAGEDIR" && \
    2224rm -f "$DMG" && \
Note: See TracChangeset for help on using the changeset viewer.