paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-03 06:38:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

MWE:

Browse Source 
~ Changed makefiles
  ~ Removed testform from lararus and changed it into program
  * some formatting

git-svn-id: trunk@106 -
This commit is contained in:
lazarus 2001-01-08 23:48:33 +00:00
parent e914a86c61
commit 416eed0941
7 changed files with 84 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -1,14 +1,13 @@
# #
# Makefile generated by fpcmake v1.00 [2000/12/19] # Makefile generated by fpcmake v1.00 [2000/12/18]
# #
defaultrule: all defaultrule: all
##################################################################### #####################################################################
# Autodetect OS (Linux or Dos or Windows NT or OS/2) # Autodetect OS (Linux or Dos or Windows NT)
# define inUnix when running under Unix (Linux,FreeBSD) # define inUnix when running under Unix (Linux,FreeBSD)
# define inWinNT when running under WinNT # define inWinNT when running under WinNT
# define inOS2 when running under OS/2
##################################################################### #####################################################################
# We need only / in the path # We need only / in the path
@ -168,7 +167,7 @@ endif
# Targets # Targets
override DIROBJECTS+=$(wildcard lcl components designer) override DIROBJECTS+=$(wildcard lcl components)
override EXEOBJECTS+=lazarus override EXEOBJECTS+=lazarus
# Clean # Clean
@ -184,7 +183,7 @@ ZIPTARGET=install
# Directories # Directories
override NEEDUNITDIR=. lcl/units components/units ./designer override NEEDUNITDIR=. ./lcl/units ./components/units ./designer
override NEEDINCDIR=. ./include ./include/$(OS_TARGET) override NEEDINCDIR=. ./include ./include/$(OS_TARGET)
ifndef TARGETDIR ifndef TARGETDIR
TARGETDIR=. TARGETDIR=.
@ -1114,9 +1113,6 @@ endif
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
PACKAGESUFFIX=w32 PACKAGESUFFIX=w32
endif endif
ifeq ($(OS_TARGET),os2)
PACKAGESUFFIX=emx
endif
endif endif
# Temporary path to pack a file # Temporary path to pack a file
@ -1362,7 +1358,7 @@ endif
# Dir components # Dir components
ifdef OBJECTDIRCOMPONENTS ifdef OBJECTDIRCOMPONENTS
.PHONY: components_all components_debug components_examples components_test components_smart components_shared components_showinstall components_install components_sourceinstall components_exampleinstall components_zipinstall components_zipsourceinstall components_zipexampleinstall components_clean components_distclean components_cleanall components_require components_info designer_clean .PHONY: components_all components_debug components_examples components_test components_smart components_shared components_showinstall components_install components_sourceinstall components_exampleinstall components_zipinstall components_zipsourceinstall components_zipexampleinstall components_clean components_distclean components_cleanall components_require components_info
components_all: components_all:
$(MAKE) -C components all $(MAKE) -C components all
@ -1417,9 +1413,6 @@ components_require:
components_info: components_info:
$(MAKE) -C components info $(MAKE) -C components info
designer_clean:
$(MAKE) -C designer clean
endif endif
##################################################################### #####################################################################
@ -1436,14 +1429,7 @@ endif
.PHONY: examples lcl components ide .PHONY: examples lcl components ide
# temp hack
# make 6 times to solve all unit dependencies
lcl: lcl_all lcl: lcl_all
$(MAKE) -C lcl
$(MAKE) -C lcl
$(MAKE) -C lcl
$(MAKE) -C lcl
$(MAKE) -C lcl
examples: lcl examples: lcl
$(MAKE) -C examples $(MAKE) -C examples

12
Makefile.fpc
View File

@ -4,7 +4,8 @@
[targets] [targets]
programs=lazarus programs=lazarus
dirs=lcl components #dirs=lcl components designer
dirs=lcl components
[clean] [clean]
units=$(basename $(wildcard *$(PPUEXT))) units=$(basename $(wildcard *$(PPUEXT)))
@ -14,7 +15,7 @@ packages=fcl gtk
[dirs] [dirs]
targetdir=. targetdir=.
unitdir=. lcl/units components/units ./designer unitdir=. ./lcl/units ./components/units ./designer
incdir=. ./include ./include/$(OS_TARGET) incdir=. ./include ./include/$(OS_TARGET)
[presettings] [presettings]
@ -22,14 +23,7 @@ incdir=. ./include ./include/$(OS_TARGET)
[rules] [rules]
.PHONY: examples lcl components ide .PHONY: examples lcl components ide
# temp hack
# make 6 times to solve all unit dependencies
lcl: lcl_all lcl: lcl_all
$(MAKE) -C lcl
$(MAKE) -C lcl
$(MAKE) -C lcl
$(MAKE) -C lcl
$(MAKE) -C lcl
examples: lcl examples: lcl
$(MAKE) -C examples $(MAKE) -C examples

8
ide/lazarus.pp
View File

@ -31,7 +31,6 @@ uses
forms, forms,
splash, splash,
main, main,
testform,
compileroptions, compileroptions,
viewunit_dlg, //dialog used to list the units in a project viewunit_dlg, //dialog used to list the units in a project
viewform_dlg; //dialog to display the forms in the project viewform_dlg; //dialog to display the forms in the project
@ -53,7 +52,6 @@ begin
Application.CreateForm(TMainIDE, MainIDE); Application.CreateForm(TMainIDE, MainIDE);
Application.CreateForm(TfrmCompilerOptions, frmCompilerOptions); Application.CreateForm(TfrmCompilerOptions, frmCompilerOptions);
Application.CreateForm(TTestForm, TestForm1);
Application.CreateForm(TViewUnits1, ViewUnits1); Application.CreateForm(TViewUnits1, ViewUnits1);
Application.CreateForm(TViewForms1, ViewForms1); Application.CreateForm(TViewForms1, ViewForms1);
SplashForm.StartTimer; SplashForm.StartTimer;
@ -63,6 +61,12 @@ end.
{ {
$Log$ $Log$
Revision 1.7 2001/01/08 23:48:33 lazarus
MWE:
~ Changed makefiles
~ Removed testform from lararus and changed it into program
* some formatting
Revision 1.6 2001/01/04 20:33:53 lazarus Revision 1.6 2001/01/04 20:33:53 lazarus
Moved lresources. Moved lresources.
Moved CreateLFM to Main.pp Moved CreateLFM to Main.pp

84
ide/main.pp
View File

@ -32,8 +32,9 @@ uses
Classes, LclLinux, compiler, stdctrls, forms, buttons, menus, comctrls, Classes, LclLinux, compiler, stdctrls, forms, buttons, menus, comctrls,
Spin, project,sysutils, global, Spin, project,sysutils, global,
compileroptions, Controls, graphics, extctrls, Dialogs, dlgMEssage, compileroptions, Controls, graphics, extctrls, Dialogs, dlgMEssage,
process, idecomp, Find_dlg, FormEditor, AbstractFormEditor, process, idecomp, Find_dlg, FormEditor, AbstractFormEditor,
CustomFormEditor,ObjectInspector, ControlSelection, PropEdits, UnitEditor,CompReg; CustomFormEditor,ObjectInspector, ControlSelection, PropEdits, UnitEditor,
CompReg;
const const
STANDARDBTNCOUNT = 50; STANDARDBTNCOUNT = 50;
@ -217,7 +218,7 @@ var
implementation implementation
uses uses
TestForm, ViewUnit_dlg,ViewForm_dlg, Math,lresources, Designer; ViewUnit_dlg,ViewForm_dlg, Math,lresources, Designer;
{ TMainIDE } { TMainIDE }
@ -312,43 +313,40 @@ begin
For I := 0 to RegCompList.PageCount-1 do for I := 0 to RegCompList.PageCount-1 do
Begin begin
RegCompPage := RegCompList.Pages[i]; RegCompPage := RegCompList.Pages[i];
if I = 0 then if I = 0
Notebook1.Pages.Strings[i] := RegCompPage.Name then Notebook1.Pages.Strings[i] := RegCompPage.Name
else else Notebook1.Pages.Add(RegCompPage.Name);
Notebook1.Pages.Add(RegCompPage.Name);
GlobalMouseSpeedButton := TSpeedButton.Create(Self); GlobalMouseSpeedButton := TSpeedButton.Create(Self);
with GlobalMouseSPeedButton do with GlobalMouseSPeedButton do
Begin Begin
Parent := Notebook1.page[I]; Parent := Notebook1.page[I];
Enabled := True; Enabled := True;
Width := 25; Width := 25;
Height := 25; Height := 25;
OnClick := @ControlClick; OnClick := @ControlClick;
Glyph := Pixmap1; Glyph := Pixmap1;
Visible := True; Visible := True;
Flat := True; Flat := True;
Down := True; Down := True;
Name := 'GlobalMouseSpeedButton'+inttostr(i); Name := 'GlobalMouseSpeedButton'+inttostr(i);
end; end;
for x := 0 to RegCompPage.Count-1 do //for every component on the page.... for x := 0 to RegCompPage.Count-1 do //for every component on the page....
begin begin
writeln('X = '+inttostr(x)); writeln('X = '+inttostr(x));
RegComp := RegCompPage.Items[x]; RegComp := RegCompPage.Items[x];
IDEComponent := TIDEComponent.Create; IDEComponent := TIDEComponent.Create;
IdeComponent.RegisteredComponent := RegComp; IdeComponent.RegisteredComponent := RegComp;
IDEComponent._SpeedButton(Self,Notebook1.Page[i]); IDEComponent._SpeedButton(Self,Notebook1.Page[i]);
IDEComponent.SpeedButton.OnClick := @ControlClick; IDEComponent.SpeedButton.OnClick := @ControlClick;
IDEComponent.SpeedButton.Hint := RegComp.ComponentClass.ClassName; IDEComponent.SpeedButton.Hint := RegComp.ComponentClass.ClassName;
IDEComponent.SpeedButton.ShowHint := True; IDEComponent.SpeedButton.ShowHint := True;
end; end;
end;
end;
Notebook1.PageIndex := 0; // Set it to the first page Notebook1.PageIndex := 0; // Set it to the first page
Notebook1.Show; Notebook1.Show;
@ -1784,8 +1782,8 @@ for I := 0 to Source.Count-1 do
if Length(Texts) <> 0 then Break; if Length(Texts) <> 0 then Break;
end; end;
temp := Texts; temp := Texts;
// Assert(False, 'Trace:*******************'); // Assert(False, 'Trace:*******************');
// Assert(False, 'Trace:Temp := '+Temp); // Assert(False, 'Trace:Temp := '+Temp);
Found := True; Found := True;
Break; Break;
end; end;
@ -1892,6 +1890,12 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.36 2001/01/08 23:48:33 lazarus
MWE:
~ Changed makefiles
~ Removed testform from lararus and changed it into program
* some formatting
Revision 1.35 2001/01/06 06:28:47 lazarus Revision 1.35 2001/01/06 06:28:47 lazarus
Made Designer control the control movement and such. I am now using ISDesignMsg to move the controls. Made Designer control the control movement and such. I am now using ISDesignMsg to move the controls.
Shane Shane

30
ide/testform.pp
View File

@ -20,17 +20,14 @@
} }
{$H+} {$H+}
//{$DEFINE NEW_EDITOR} //{$DEFINE NEW_EDITOR}
unit TestForm; program TestForm;
{$mode objfpc} {$mode objfpc}
interface
uses uses
classes, Controls, forms,buttons,sysutils, stdctrls, classes, Controls, forms,buttons,sysutils, stdctrls,
mwPasSyn,mwcustomedit, Graphics; mwPasSyn,mwcustomedit, Graphics,
// compiler, stdctrls,forms,buttons,menus,comctrls, LCLLinux;
// Spin, project,sysutils,global,editor, compileroptions,Controls,graphics,extctrls, TabNotBk,
type type
@ -60,9 +57,6 @@ type
var var
TestForm1 : TTestForm; TestForm1 : TTestForm;
implementation
uses
LCLLinux;
constructor TTestForm.Create(AOwner: TComponent); constructor TTestForm.Create(AOwner: TComponent);
begin begin
@ -108,6 +102,7 @@ begin
mwPasSyn1.KeyAttri.Foreground := clRed; mwPasSyn1.KeyAttri.Foreground := clRed;
mwPasSyn1.NumberAttri.Foreground := clGreen; mwPasSyn1.NumberAttri.Foreground := clGreen;
(*
mwEdit1 := TmwCustomEdit.Create(Self); mwEdit1 := TmwCustomEdit.Create(Self);
mwEdit1.Top := 25; mwEdit1.Top := 25;
mwEdit1.Left := 0; mwEdit1.Left := 0;
@ -129,7 +124,7 @@ begin
// mwEdit1.Align := alClient; // mwEdit1.Align := alClient;
Assert(False, 'Trace:Created mwCustomEdit ...'); Assert(False, 'Trace:Created mwCustomEdit ...');
*)
cmdTest := TButton.Create(Self); cmdTest := TButton.Create(Self);
with cmdTest do with cmdTest do
@ -253,8 +248,8 @@ Begin
Assert(False, 'Trace:[TTestForm.ButtonClick] SetEditText'); Assert(False, 'Trace:[TTestForm.ButtonClick] SetEditText');
// mwEdit1.Lines.Text := mwEdit1.Lines.Text + 'Lazarus test code ' + #10 ; // mwEdit1.Lines.Text := mwEdit1.Lines.Text + 'Lazarus test code ' + #10 ;
mwEdit1.Lines.Add('Lazarus test code'); mwEdit1.Lines.Add('Lazarus test code');
Assert(False, 'Trace:[TTestForm.ButtonClick] Text --> ' + mwEdit1.Lines.Text); // Assert(False, 'Trace:[TTestForm.ButtonClick] Text --> ' + mwEdit1.Lines.Text);
// mwEdit1.RePaint; mwEdit1.RePaint;
except except
on E: Exception do WriteLN('Exception: ' + E.Message); on E: Exception do WriteLN('Exception: ' + E.Message);
//on Exception do; //on Exception do;
@ -295,6 +290,11 @@ begin
mwEdit1.SetFocus; mwEdit1.SetFocus;
end; end;
begin
Application.Initialize;
Application.CreateForm(TTestForm, TestForm1);
Application.Run;
end. end.
@ -302,6 +302,12 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.2 2001/01/08 23:48:33 lazarus
MWE:
~ Changed makefiles
~ Removed testform from lararus and changed it into program
* some formatting
Revision 1.1 2000/07/13 10:27:48 michael Revision 1.1 2000/07/13 10:27:48 michael
+ Initial import + Initial import

13
lcl/Makefile
View File

@ -1,14 +1,13 @@
# #
# Makefile generated by fpcmake v1.00 [2000/12/19] # Makefile generated by fpcmake v1.00 [2000/12/18]
# #
defaultrule: all defaultrule: all
##################################################################### #####################################################################
# Autodetect OS (Linux or Dos or Windows NT or OS/2) # Autodetect OS (Linux or Dos or Windows NT)
# define inUnix when running under Unix (Linux,FreeBSD) # define inUnix when running under Unix (Linux,FreeBSD)
# define inWinNT when running under WinNT # define inWinNT when running under WinNT
# define inOS2 when running under OS/2
##################################################################### #####################################################################
# We need only / in the path # We need only / in the path
@ -188,6 +187,7 @@ ZIPTARGET=install
# Defaults # Defaults
override NEEDOPT=-Ca
# Directories # Directories
@ -799,6 +799,10 @@ ifdef VERBOSE
override FPCOPT+=-vwni override FPCOPT+=-vwni
endif endif
ifdef NEEDOPT
override FPCOPT+=$(NEEDOPT)
endif
ifdef NEEDUNITDIR ifdef NEEDUNITDIR
override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR)) override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
endif endif
@ -1119,9 +1123,6 @@ endif
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
PACKAGESUFFIX=w32 PACKAGESUFFIX=w32
endif endif
ifeq ($(OS_TARGET),os2)
PACKAGESUFFIX=emx
endif
endif endif
# Temporary path to pack a file # Temporary path to pack a file

1
lcl/Makefile.fpc
View File

@ -6,6 +6,7 @@
programs=allunits programs=allunits
[require] [require]
options=-Ca
packages=fcl gtk packages=fcl gtk
[clean] [clean]