Changeset 16165


Ignore:
Timestamp:
Aug 25, 2014, 6:57:56 PM (5 years ago)
Author:
rme
Message:

Rename Info.plist to AltConsole?-Info.plist. The Mac App Store automated
checker seems to think that a file named Info.plist indicated that there
is some sort of bundle present, and will whine about a code signature
being absent. Update the Makefile accordingly.

Make AltConsoleDocument? conform to the NSToolbarDelegate and
NSTextViewDelegate protocols to avoid some warnings.

Include "return" in a few places where it is needed.

Location:
trunk/source/cocoa-ide/altconsole
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/source/cocoa-ide/altconsole/AltConsoleDocument.h

    r12097 r16165  
    2525#import <Cocoa/Cocoa.h>
    2626
    27 @interface AltConsoleDocument : NSDocument
     27@interface AltConsoleDocument : NSDocument <NSToolbarDelegate, NSTextViewDelegate>
    2828{
    2929  NSFileHandle *in, *out, *err;
  • trunk/source/cocoa-ide/altconsole/AltConsoleDocument.m

    r12325 r16165  
    132132
    133133- (NSData *)dataRepresentationOfType:(NSString *)aType {
    134   [[textView string]
    135     dataUsingEncoding: NSASCIIStringEncoding
    136     allowLossyConversion: YES];
     134  return [[textView string] dataUsingEncoding:NSASCIIStringEncoding
     135                         allowLossyConversion:YES];
    137136}
    138137
     
    206205- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
    207206{
    208   [NSArray arrayWithObject:@"clear display"];
     207  return [NSArray arrayWithObject:@"clear display"];
    209208}
    210209
    211210- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
    212211{
    213   [NSArray arrayWithObject:@"clear display"];
     212  return [NSArray arrayWithObject:@"clear display"];
    214213}
    215214
  • trunk/source/cocoa-ide/altconsole/Makefile

    r15364 r16165  
    1010OBJECTS=main.o AltConsoleDocument.o AltConsoleDocumentController.o
    1111RESOURCES=resource/MainMenu.nib resource/AltConsole.nib resource/Credits.rtf resource/InfoPlist.strings resource/Clear.tiff
    12 #CC=gcc-4.0
    1312
    14 CFLAGS=-g -O -mmacosx-version-min=10.6 -Wno-protocol
     13CFLAGS=-g -O -mmacosx-version-min=10.6
    1514
    1615AltConsole: $(OBJECTS)
    1716        $(CC) $(CFLAGS) -o $@ $(OBJECTS) -framework Cocoa
    1817
    19 $(APPBASE)/AltConsole.app: AltConsole $(RESOURCES) Info.plist
     18$(APPBASE)/AltConsole.app: AltConsole $(RESOURCES) AltConsole-Info.plist
    2019        mkdir -p $(APPBASE)
    2120        rm -rf $(APPBASE)/AltConsole.app
     
    2423        mkdir -p $(APPBASE)/AltConsole.app/Contents/MacOS
    2524        cp -p AltConsole $(APPBASE)/AltConsole.app/Contents/MacOS
    26         cp -p Info.plist $(APPBASE)/AltConsole.app/Contents/
     25        cp -p AltConsole-Info.plist $(APPBASE)/AltConsole.app/Contents/Info.plist
    2726        touch $(APPBASE)/AltConsole.app
    2827
Note: See TracChangeset for help on using the changeset viewer.