paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-21 19:21:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Automatically support for fvision or old fv

Browse Source
This commit is contained in:
peter 2001-08-05 12:23:00 +00:00
parent 569a1dde72
commit 4f53ca7d23
10 changed files with 115 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/Makefile
View File

@ -145,7 +145,6 @@ ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override FPCOPT+=-dUNIX override FPCOPT+=-dUNIX
endif endif
endif endif
KL:=$(wildcard compiler/finput.*)
ifeq ($(wildcard compiler/finput.*),) ifeq ($(wildcard compiler/finput.*),)
override FPCOPT+=-dCOMPILER_1_0 override FPCOPT+=-dCOMPILER_1_0
endif endif
@ -1218,6 +1217,9 @@ endif
clean_compiler clean testgdb postgdbinfo clean_compiler clean testgdb postgdbinfo
clean: fpc_cleanall clean: fpc_cleanall
distclean: clean compilerclean distclean: clean compilerclean
ifneq ($(wildcard $(UNITDIR_FV)/fvconsts$(PPUEXT)),)
override COMPILER+=-dFVISION
endif
fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc) fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc)
testgdb: testgdb:
ifneq ($(GDBFOUND),0) ifneq ($(GDBFOUND),0)

8
ide/Makefile.fpc
View File

@ -51,7 +51,6 @@ endif
# To detect 1.0.x compilers we look for finput.ppu. If this unit # To detect 1.0.x compilers we look for finput.ppu. If this unit
# is not found then we include 1.0.x compiler # is not found then we include 1.0.x compiler
# #
KL:=$(wildcard compiler/finput.*)
ifeq ($(wildcard compiler/finput.*),) ifeq ($(wildcard compiler/finput.*),)
override FPCOPT+=-dCOMPILER_1_0 override FPCOPT+=-dCOMPILER_1_0
endif endif
@ -112,6 +111,13 @@ clean: fpc_cleanall
distclean: clean compilerclean distclean: clean compilerclean
#
# FVision or old FV detection
#
ifneq ($(wildcard $(UNITDIR_FV)/fvconsts$(PPUEXT)),)
override COMPILER+=-dFVISION
endif
fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc) fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc)
testgdb: testgdb:

18
ide/fp.pas
View File

@ -35,9 +35,13 @@ uses
{$endif fpc} {$endif fpc}
Dos,Objects, Dos,Objects,
BrowCol, BrowCol,
Drivers,Views,App,Dialogs,ColorSel,Menus,StdDlg,Validate, Drivers,Views,App,Dialogs,
Menus,StdDlg,Validate,
{$ifdef EDITORS}Editors{$else}WEditor,WCEdit{$endif}, {$ifdef EDITORS}Editors{$else}WEditor,WCEdit{$endif},
ASCIITab,Calc, {$ifndef FVISION}
ColorSel,
ASCIITab,
{$endif FVISION}
WUtils,WViews,WHTMLScn,WHelp, WUtils,WViews,WHTMLScn,WHelp,
FPIDE,FPCalc,FPCompil, FPIDE,FPCalc,FPCompil,
FPIni,FPViews,FPConst,FPVars,FPUtils,FPHelp,FPSwitch,FPUsrScr, FPIni,FPViews,FPConst,FPVars,FPUtils,FPHelp,FPSwitch,FPUsrScr,
@ -152,11 +156,12 @@ end;
procedure RegisterIDEObjects; procedure RegisterIDEObjects;
begin begin
RegisterApp; RegisterApp;
RegisterAsciiTab;
RegisterCalc;
RegisterCodeComplete; RegisterCodeComplete;
RegisterCodeTemplates; RegisterCodeTemplates;
{$ifndef FVISION}
RegisterColorSel; RegisterColorSel;
RegisterAsciiTab;
{$endif FVISION}
RegisterDialogs; RegisterDialogs;
{$ifdef EDITORS} {$ifdef EDITORS}
RegisterEditors; RegisterEditors;
@ -290,7 +295,10 @@ BEGIN
END. END.
{ {
$Log$ $Log$
Revision 1.1 2001-08-04 11:30:22 peter Revision 1.2 2001-08-05 12:23:00 peter
* Automatically support for fvision or old fv
Revision 1.1 2001/08/04 11:30:22 peter
* ide works now with both compiler versions * ide works now with both compiler versions
Revision 1.1.2.10 2001/03/27 12:39:27 pierre Revision 1.1.2.10 2001/03/27 12:39:27 pierre

9
ide/fpdesk.pas
View File

@ -415,12 +415,16 @@ begin
end; end;
hcASCIITableWindow: hcASCIITableWindow:
begin begin
{$ifndef FVISION}
if ASCIIChart=nil then if ASCIIChart=nil then
begin begin
New(ASCIIChart, Init); New(ASCIIChart, Init);
Desktop^.Insert(ASCIIChart); Desktop^.Insert(ASCIIChart);
end; end;
W:=ASCIIChart; W:=ASCIIChart;
{$else FVISION}
W:=nil;
{$endif FVISION}
end; end;
end; end;
if W=nil then if W=nil then
@ -943,7 +947,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.1 2001-08-04 11:30:23 peter Revision 1.2 2001-08-05 12:23:00 peter
* Automatically support for fvision or old fv
Revision 1.1 2001/08/04 11:30:23 peter
* ide works now with both compiler versions * ide works now with both compiler versions
Revision 1.1.2.8 2001/03/22 17:28:03 pierre Revision 1.1.2.8 2001/03/22 17:28:03 pierre

18
ide/fpide.pas
View File

@ -159,12 +159,15 @@ uses
FpDpAnsi,WConsts, FpDpAnsi,WConsts,
Video,Mouse,Keyboard, Video,Mouse,Keyboard,
Compiler,Version, Compiler,Version,
Dos,Memory,Menus,Dialogs,StdDlg,ColorSel,
{$ifdef FVISION} {$ifdef FVISION}
FVConsts, FVConsts,
{$else} {$else}
Commands,HelpCtx, Commands,HelpCtx,
{$endif} {$endif}
Dos,Memory,Menus,Dialogs,StdDlg,
{$ifndef FVISION}
ColorSel,
{$endif FVISION}
Systems, Systems,
WUtils,WHlpView,WViews,WHTMLHlp, WUtils,WHlpView,WViews,WHTMLHlp,
FPConst,FPVars,FPUtils,FPSwitch,FPIni,FPIntf,FPCompil,FPHelp, FPConst,FPVars,FPUtils,FPSwitch,FPIni,FPIntf,FPCompil,FPHelp,
@ -388,8 +391,14 @@ begin
NewLine( NewLine(
NewItem(menu_tools_grep,menu_key_tools_grep, kbShiftF2, cmGrep, hcGrep, NewItem(menu_tools_grep,menu_key_tools_grep, kbShiftF2, cmGrep, hcGrep,
NewItem(menu_tools_calculator, '', kbNoKey, cmCalculator, hcCalculator, NewItem(menu_tools_calculator, '', kbNoKey, cmCalculator, hcCalculator,
{$ifndef FVISION}
NewItem(menu_tools_asciitable, '', kbNoKey, cmAsciiTable, hcAsciiTable, NewItem(menu_tools_asciitable, '', kbNoKey, cmAsciiTable, hcAsciiTable,
nil)))))))), {$endif}
nil))))))
{$ifndef FVISION}
)
{$endif}
),
NewSubMenu(menu_options, hcOptionsMenu, NewMenu( NewSubMenu(menu_options, hcOptionsMenu, NewMenu(
NewItem(menu_options_mode,'', kbNoKey, cmSwitchesMode, hcSwitchesMode, NewItem(menu_options_mode,'', kbNoKey, cmSwitchesMode, hcSwitchesMode,
NewItem(menu_options_compiler,'', kbNoKey, cmCompiler, hcCompiler, NewItem(menu_options_compiler,'', kbNoKey, cmCompiler, hcCompiler,
@ -1155,7 +1164,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.2 2001-08-05 02:01:47 peter Revision 1.3 2001-08-05 12:23:00 peter
* Automatically support for fvision or old fv
Revision 1.2 2001/08/05 02:01:47 peter
* FVISION define to compile with fvision units * FVISION define to compile with fvision units
Revision 1.1 2001/08/04 11:30:23 peter Revision 1.1 2001/08/04 11:30:23 peter

10
ide/fpmopts.inc
View File

@ -1153,6 +1153,10 @@ begin
end; end;
procedure TIDEApp.Colors; procedure TIDEApp.Colors;
{$Ifdef FVISION}
begin
end;
{$else FVISION}
var D: PColorDialog; var D: PColorDialog;
begin begin
New(D, Init(AppPalette, New(D, Init(AppPalette,
@ -1228,6 +1232,7 @@ begin
UpdateScreen(true); UpdateScreen(true);
end; end;
end; end;
{$endif FVISION}
procedure TIDEApp.OpenINI; procedure TIDEApp.OpenINI;
var D: PFileDialog; var D: PFileDialog;
@ -1280,7 +1285,10 @@ end;
{ {
$Log$ $Log$
Revision 1.1 2001-08-04 11:30:23 peter Revision 1.2 2001-08-05 12:23:00 peter
* Automatically support for fvision or old fv
Revision 1.1 2001/08/04 11:30:23 peter
* ide works now with both compiler versions * ide works now with both compiler versions
Revision 1.1.2.11 2001/08/02 14:20:40 pierre Revision 1.1.2.11 2001/08/02 14:20:40 pierre

7
ide/fpmtools.inc
View File

@ -24,6 +24,7 @@ end;
procedure TIDEApp.DoAsciiTable; procedure TIDEApp.DoAsciiTable;
begin begin
{$ifndef FVISION}
if ASCIIChart=nil then if ASCIIChart=nil then
begin begin
New(ASCIIChart, Init); New(ASCIIChart, Init);
@ -31,6 +32,7 @@ begin
end end
else else
ASCIIChart^.Focus; ASCIIChart^.Focus;
{$endif FVISION}
end; end;
@ -352,7 +354,10 @@ end;
{ {
$Log$ $Log$
Revision 1.1 2001-08-04 11:30:23 peter Revision 1.2 2001-08-05 12:23:00 peter
* Automatically support for fvision or old fv
Revision 1.1 2001/08/04 11:30:23 peter
* ide works now with both compiler versions * ide works now with both compiler versions
Revision 1.1.2.7 2001/03/08 16:43:01 pierre Revision 1.1.2.7 2001/03/08 16:43:01 pierre

38
ide/fpsymbol.pas
View File

@ -18,7 +18,10 @@ unit FPSymbol;
interface interface
uses Objects,Drivers,Views,Menus,Dialogs,Outline, uses Objects,Drivers,Views,Menus,Dialogs,
{$ifndef FVISION}
Outline,
{$endif FVISION}
BrowCol, BrowCol,
WViews, WViews,
FPViews; FPViews;
@ -124,6 +127,7 @@ type
function GetPalette: PPalette; virtual; function GetPalette: PPalette; virtual;
end; end;
{$ifndef FVISION}
PSymbolInheritanceView = ^TSymbolInheritanceView; PSymbolInheritanceView = ^TSymbolInheritanceView;
TSymbolInheritanceView = object(TOutlineViewer) TSymbolInheritanceView = object(TOutlineViewer)
constructor Init(var Bounds: TRect; AHScrollBar, AVScrollBar: PScrollBar; ARoot: PObjectSymbol); constructor Init(var Bounds: TRect; AHScrollBar, AVScrollBar: PScrollBar; ARoot: PObjectSymbol);
@ -142,6 +146,7 @@ type
Root : PObjectSymbol; Root : PObjectSymbol;
MyBW : PBrowserWindow; MyBW : PBrowserWindow;
end; end;
{$endif FVISION}
PBrowserTabItem = ^TBrowserTabItem; PBrowserTabItem = ^TBrowserTabItem;
TBrowserTabItem = record TBrowserTabItem = record
@ -189,7 +194,9 @@ type
Sym : PSymbol; Sym : PSymbol;
ScopeView : PSymbolScopeView; ScopeView : PSymbolScopeView;
ReferenceView : PSymbolReferenceView; ReferenceView : PSymbolReferenceView;
{$ifndef FVISION}
InheritanceView: PSymbolInheritanceView; InheritanceView: PSymbolInheritanceView;
{$endif FVISION}
MemInfoView : PSymbolMemInfoView; MemInfoView : PSymbolMemInfoView;
UnitInfoText : PSymbolMemoView; UnitInfoText : PSymbolMemoView;
UnitInfoUsed : PSymbolScopeView; UnitInfoUsed : PSymbolScopeView;
@ -240,8 +247,10 @@ procedure CloseAllBrowsers;
(TypeOf(P^)=TypeOf(TSymbolScopeView)) or (TypeOf(P^)=TypeOf(TSymbolScopeView)) or
(TypeOf(P^)=TypeOf(TSymbolReferenceView)) or (TypeOf(P^)=TypeOf(TSymbolReferenceView)) or
(TypeOf(P^)=TypeOf(TSymbolMemInfoView)) or (TypeOf(P^)=TypeOf(TSymbolMemInfoView)) or
(TypeOf(P^)=TypeOf(TSymbolMemoView)) or {$ifndef FVISION}
(TypeOf(P^)=TypeOf(TSymbolInheritanceView))) then (TypeOf(P^)=TypeOf(TSymbolInheritanceView)) or
{$endif FVISION}
(TypeOf(P^)=TypeOf(TSymbolMemoView))) then
Message(P,evCommand,cmClose,nil); Message(P,evCommand,cmClose,nil);
end; end;
@ -1048,6 +1057,7 @@ end;
TSymbolInheritanceView TSymbolInheritanceView
****************************************************************************} ****************************************************************************}
{$ifndef FVISION}
constructor TSymbolInheritanceView.Init(var Bounds: TRect; AHScrollBar, AVScrollBar: PScrollBar; ARoot: PObjectSymbol); constructor TSymbolInheritanceView.Init(var Bounds: TRect; AHScrollBar, AVScrollBar: PScrollBar; ARoot: PObjectSymbol);
begin begin
inherited Init(Bounds,AHScrollBar,AVScrollBar); inherited Init(Bounds,AHScrollBar,AVScrollBar);
@ -1162,6 +1172,7 @@ begin
S^.GetText,S,nil, S^.GetText,S,nil,
S^.Items,S^.References,Anc,S^.MemInfo); S^.Items,S^.References,Anc,S^.MemInfo);
end; end;
{$endif FVISION}
{**************************************************************************** {****************************************************************************
@ -1397,10 +1408,12 @@ begin
Insert(HSB); Insert(HSB);
VSB:=CreateVSB(R); VSB:=CreateVSB(R);
Insert(VSB); Insert(VSB);
{$ifndef FVISION}
New(InheritanceView, Init(R, HSB,VSB, AInheritance)); New(InheritanceView, Init(R, HSB,VSB, AInheritance));
InheritanceView^.GrowMode:=gfGrowHiX+gfGrowHiY; InheritanceView^.GrowMode:=gfGrowHiX+gfGrowHiY;
Insert(InheritanceView); Insert(InheritanceView);
InheritanceView^.MyBW:=@Self; InheritanceView^.MyBW:=@Self;
{$endif FVISION}
end; end;
if assigned(AMemInfo) then if assigned(AMemInfo) then
begin begin
@ -1491,11 +1504,16 @@ begin
New(PageTab, Init(R, New(PageTab, Init(R,
NewBrowserTabItem(label_browsertab_scope,ScopeView, NewBrowserTabItem(label_browsertab_scope,ScopeView,
NewBrowserTabItem(label_browsertab_reference,ReferenceView, NewBrowserTabItem(label_browsertab_reference,ReferenceView,
{$ifndef FVISION}
NewBrowserTabItem(label_browsertab_inheritance,InheritanceView, NewBrowserTabItem(label_browsertab_inheritance,InheritanceView,
{$endif FVISION}
NewBrowserTabItem(label_browsertab_memory,MemInfoView, NewBrowserTabItem(label_browsertab_memory,MemInfoView,
NewBrowserTabItem(label_browsertab_unit,UnitInfo, NewBrowserTabItem(label_browsertab_unit,UnitInfo,
nil)) nil))
))))); {$ifndef FVISION}
)
{$endif FVISION}
))));
PageTab^.GrowMode:=gfGrowHiX; PageTab^.GrowMode:=gfGrowHiX;
Insert(PageTab); Insert(PageTab);
@ -1504,9 +1522,12 @@ begin
else else
if assigned(ReferenceView) then if assigned(ReferenceView) then
SelectTab(btReferences) SelectTab(btReferences)
{$ifndef FVISION}
else else
if assigned(InheritanceView) then if assigned(InheritanceView) then
SelectTab(btInheritance); SelectTab(btInheritance)
{$endif FVISION}
;
end; end;
destructor TBrowserWindow.Done; destructor TBrowserWindow.Done;
@ -1721,8 +1742,10 @@ begin
Tabs:=Tabs or (1 shl btScope); Tabs:=Tabs or (1 shl btScope);
if assigned(ReferenceView) then if assigned(ReferenceView) then
Tabs:=Tabs or (1 shl btReferences); Tabs:=Tabs or (1 shl btReferences);
{$ifndef FVISION}
if assigned(InheritanceView) then if assigned(InheritanceView) then
Tabs:=Tabs or (1 shl btInheritance); Tabs:=Tabs or (1 shl btInheritance);
{$endif FVISION}
if assigned(MemInfoView) then if assigned(MemInfoView) then
Tabs:=Tabs or (1 shl btMemInfo); Tabs:=Tabs or (1 shl btMemInfo);
if Assigned(Sym) then if Assigned(Sym) then
@ -1789,7 +1812,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.2 2001-08-05 02:01:48 peter Revision 1.3 2001-08-05 12:23:00 peter
* Automatically support for fvision or old fv
Revision 1.2 2001/08/05 02:01:48 peter
* FVISION define to compile with fvision units * FVISION define to compile with fvision units
Revision 1.1 2001/08/04 11:30:24 peter Revision 1.1 2001/08/04 11:30:24 peter

7
ide/fpvars.pas
View File

@ -80,7 +80,9 @@ const ClipboardWindow : PClipboardWindow = nil;
AltMouseAction : integer = acBrowseSymbol; AltMouseAction : integer = acBrowseSymbol;
StartupOptions : longint = 0; StartupOptions : longint = 0;
LastExitCode : integer = 0; LastExitCode : integer = 0;
{$ifndef FVISION}
ASCIIChart : PFPASCIIChart = nil; ASCIIChart : PFPASCIIChart = nil;
{$endif FVISION}
BackgroundPath : string{$ifdef GABOR}[60]{$endif} = BackgroundName; BackgroundPath : string{$ifdef GABOR}[60]{$endif} = BackgroundName;
DesktopPath : string{$ifdef GABOR}[60]{$endif} = DesktopName; DesktopPath : string{$ifdef GABOR}[60]{$endif} = DesktopName;
DesktopFileFlags : longint = dfHistoryLists+dfOpenWindows+ DesktopFileFlags : longint = dfHistoryLists+dfOpenWindows+
@ -112,7 +114,10 @@ implementation
END. END.
{ {
$Log$ $Log$
Revision 1.1 2001-08-04 11:30:24 peter Revision 1.2 2001-08-05 12:23:01 peter
* Automatically support for fvision or old fv
Revision 1.1 2001/08/04 11:30:24 peter
* ide works now with both compiler versions * ide works now with both compiler versions
Revision 1.1.2.5 2001/03/12 17:34:56 pierre Revision 1.1.2.5 2001/03/12 17:34:56 pierre

19
ide/fpviews.pas
View File

@ -23,11 +23,13 @@ uses
Dos,Objects,Drivers, Dos,Objects,Drivers,
{$ifdef FVISION} {$ifdef FVISION}
FVConsts, FVConsts,
{$else} {$else FVISION}
Commands,HelpCtx, Commands,HelpCtx,
{$endif} {$endif FVISION}
Views,Menus,Dialogs,App,Gadgets, Views,Menus,Dialogs,App,Gadgets,
{$ifndef FVISION}
ASCIITAB, ASCIITAB,
{$endif FVISION}
WEditor,WCEdit, WEditor,WCEdit,
WUtils,WHelp,WHlpView,WViews,WANSI, WUtils,WHelp,WHlpView,WViews,WANSI,
Comphook, Comphook,
@ -389,6 +391,7 @@ type
TitleST : PStaticText; TitleST : PStaticText;
end; end;
{$ifndef FVISION}
PFPASCIIChart = ^TFPASCIIChart; PFPASCIIChart = ^TFPASCIIChart;
TFPASCIIChart = object(TASCIIChart) TFPASCIIChart = object(TASCIIChart)
constructor Init; constructor Init;
@ -397,6 +400,7 @@ type
procedure HandleEvent(var Event: TEvent); virtual; procedure HandleEvent(var Event: TEvent); virtual;
destructor Done; virtual; destructor Done; virtual;
end; end;
{$endif FVISION}
PVideoModeListBox = ^TVideoModeListBox; PVideoModeListBox = ^TVideoModeListBox;
TVideoModeListBox = object(TDropDownListBox) TVideoModeListBox = object(TDropDownListBox)
@ -572,12 +576,14 @@ const
Load: @TGDBWindow.Load; Load: @TGDBWindow.Load;
Store: @TGDBWindow.Store Store: @TGDBWindow.Store
); );
{$ifndef FVISION}
RFPASCIIChart: TStreamRec = ( RFPASCIIChart: TStreamRec = (
ObjType: 1509; ObjType: 1509;
VmtLink: Ofs(TypeOf(TFPASCIIChart)^); VmtLink: Ofs(TypeOf(TFPASCIIChart)^);
Load: @TFPASCIIChart.Load; Load: @TFPASCIIChart.Load;
Store: @TFPASCIIChart.Store Store: @TFPASCIIChart.Store
); );
{$endif FVISION}
RProgramInfoWindow: TStreamRec = ( RProgramInfoWindow: TStreamRec = (
ObjType: 1510; ObjType: 1510;
VmtLink: Ofs(TypeOf(TProgramInfoWindow)^); VmtLink: Ofs(TypeOf(TProgramInfoWindow)^);
@ -3842,6 +3848,7 @@ begin
inherited HandleEvent(Event); inherited HandleEvent(Event);
end; end;
{$ifndef FVISION}
constructor TFPASCIIChart.Init; constructor TFPASCIIChart.Init;
begin begin
inherited Init; inherited Init;
@ -3894,6 +3901,7 @@ begin
ASCIIChart:=nil; ASCIIChart:=nil;
inherited Done; inherited Done;
end; end;
{$endif FVISION}
function TVideoModeListBox.GetText(Item: pointer; MaxLen: sw_integer): string; function TVideoModeListBox.GetText(Item: pointer; MaxLen: sw_integer): string;
var P: PVideoModeList; var P: PVideoModeList;
@ -4152,7 +4160,9 @@ begin
RegisterType(RFPDesktop); RegisterType(RFPDesktop);
RegisterType(RGDBSourceEditor); RegisterType(RGDBSourceEditor);
RegisterType(RGDBWindow); RegisterType(RGDBWindow);
{$ifndef FVISION}
RegisterType(RFPASCIIChart); RegisterType(RFPASCIIChart);
{$endif FVISION}
RegisterType(RProgramInfoWindow); RegisterType(RProgramInfoWindow);
RegisterType(RFPDlgWindow); RegisterType(RFPDlgWindow);
end; end;
@ -4161,7 +4171,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.2 2001-08-05 02:01:48 peter Revision 1.3 2001-08-05 12:23:01 peter
* Automatically support for fvision or old fv
Revision 1.2 2001/08/05 02:01:48 peter
* FVISION define to compile with fvision units * FVISION define to compile with fvision units
Revision 1.1 2001/08/04 11:30:24 peter Revision 1.1 2001/08/04 11:30:24 peter