Upgrading to GitLab 12.0.2.

Commit ce0f449a authored by Eric Heintzmann's avatar Eric Heintzmann

Import Upstream version 0.4.3

parent 0b02749f
ANNOUNCE
************
This is version 0.4.2 of ProjectCenter. This is a urgent bugfix version.
This is version 0.4.3 of ProjectCenter. This is a urgent bugfix version.
What is ProjectCenter?
======================
......@@ -15,10 +15,12 @@ What is ProjectCenter?
distribution fees, for others to use the program. You should read the
Documentation/COPYING file for more information.
Noteworthy changes in version `0.4.2'.
Noteworthy changes in version `0.4.3'.
======================================
* Removing root build directory was disabled.
* Improved compatibility with MingW
* Various bugfixes
How can I get support for this software?
......
2006-01-16 Serg Stoyan <stoyan255@ukr.net>
* Release 0.4.3
2005-11-18 Adam Fedor <fedor@gnu.org>
* GNUmakefile.preamble: Change 'whereis' to which. (Make sure if it's
portable, Serg Stoyan). Correct ADDITIONAL_LIB_DIRS.
* Library/PCLogController.h: Change tags to PC_* because of conflict
on MingW. And is use in code.
2005-11-15 Serg Stoyan <stoyan255@ukr.net>
* Library/GNUmakefile: Change framework version to 0.4.3
* GNUmakefile: Change version to 0.4.3
2005-11-10 Adam Fedor <fedor@gnu.org>
* GNUmakefile.postamble: Add some hacks to copy header files on
Windows machines.
* GNUmakefile.preamble: Correct libs
* Library/GNUmakefile.postamble: Don't make dir links
* Modules/GNUmakefile.bundles: Add bundle libs on Windows.
2005-07-03 Serg Stoyan <stoyan255@ukr.net>
* Library/PCButton: (mouseMoved:) check if ttWindow is not nil.
2005-07-01 Serg Stoyan <stoyan255@ukr.net>
* Resources/Preferences.gorm: Fixed name of preferences panel.
(Bug # 13590)
* Update all .gorm files with latest GORM
2005-06-07 Serg Stoyan <stoyan255@ukr.net>
* Library/PCProjectEditor.m:
(orderFrontEditorForFile:): Always show editor subview
(Fixed bug#11779).
2005-02-12 Pascal Hoftsee <caelian@gmail.com>
Committed by Gregory Jonh Casamento <greg_casamento@yahoo.com>
* Library/PCButton.m: Corrected issue in
-[PCButton _updateTrackingRects:] which was causing a SIGBUS
to occur on FreeBSD by simply moving the remove method call below
the line which was referencing the rect.
2005-01-26 Serg Stoyan <stoyan255@ukr.net>
* Release 0.4.2
......
......@@ -8,7 +8,7 @@ GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
#
# Main application
#
VERSION = 0.4.2
VERSION = 0.4.3
PACKAGE_NAME = ProjectCenter
APP_NAME = ProjectCenter
ProjectCenter_APPLICATION_ICON = Images/ProjectCenter.tiff
......@@ -18,15 +18,13 @@ ProjectCenter_APPLICATION_ICON = Images/ProjectCenter.tiff
#
SUBPROJECTS = \
Library \
Modules \
Modules
#
# Resource files
#
ProjectCenter_RESOURCE_FILES = \
Resources/ProjectCenter.gorm \
Resources/LogPanel.gorm \
Resources/Preferences.gorm \
Resources/Info-gnustep.plist \
Images/ProjectCenter.tiff \
Images/FileC.tiff \
......@@ -90,8 +88,6 @@ Modules/ToolProject/ToolProject.bundle
ProjectCenter_HEADERS = \
PCAppController.h \
PCInfoController.h \
PCLogController.h \
PCMenuController.h \
PCPrefController.h
#
......@@ -100,9 +96,7 @@ PCPrefController.h
ProjectCenter_OBJC_FILES = \
PCAppController.m \
PCInfoController.m \
PCLogController.m \
PCMenuController.m \
PCPrefController.m \
ProjectCenter_main.m
-include GNUmakefile.preamble
......
......@@ -22,8 +22,35 @@
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
before-all::
HEADER_LINK_DEPENDS=link-setup
before-all:: header-links
after-clean::
rm -rf ProjectCenter $(HEADER_LINK_DEPENDS)
after-uninstall::
# FIXME: Temporary solution to Library being in the wrong place - we really
# should just move the directory in CVS
DO_HEADER_LINKS=no
ifeq ($(GNUSTEP_TARGET_OS), mingw32)
DO_HEADER_LINKS=yes
endif
ifeq ($(GNUSTEP_TARGET_OS), cygwin)
DO_HEADER_LINKS=yes
endif
ifeq ($(DO_HEADER_LINKS), yes)
header-links: $(HEADER_LINK_DEPENDS)
-rm -rf ProjectCenter
-mkdir ProjectCenter
cp -f Library/*.h ProjectCenter
else
header-links: $(HEADER_LINK_DEPENDS)
-rm -f ProjectCenter
$(LN_S) Library ProjectCenter
endif
$(HEADER_LINK_DEPENDS):
touch $(HEADER_LINK_DEPENDS)
......@@ -24,6 +24,10 @@
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# TODO: Make sure if it's portable
GMAKE = `which gmake`
GDB = `which gdb`
#
# Flags dealing with compiling and linking
#
......@@ -32,20 +36,24 @@
ADDITIONAL_CPPFLAGS +=
# Additional flags to pass to the Objective-C compiler
ADDITIONAL_OBJCFLAGS +=
ADDITIONAL_OBJCFLAGS += -DPCDefaultBuildTool=@"\"$(GMAKE)\"" \
-DPCDefaultDebugger=@"\"$(GDB)\""
# Additional flags to pass to the C compiler
ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I./
ADDITIONAL_INCLUDE_DIRS += -I./ -I./Headers
# Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS += -lProjectCenter
ADDITIONAL_LDFLAGS +=
# Additional library directories the linker should search
#ADDITIONAL_LIB_DIRS += -L./Library/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS += -L./Library/ProjectCenter.framework/Versions/Current
ADDITIONAL_LIB_DIRS += -L./Library/ProjectCenter.framework/Versions/Current \
-L./Library/ProjectCenter.framework
# Additional LDFLAGS to pass to the linker
ADDITIONAL_GUI_LIBS += -lProjectCenter
#
# Flags dealing with installing and uninstalling
......
......@@ -9,9 +9,9 @@ GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
#
# Framework
#
VERSION = 0.4.1
VERSION = 0.4.3
FRAMEWORK_NAME = ProjectCenter
ProjectCenter_CURRENT_VERSION_NAME = 0.4.1
ProjectCenter_CURRENT_VERSION_NAME = 0.4.3
ProjectCenter_DEPLOY_WITH_CURRENT_VERSION = yes
ProjectCenter_LIBRARIES_DEPEND_UPON += -lgnustep-gui
......@@ -54,6 +54,8 @@ ProjectCenter_HEADER_FILES = \
PCTextFinder.h \
PCTextFinder+UInterface.h \
\
PCPrefController.h \
PCLogController.h \
PCDefines.h \
ProjectCenter.h \
ProjectType.h \
......@@ -91,7 +93,10 @@ ProjectCenter_OBJC_FILES = \
PCEditorView.m \
PCEditorView+Highlighting.m \
PCTextFinder.m \
PCTextFinder+UInterface.m
PCTextFinder+UInterface.m \
\
PCPrefController.m \
PCLogController.m
#
# Resources
......@@ -109,7 +114,9 @@ ProjectCenter_RESOURCE_FILES = \
Resources/gsmarkup.template \
Resources/header.template \
Resources/postamble.template \
Resources/protocol.template
Resources/protocol.template \
Resources/LogPanel.gorm \
Resources/Preferences.gorm
-include GNUmakefile.preamble
......
......@@ -22,14 +22,12 @@
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
before-all::
cd ..;rm -f ProjectCenter;$(LN_S) Library ProjectCenter
#before-all::
# cd ..;rm -f ProjectCenter;$(LN_S) Library ProjectCenter
after-clean::
rm -f ../ProjectCenter
#after-clean::
# rm -f ../ProjectCenter
after-uninstall::
# rm -rf $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/ProjectCenter
# rm -rf $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/Resources/ProjectCenter
rm -rf $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/libProjectCenter*
#after-uninstall::
# rm -rf $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/libProjectCenter*
......@@ -47,7 +47,7 @@ ADDITIONAL_OBJCFLAGS += -Wall
ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../
ADDITIONAL_INCLUDE_DIRS += -I..
# Additional LDFLAGS to pass to the linker
#ADDITIONAL_LDFLAGS +=
......
......@@ -111,11 +111,11 @@
for (i = 0; i < j; i++)
{
tr = [_tracking_rects objectAtIndex:i];
[self removeTrackingRect:tr->tag];
// NSLog(@"PCButton: tr: %i data: %@", tr->tag, tr->user_data);
string = [(NSString *)tr->user_data copy];
[self removeTrackingRect:tr->tag];
rect = [self frame];
rect.origin.x = 0;
......@@ -262,6 +262,11 @@
NSPoint origin;
// NSLog(@"mouseMoved");
if (ttWindow == nil)
{
return;
}
mouseLocation = [NSEvent mouseLocation];
origin = NSMakePoint(mouseLocation.x + 8,
......
......@@ -28,10 +28,10 @@
#include <AppKit/AppKit.h>
#define INFO 0
#define STATUS 1
#define WARNING 2
#define ERROR 3
#define PC_INFO 0
#define PC_STATUS 1
#define PC_WARNING 2
#define PC_ERROR 3
// --- Functions
void
......
......@@ -40,7 +40,7 @@ PCLogInfo(id sender, NSString* format, ...)
va_list ap;
va_start(ap, format);
PCLog(sender, INFO, format, ap);
PCLog(sender, PC_INFO, format, ap);
va_end(ap);
}
......@@ -50,7 +50,7 @@ PCLogStatus(id sender, NSString* format, ...)
va_list ap;
va_start(ap, format);
PCLog(sender, STATUS, format, ap);
PCLog(sender, PC_STATUS, format, ap);
va_end(ap);
}
......@@ -60,7 +60,7 @@ PCLogWarning(id sender, NSString* format, ...)
va_list ap;
va_start(ap, format);
PCLog(sender, WARNING, format, ap);
PCLog(sender, PC_WARNING, format, ap);
va_end(ap);
}
......@@ -70,7 +70,7 @@ PCLogError(id sender, NSString* format, ...)
va_list ap;
va_start(ap, format);
PCLog(sender, ERROR, format, ap);
PCLog(sender, PC_ERROR, format, ap);
va_end(ap);
}
......@@ -148,24 +148,24 @@ static PCLogController *_logCtrllr = nil;
switch (tag)
{
case INFO:
case PC_INFO:
[textAttributes
setObject:[NSColor colorWithDeviceRed:.0 green:.0 blue:.0 alpha:1.0]
forKey:NSForegroundColorAttributeName];
break;
case STATUS:
case PC_STATUS:
[textAttributes
setObject:[NSColor colorWithDeviceRed:.0 green:.35 blue:.0 alpha:1.0]
forKey:NSForegroundColorAttributeName];
break;
case WARNING:
case PC_WARNING:
[textAttributes
setObject:[NSColor colorWithDeviceRed:.56 green:.45 blue:.0 alpha:1.0]
forKey:NSForegroundColorAttributeName];
break;
case ERROR:
case PC_ERROR:
[textAttributes
setObject:[NSColor colorWithDeviceRed:.63 green:.0 blue:.0 alpha:1.0]
forKey:NSForegroundColorAttributeName];
......
......@@ -31,6 +31,14 @@
#define PCSavePeriodDidChangeNotification @"PCSavePeriodDidChangeNotification"
#define PCPreferencesDidChangeNotification @"PCPreferencesDidChangeNotification"
#ifndef PCDefaultBuildTool
#define PCDefaultBuildTool @"/usr/bin/make"
#endif
#ifndef PCDefaultDebugger
#define PCDefaultDebugger @"/usr/bin/gdb"
#endif
@interface PCPrefController : NSObject
{
IBOutlet NSPanel *panel;
......@@ -85,7 +93,7 @@
- (id)init;
- (void)dealloc;
- (void)setDefaultValues;
- (void)loadPrefernces;
- (void)loadPreferences;
- (NSDictionary *)preferencesDict;
- (id)objectForKey:(NSString *)key;
......
......@@ -23,12 +23,12 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#include "PCPrefController.h"
#include <ProjectCenter/ProjectCenter.h>
#include "PCDefines.h"
#include "PCLogController.h"
// TODO: rewrite it as PCPrefernces, use +sharedPreferences instead of
#include "PCPrefController.h"
// TODO: rewrite it as PCPreferences, use +sharedPreferences instead of
// [NSUserDefaults standardUserDefaults] in every part of ProjectCenter
@implementation PCPrefController
......@@ -120,8 +120,8 @@ static PCPrefController *_prefCtrllr = nil;
[preferencesDict setObject:@"YES" forKey:PromptOnQuit];
[preferencesDict setObject:@"YES" forKey:DeleteCacheWhenQuitting];
[preferencesDict setObject:@"YES" forKey:FullPathInFilePanels];
[preferencesDict setObject:@"/usr/bin/make" forKey:BuildTool];
[preferencesDict setObject:@"/usr/bin/gdb" forKey:Debugger];
[preferencesDict setObject:PCDefaultBuildTool forKey:BuildTool];
[preferencesDict setObject:PCDefaultDebugger forKey:Debugger];
[preferencesDict setObject:@"ProjectCenter" forKey:Editor];
// Interface
......@@ -140,7 +140,7 @@ static PCPrefController *_prefCtrllr = nil;
[ud synchronize];
}
- (void)loadPrefernces
- (void)loadPreferences
{
NSDictionary *prefs = nil;
NSString *val = nil;
......@@ -209,9 +209,9 @@ static PCPrefController *_prefCtrllr = nil;
isEqualToString:@"YES"]) ? NSOnState : NSOffState];
[buildToolField setStringValue:
(val = [preferencesDict objectForKey:BuildTool]) ? val : @"/usr/bin/make"];
(val = [preferencesDict objectForKey:BuildTool]) ? val : PCDefaultBuildTool];
[debuggerField setStringValue:
(val = [preferencesDict objectForKey: Debugger]) ? val : @"/usr/bin/gdb"];
(val = [preferencesDict objectForKey: Debugger]) ? val : PCDefaultDebugger];
[editorField setStringValue:
(val = [preferencesDict objectForKey: Editor]) ? val : @"ProjectCenter"];
......@@ -351,7 +351,7 @@ static PCPrefController *_prefCtrllr = nil;
[self popupChanged:popupButton];
// Load saved prefs
[self loadPrefernces];
[self loadPreferences];
[panel orderFront:self];
}
......@@ -665,7 +665,7 @@ static PCPrefController *_prefCtrllr = nil;
if ([path isEqualToString:@""] || !path)
{
[buildToolField setStringValue:@"/usr/bin/make"];
[buildToolField setStringValue:PCDefaultBuildTool];
path = [buildToolField stringValue];
}
else if (!path || ![[NSFileManager defaultManager] fileExistsAtPath:path])
......@@ -686,7 +686,7 @@ static PCPrefController *_prefCtrllr = nil;
if ([path isEqualToString:@""] || !path)
{
[debuggerField setStringValue:@"/usr/bin/gdb"];
[debuggerField setStringValue:PCDefaultDebugger];
path = [debuggerField stringValue];
}
else if (!path || ![[NSFileManager defaultManager] fileExistsAtPath:path])
......
......@@ -40,12 +40,6 @@
@class PCProjectLauncher;
@class PCProjectEditor;
/*#ifndef GNUSTEP_BASE_VERSION
@protocol ProjectBuilder;
#else
#include <ProjectCenter/ProjectBuilder.h>
#endif*/
extern NSString *PCProjectDictDidChangeNotification;
extern NSString *PCProjectDictDidSaveNotification;
......
......@@ -255,8 +255,8 @@ NSString *PCEditorDidResignActiveNotification =
editor = [[PCEditor alloc] initWithPath:path
categoryPath:categoryPath
projectEditor:self];
[componentView setContentView:[editor componentView]];
[[project projectWindow] makeFirstResponder:[editor editorView]];
// [componentView setContentView:[editor componentView]];
// [[project projectWindow] makeFirstResponder:[editor editorView]];
[editorsDict setObject:editor forKey:path];
RELEASE(editor);
......@@ -280,6 +280,7 @@ NSString *PCEditorDidResignActiveNotification =
else
{
[componentView setContentView:[editor componentView]];
[[project projectWindow] setCustomContentView:componentView];
[[project projectWindow] makeFirstResponder:[editor editorView]];
}
}
......
......@@ -290,7 +290,8 @@ enum {
if ([project isExecutable])
{
openPath = [project execToolName];
[args addObject:[project projectName]];
[args addObject: [[project projectPath]
stringByAppendingPathComponent: [project projectName]]];
}
else
{
......
......@@ -42,6 +42,7 @@
NSBox *toolbarView;
PCButton *buildButton;
PCButton *launchButton;
PCButton *editorButton;
PCButton *loadedFilesButton;
PCButton *findButton;
PCButton *inspectorButton;
......
......@@ -131,6 +131,18 @@
{
[launchButton setEnabled:NO];
}
/* editorButton = [[PCButton alloc] initWithFrame:NSMakeRect(88,5,43,43)];
[editorButton setRefusesFirstResponder:YES];
[editorButton setToolTip:@"Editor"];
[editorButton setTitle:@"Editor"];
[editorButton setImage:IMAGE(@"Stop")];
[editorButton setTarget:self];
[editorButton setAction:@selector(showProjectEditor:)];
[editorButton setAutoresizingMask:(NSViewMaxXMargin | NSViewMinYMargin)];
[editorButton setButtonType:NSMomentaryPushButton];
[toolbarView addSubview:editorButton];
RELEASE (editorButton);*/
loadedFilesButton = [[PCButton alloc] initWithFrame:NSMakeRect(88,5,43,43)];
[loadedFilesButton setRefusesFirstResponder:YES];
......@@ -901,6 +913,7 @@
- (BOOL)makeFirstResponder:(NSResponder *)aResponder
{
firstResponder = aResponder;
[projectWindow makeFirstResponder:firstResponder];
return YES;
......
......@@ -2,41 +2,7 @@
"## Comment" = "Do NOT change this file, Gorm maintains it";
FirstResponder = {
Actions = (
"alignLeft:",
"capitalizeWord:",
"changeFont:",
"copy:",
"delete:",
"deleteToBeginningOfParagraph:",
"deleteWordBackward:",
"fax:",
"loosenKerning:",
"miniaturize:",
"moveDown:",
"moveLeft:",
"moveToBeginningOfParagraph:",
"moveUp:",
"moveWordForward:",
"open:",
"orderFrontColorPanel:",
"orderFrontFontPanel:",
"orderOut:",
"pasteAsPlainText:",
"performClose:",
"raiseBaseline:",
"saveAllDocuments:",
"scrollLineDown:",
"scrollViaScroller:",
"selectParagraph:",
"selectWord:",
"showWindow:",
"swapWithMark:",
"takeObjectValueFrom:",
"toggle:",
"toggleTraditionalCharacterShape:",
"turnOffLigatures:",
"unscript:",
"useStandardLigatures:",
"searchOrderPopupDidChange:",
"setSearchOrder:",
"removeSearchOrder:",
......
......@@ -2,74 +2,6 @@
"## Comment" = "Do NOT change this file, Gorm maintains it";
FirstResponder = {
Actions = (
"alignCenter:",
"alignLeft:",
"arrangeInFront:",
"capitalizeWord:",
"checkSpelling:",
"complete:",
"copyFont:",
"cut:",
"deleteBackward:",
"deleteToBeginningOfLine:",
"deleteToEndOfLine:",
"deleteToMark:",
"deleteWordForward:",
"deselectAll:",
"hide:",
"indent:",
"lowerBaseline:",
"makeKeyAndOrderFront:",
"miniaturizeAll:",
"moveBackwardAndModifySelection:",
"moveDownAndModifySelection:",
"moveForwardAndModifySelection:",
"moveRight:",
"moveToBeginningOfLine:",
"moveToEndOfDocument:",
"moveToEndOfParagraph:",
"moveUpAndModifySelection:",
"moveWordBackwardAndModifySelection:",
"moveWordForwardAndModifySelection:",
"ok:",
"openDocument:",
"orderFront:",
"orderFrontDataLinkPanel:",
"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:",
"fileNameDidChange:"
);
Super = NSObject;
......
{
"## Comment" = "Do NOT change this file, Gorm maintains it";
PCLogController = {
Actions = (
);
Outlets = (
panel,
textView
);
Super = NSObject;
};
}
\ No newline at end of file
......@@ -2,74 +2,6 @@
"## Comment" = "Do NOT change this file, Gorm maintains it";
FirstResponder = {
Actions = (
"alignCenter:",
"alignLeft:",
"arrangeInFront:",
"capitalizeWord:",
"checkSpelling:",
"complete:",
"copyFont:",
"cut:",
"deleteBackward:",
"deleteToBeginningOfLine:",
"deleteToEndOfLine:",
"deleteToMark:",
"deleteWordForward:",
"deselectAll:",
"hide:",
"indent:",
"lowerBaseline:",
"makeKeyAndOrderFront:",
"miniaturizeAll:",
"moveBackwardAndModifySelection:",
"moveDownAndModifySelection:",
"moveForwardAndModifySelection:",
"moveRight:",