gnustep/apps-projectcenter
0
0
Fork 0
mirror of https://github.com/gnustep/apps-projectcenter.git synced 2025-02-15 16:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compiling on Windows. Fix returning PCFileManager's defaultManager

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@20523 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sergii Stoian 2005-01-05 21:04:12 +00:00
parent 9be3f61de0
commit 27d6b344e7
17 changed files with 35 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Documentation/ChangeLog
View file

@ -1,3 +1,11 @@
2005-01-05 Serg Stoyan <stoyan255@ukr.net>
* Library/GNUstep.postamble: Make "ln -s" ProjectCenter to the
../Library. It should make correct compiling on Windows.
* Library/PCFileManager.m:
(defaultManager:): Don't autorelease returned object.
2005-01-04 Serg Stoyan <stoyan255@ukr.net>
* Library/PCFilesManager.[hm]:

6
GNUmakefile.preamble
View file

@ -38,14 +38,14 @@ ADDITIONAL_OBJCFLAGS +=
ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I./Library
ADDITIONAL_INCLUDE_DIRS += -I./
# Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS += -lProjectCenter
# Additional library directories the linker should search
#ADDITIONAL_LIB_DIRS += -L./Library/$(GNUSTEP_OBJ_DIR_NAME)
ADDITIONAL_LIB_DIRS += -L./Library/ProjectCenter.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
#ADDITIONAL_LIB_DIRS += -L./Library/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS += -L./Library/ProjectCenter.framework/Versions/Current
ADDITIONAL_TOOL_LIBS +=

5
Library/GNUmakefile.postamble
View file

@ -23,11 +23,10 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
before-all::
rm -f ProjectCenter
$(LN_S) . ProjectCenter
cd ..;rm -f ProjectCenter;$(LN_S) Library ProjectCenter
after-clean::
rm -f ProjectCenter
rm -f ../ProjectCenter
after-uninstall::
rm -rf $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/ProjectCenter

16
Library/PCFileCreator.m
View file

@ -38,7 +38,7 @@ static NSDictionary *dict = nil;
+ (id)sharedCreator
{
if (!_creator)
if (_creator == nil)
{
NSDictionary *classDict;
NSDictionary *headerDict;
@ -95,12 +95,12 @@ static NSDictionary *dict = nil;
dict = [[NSDictionary alloc] initWithObjectsAndKeys:
ccDict,CFile,
chDict,CHeader,
protocolDict,ProtocolFile,
headerDict,ObjCHeader,
classDict,ObjCClass,
gsmarkupDict,GSMarkupFile,
ccDict, CFile,
chDict, CHeader,
protocolDict, ProtocolFile,
headerDict, ObjCHeader,
classDict, ObjCClass,
gsmarkupDict, GSMarkupFile,
nil];
}
@ -121,7 +121,7 @@ static NSDictionary *dict = nil;
path:(NSString *)path
project:(PCProject *)aProject
{
PCFileManager *pcfm = [PCFileManager fileManager];
PCFileManager *pcfm = [PCFileManager defaultManager];
NSString *_file;
NSString *newFile = nil;
NSMutableDictionary *files;

2
Library/PCFileManager.h
View file

@ -56,7 +56,7 @@
// ==== Class methods
//==============================================================================
+ (PCFileManager *)fileManager;
+ (PCFileManager *)defaultManager;
//==============================================================================
// ==== Init and free

8
Library/PCFileManager.m
View file

@ -42,14 +42,14 @@
static PCFileManager *_mgr = nil;
+ (PCFileManager *)fileManager
+ (PCFileManager *)defaultManager
{
if (!_mgr)
if (_mgr == nil)
{
_mgr = [[PCFileManager alloc] init];
_mgr = [[self alloc] init];
}
return AUTORELEASE(_mgr);
return _mgr;
}
// ===========================================================================

2
Library/PCProjectInspector.h
View file

@ -53,7 +53,7 @@
IBOutlet NSBox *buildAttributesView;
IBOutlet NSTextField *projectNameLabel;
IBOutlet NSPopUpButton *searchOrderPopup;
IBOutlet NSScrollView *searchOrderScroll;
NSTableView *searchOrderList;
NSTableColumn *searchOrderColumn;
NSMutableArray *searchItems;

40
Library/PCProjectInspector.m
View file

@ -167,11 +167,6 @@
[inspectorPanel setFrameUsingName:@"ProjectInspector"];
// PopUp
[inspectorPopup removeAllItems];
[inspectorPopup addItemWithTitle:@"Build Attributes"];
[inspectorPopup addItemWithTitle:@"Project Attributes"];
[inspectorPopup addItemWithTitle:@"Project Description"];
[inspectorPopup addItemWithTitle:@"File Attributes"];
[inspectorPopup selectItemAtIndex:0];
// Build Attributes
@ -397,50 +392,15 @@
// Search Order
// Popup
[searchOrderPopup removeAllItems];
[searchOrderPopup addItemWithTitle:@"Header Directories Search Order"];
[searchOrderPopup addItemWithTitle:@"Library Directories Search Order"];
[searchOrderPopup addItemWithTitle:@"Framework Directories Search Order"];
[searchOrderPopup selectItemAtIndex:0];
// Table column
searchOrderColumn = [(NSTableColumn *)[NSTableColumn alloc]
initWithIdentifier: @"SO List"];
[searchOrderColumn setEditable:NO];
// Table
searchOrderList = [[NSTableView alloc]
initWithFrame:NSMakeRect(0,0,290,99)];
[searchOrderList setAllowsMultipleSelection:NO];
[searchOrderList setAllowsColumnReordering:NO];
[searchOrderList setAllowsColumnResizing:NO];
[searchOrderList setAllowsEmptySelection:YES];
[searchOrderList setAllowsColumnSelection:NO];
[searchOrderList setCornerView:nil];
[searchOrderList setHeaderView:nil];
[searchOrderList addTableColumn:searchOrderColumn];
[searchOrderList setDataSource:self];
[searchOrderList setDrawsGrid:NO];
[searchOrderList setTarget:self];
[searchOrderList setDoubleAction:@selector(searchOrderDoubleClick:)];
[searchOrderList setAction:@selector(searchOrderClick:)];
// ScrollView
[searchOrderScroll setDocumentView:searchOrderList];
[searchOrderScroll setHasHorizontalScroller:NO];
[searchOrderScroll setHasVerticalScroller:YES];
[searchOrderScroll setBorderType:NSBezelBorder];
RELEASE(searchOrderList);
// Buttons
[self setSearchOrderButtonsState];
[cppOptField setNextText:objcOptField];
[objcOptField setNextText:cOptField];
[cOptField setNextText:ldOptField];
[ldOptField setNextText:installPathField];
[installPathField setNextText:cppOptField];
// Retain view
[buildAttributesView retain];
}

37
Library/Resources/BuildAttributes.gorm/data.classes
View file

@ -2,75 +2,41 @@
"## Comment" = "Do NOT change this file, Gorm maintains it";
FirstResponder = {
Actions = (
"alignCenter:",
"alignLeft:",
"arrangeInFront:",
"capitalizeWord:",
"changeFont:",
"close:",
"copy:",
"copyRuler:",
"delete:",
"deleteForward:",
"deleteToBeginningOfParagraph:",
"deleteToEndOfParagraph:",
"deleteWordBackward:",
"deminiaturize:",
"fax:",
"hideOtherApplications:",
"loosenKerning:",
"lowercaseWord:",
"miniaturize:",
"moveBackward:",
"moveDown:",
"moveForward:",
"moveLeft:",
"moveToBeginningOfDocument:",
"moveToBeginningOfParagraph:",
"moveToEndOfLine:",
"moveUp:",
"moveWordBackward:",
"moveWordForward:",
"newDocument:",
"open:",
"orderBack:",
"orderFrontColorPanel:",
"orderFrontFontPanel:",
"orderFrontStandardAboutPanel:",
"orderOut:",
"pageUp:",
"pasteAsPlainText:",
"pasteFont:",
"performClose:",
"performZoom:",
"raiseBaseline:",
"runPageLayout:",
"saveAllDocuments:",
"saveDocumentAs:",
"scrollLineDown:",
"scrollPageDown:",
"scrollViaScroller:",
"selectLine:",
"selectParagraph:",
"selectText:",
"selectWord:",
"showGuessPanel:",
"showWindow:",
"subscript:",
"swapWithMark:",
"takeFloatValueFrom:",
"takeObjectValueFrom:",
"terminate:",
"toggle:",
"toggleRuler:",
"toggleTraditionalCharacterShape:",
"transposeWords:",
"turnOffLigatures:",
"unhide:",
"unscript:",
"useAllLigatures:",
"useStandardLigatures:",
"zoom:",
"searchOrderPopupDidChange:",
"setSearchOrder:",
"removeSearchOrder:",
@ -101,7 +67,8 @@
cOptField,
ldOptField,
installPathField,
searchOrderScroll
searchOrderScroll,
searchOrderColumn
);
Super = NSObject;
};

BIN
Library/Resources/BuildAttributes.gorm/objects.gorm
View file

Binary file not shown.

70
Library/Resources/ProjectInspector.gorm/data.classes
View file

@ -1,143 +1,75 @@
{
"## Comment" = "Do NOT change this file, Gorm maintains it";
FirstResponder = {
Actions = (
"activateContextHelpMode:",
"alignCenter:",
"alignJustified:",
"alignLeft:",
"alignRight:",
"arrangeInFront:",
"cancel:",
"capitalizeWord:",
"changeColor:",
"changeFont:",
"checkSpelling:",
"close:",
"complete:",
"copy:",
"copyFont:",
"copyRuler:",
"cut:",
"delete:",
"deleteBackward:",
"deleteForward:",
"deleteToBeginningOfLine:",
"deleteToBeginningOfParagraph:",
"deleteToEndOfLine:",
"deleteToEndOfParagraph:",
"deleteToMark:",
"deleteWordBackward:",
"deleteWordForward:",
"deminiaturize:",
"deselectAll:",
"fax:",
"hide:",
"hideOtherApplications:",
"indent:",
"loosenKerning:",
"lowerBaseline:",
"lowercaseWord:",
"makeKeyAndOrderFront:",
"miniaturize:",
"miniaturizeAll:",
"moveBackward:",
"moveBackwardAndModifySelection:",
"moveDown:",
"moveDownAndModifySelection:",
"moveForward:",
"moveForwardAndModifySelection:",
"moveLeft:",
"moveRight:",
"moveToBeginningOfDocument:",
"moveToBeginningOfLine:",
"moveToBeginningOfParagraph:",
"moveToEndOfDocument:",
"moveToEndOfLine:",
"moveToEndOfParagraph:",
"moveUp:",
"moveUpAndModifySelection:",
"moveWordBackward:",
"moveWordBackwardAndModifySelection:",
"moveWordForward:",
"moveWordForwardAndModifySelection:",
"newDocument:",
"ok:",
"open:",
"openDocument:",
"orderBack:",
"orderFront:",
"orderFrontColorPanel:",
"orderFrontDataLinkPanel:",
"orderFrontFontPanel:",
"orderFrontHelpPanel:",
"orderFrontStandardAboutPanel:",
"orderFrontStandardInfoPanel:",
"orderOut:",
"pageDown:",
"pageUp:",
"paste:",
"pasteAsPlainText:",
"pasteAsRichText:",
"pasteFont:",
"pasteRuler:",
"performClose:",
"performMiniaturize:",
"performZoom:",
"print:",
"raiseBaseline:",
"revertDocumentToSaved:",
"runPageLayout:",
"runToolbarCustomizationPalette:",
"saveAllDocuments:",
"saveDocument:",
"saveDocumentAs:",
"saveDocumentTo:",
"scrollLineDown:",
"scrollLineUp:",
"scrollPageDown:",
"scrollPageUp:",
"scrollViaScroller:",
"selectAll:",
"selectLine:",
"selectNextKeyView:",
"selectParagraph:",
"selectPreviousKeyView:",
"selectText:",
"selectToMark:",
"selectWord:",
"showContextHelp:",
"showGuessPanel:",
"showHelp:",
"showWindow:",
"stop:",
"subscript:",
"superscript:",
"swapWithMark:",
"takeDoubleValueFrom:",
"takeFloatValueFrom:",
"takeIntValueFrom:",
"takeObjectValueFrom:",
"takeStringValueFrom:",
"terminate:",
"tightenKerning:",
"toggle:",
"toggleContinuousSpellChecking:",
"toggleRuler:",
"toggleToolbarShown:",
"toggleTraditionalCharacterShape:",
"transpose:",
"transposeWords:",
"turnOffKerning:",
"turnOffLigatures:",
"underline:",
"unhide:",
"unhideAllApplications:",
"unscript:",
"uppercaseWord:",
"useAllLigatures:",
"useStandardKerning:",
"useStandardLigatures:",
"yank:",
"zoom:",
"inspectorPopupDidChange:"
);

BIN
Library/Resources/ProjectInspector.gorm/data.info
View file

Binary file not shown.

BIN
Library/Resources/ProjectInspector.gorm/objects.gorm
View file

Binary file not shown.

2
Modules/ApplicationProject/PCAppProj.m
View file

@ -63,7 +63,7 @@ static PCAppProj *_creator = nil;
- (PCProject *)createProjectAt:(NSString *)path
{
PCAppProject *project = nil;
PCFileManager *pcfm = [PCFileManager fileManager];
PCFileManager *pcfm = [PCFileManager defaultManager];
PCFileCreator *pcfc = [PCFileCreator sharedCreator];
NSString *_file = nil;
NSString *_2file = nil;

2
Modules/ApplicationProject/PCAppProject.m
View file

@ -169,7 +169,7 @@
- (NSArray *)allowableSubprojectTypes
{
return [NSArray arrayWithObjects:
@"Aggregate", @"Bundle", @"Tool", @"Library", nil];
@"Aggregate", @"Bundle", @"Tool", @"Library", @"Framework", nil];
}
- (NSArray *)localizableKeys

2
Modules/BundleProject/PCBundleProject.m
View file

@ -77,7 +77,9 @@
- (void)dealloc
{
#ifdef DEVELOPMENT
NSLog(@"PCBundleProject: dealloc");
#endif
[rootCategories release];
[rootKeys release];
[rootEntries release];

2
Modules/GNUmakefile.bundles
View file

@ -4,7 +4,7 @@
ADDITIONAL_OBJCFLAGS +=
ADDITIONAL_CFLAGS +=
ADDITIONAL_CPPFLAGS +=
ADDITIONAL_INCLUDE_DIRS += -I../../Library
ADDITIONAL_INCLUDE_DIRS += -I../..
ADDITIONAL_LIB_DIRS += -L../../Library/$(GNUSTEP_OBJ_DIR)
BUNDLE_EXTENSION = .bundle