mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-14 16:19:46 +02:00
MWE:
~ Changed makefiles ~ Removed testform from lararus and changed it into program * some formatting git-svn-id: trunk@106 -
This commit is contained in:
lazarus
parent
e914a86c61
commit
416eed0941
24
Makefile
24
Makefile
@ -1,14 +1,13 @@
|
||||
#
|
||||
# Makefile generated by fpcmake v1.00 [2000/12/19]
|
||||
# Makefile generated by fpcmake v1.00 [2000/12/18]
|
||||
#
|
||||
|
||||
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 inWinNT when running under WinNT
|
||||
# define inOS2 when running under OS/2
|
||||
#####################################################################
|
||||
|
||||
# We need only / in the path
|
||||
@ -168,7 +167,7 @@ endif
|
||||
|
||||
# Targets
|
||||
|
||||
override DIROBJECTS+=$(wildcard lcl components designer)
|
||||
override DIROBJECTS+=$(wildcard lcl components)
|
||||
override EXEOBJECTS+=lazarus
|
||||
|
||||
# Clean
|
||||
@ -184,7 +183,7 @@ ZIPTARGET=install
|
||||
|
||||
# Directories
|
||||
|
||||
override NEEDUNITDIR=. lcl/units components/units ./designer
|
||||
override NEEDUNITDIR=. ./lcl/units ./components/units ./designer
|
||||
override NEEDINCDIR=. ./include ./include/$(OS_TARGET)
|
||||
ifndef TARGETDIR
|
||||
TARGETDIR=.
|
||||
@ -1114,9 +1113,6 @@ endif
|
||||
ifeq ($(OS_TARGET),win32)
|
||||
PACKAGESUFFIX=w32
|
||||
endif
|
||||
ifeq ($(OS_TARGET),os2)
|
||||
PACKAGESUFFIX=emx
|
||||
endif
|
||||
endif
|
||||
|
||||
# Temporary path to pack a file
|
||||
@ -1362,7 +1358,7 @@ endif
|
||||
# Dir components
|
||||
|
||||
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:
|
||||
$(MAKE) -C components all
|
||||
@ -1417,9 +1413,6 @@ components_require:
|
||||
|
||||
components_info:
|
||||
$(MAKE) -C components info
|
||||
|
||||
designer_clean:
|
||||
$(MAKE) -C designer clean
|
||||
endif
|
||||
|
||||
#####################################################################
|
||||
@ -1436,14 +1429,7 @@ endif
|
||||
|
||||
.PHONY: examples lcl components ide
|
||||
|
||||
# temp hack
|
||||
# make 6 times to solve all unit dependencies
|
||||
lcl: lcl_all
|
||||
$(MAKE) -C lcl
|
||||
$(MAKE) -C lcl
|
||||
$(MAKE) -C lcl
|
||||
$(MAKE) -C lcl
|
||||
$(MAKE) -C lcl
|
||||
|
||||
examples: lcl
|
||||
$(MAKE) -C examples
|
||||
|
||||
12
Makefile.fpc
12
Makefile.fpc
@ -4,7 +4,8 @@
|
||||
|
||||
[targets]
|
||||
programs=lazarus
|
||||
dirs=lcl components
|
||||
#dirs=lcl components designer
|
||||
dirs=lcl components
|
||||
|
||||
[clean]
|
||||
units=$(basename $(wildcard *$(PPUEXT)))
|
||||
@ -14,7 +15,7 @@ packages=fcl gtk
|
||||
|
||||
[dirs]
|
||||
targetdir=.
|
||||
unitdir=. lcl/units components/units ./designer
|
||||
unitdir=. ./lcl/units ./components/units ./designer
|
||||
incdir=. ./include ./include/$(OS_TARGET)
|
||||
|
||||
[presettings]
|
||||
@ -22,14 +23,7 @@ incdir=. ./include ./include/$(OS_TARGET)
|
||||
[rules]
|
||||
.PHONY: examples lcl components ide
|
||||
|
||||
# temp hack
|
||||
# make 6 times to solve all unit dependencies
|
||||
lcl: lcl_all
|
||||
$(MAKE) -C lcl
|
||||
$(MAKE) -C lcl
|
||||
$(MAKE) -C lcl
|
||||
$(MAKE) -C lcl
|
||||
$(MAKE) -C lcl
|
||||
|
||||
examples: lcl
|
||||
$(MAKE) -C examples
|
||||
|
||||
@ -31,7 +31,6 @@ uses
|
||||
forms,
|
||||
splash,
|
||||
main,
|
||||
testform,
|
||||
compileroptions,
|
||||
viewunit_dlg, //dialog used to list the units in a project
|
||||
viewform_dlg; //dialog to display the forms in the project
|
||||
@ -53,7 +52,6 @@ begin
|
||||
|
||||
Application.CreateForm(TMainIDE, MainIDE);
|
||||
Application.CreateForm(TfrmCompilerOptions, frmCompilerOptions);
|
||||
Application.CreateForm(TTestForm, TestForm1);
|
||||
Application.CreateForm(TViewUnits1, ViewUnits1);
|
||||
Application.CreateForm(TViewForms1, ViewForms1);
|
||||
SplashForm.StartTimer;
|
||||
@ -63,6 +61,12 @@ end.
|
||||
|
||||
{
|
||||
$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
|
||||
Moved lresources.
|
||||
Moved CreateLFM to Main.pp
|
||||
|
||||
84
ide/main.pp
84
ide/main.pp
@ -32,8 +32,9 @@ uses
|
||||
Classes, LclLinux, compiler, stdctrls, forms, buttons, menus, comctrls,
|
||||
Spin, project,sysutils, global,
|
||||
compileroptions, Controls, graphics, extctrls, Dialogs, dlgMEssage,
|
||||
process, idecomp, Find_dlg, FormEditor, AbstractFormEditor,
|
||||
CustomFormEditor,ObjectInspector, ControlSelection, PropEdits, UnitEditor,CompReg;
|
||||
process, idecomp, Find_dlg, FormEditor, AbstractFormEditor,
|
||||
CustomFormEditor,ObjectInspector, ControlSelection, PropEdits, UnitEditor,
|
||||
CompReg;
|
||||
|
||||
const
|
||||
STANDARDBTNCOUNT = 50;
|
||||
@ -217,7 +218,7 @@ var
|
||||
implementation
|
||||
|
||||
uses
|
||||
TestForm, ViewUnit_dlg,ViewForm_dlg, Math,lresources, Designer;
|
||||
ViewUnit_dlg,ViewForm_dlg, Math,lresources, Designer;
|
||||
|
||||
|
||||
{ TMainIDE }
|
||||
@ -312,43 +313,40 @@ begin
|
||||
|
||||
|
||||
|
||||
For I := 0 to RegCompList.PageCount-1 do
|
||||
Begin
|
||||
RegCompPage := RegCompList.Pages[i];
|
||||
if I = 0 then
|
||||
Notebook1.Pages.Strings[i] := RegCompPage.Name
|
||||
else
|
||||
Notebook1.Pages.Add(RegCompPage.Name);
|
||||
for I := 0 to RegCompList.PageCount-1 do
|
||||
begin
|
||||
RegCompPage := RegCompList.Pages[i];
|
||||
if I = 0
|
||||
then Notebook1.Pages.Strings[i] := RegCompPage.Name
|
||||
else Notebook1.Pages.Add(RegCompPage.Name);
|
||||
|
||||
GlobalMouseSpeedButton := TSpeedButton.Create(Self);
|
||||
with GlobalMouseSPeedButton do
|
||||
Begin
|
||||
Parent := Notebook1.page[I];
|
||||
Enabled := True;
|
||||
Width := 25;
|
||||
Height := 25;
|
||||
OnClick := @ControlClick;
|
||||
Glyph := Pixmap1;
|
||||
Visible := True;
|
||||
Flat := True;
|
||||
Down := True;
|
||||
Name := 'GlobalMouseSpeedButton'+inttostr(i);
|
||||
end;
|
||||
GlobalMouseSpeedButton := TSpeedButton.Create(Self);
|
||||
with GlobalMouseSPeedButton do
|
||||
Begin
|
||||
Parent := Notebook1.page[I];
|
||||
Enabled := True;
|
||||
Width := 25;
|
||||
Height := 25;
|
||||
OnClick := @ControlClick;
|
||||
Glyph := Pixmap1;
|
||||
Visible := True;
|
||||
Flat := True;
|
||||
Down := True;
|
||||
Name := 'GlobalMouseSpeedButton'+inttostr(i);
|
||||
end;
|
||||
|
||||
for x := 0 to RegCompPage.Count-1 do //for every component on the page....
|
||||
begin
|
||||
writeln('X = '+inttostr(x));
|
||||
RegComp := RegCompPage.Items[x];
|
||||
IDEComponent := TIDEComponent.Create;
|
||||
IdeComponent.RegisteredComponent := RegComp;
|
||||
IDEComponent._SpeedButton(Self,Notebook1.Page[i]);
|
||||
IDEComponent.SpeedButton.OnClick := @ControlClick;
|
||||
IDEComponent.SpeedButton.Hint := RegComp.ComponentClass.ClassName;
|
||||
IDEComponent.SpeedButton.ShowHint := True;
|
||||
end;
|
||||
|
||||
|
||||
end;
|
||||
for x := 0 to RegCompPage.Count-1 do //for every component on the page....
|
||||
begin
|
||||
writeln('X = '+inttostr(x));
|
||||
RegComp := RegCompPage.Items[x];
|
||||
IDEComponent := TIDEComponent.Create;
|
||||
IdeComponent.RegisteredComponent := RegComp;
|
||||
IDEComponent._SpeedButton(Self,Notebook1.Page[i]);
|
||||
IDEComponent.SpeedButton.OnClick := @ControlClick;
|
||||
IDEComponent.SpeedButton.Hint := RegComp.ComponentClass.ClassName;
|
||||
IDEComponent.SpeedButton.ShowHint := True;
|
||||
end;
|
||||
end;
|
||||
|
||||
Notebook1.PageIndex := 0; // Set it to the first page
|
||||
Notebook1.Show;
|
||||
@ -1784,8 +1782,8 @@ for I := 0 to Source.Count-1 do
|
||||
if Length(Texts) <> 0 then Break;
|
||||
end;
|
||||
temp := Texts;
|
||||
// Assert(False, 'Trace:*******************');
|
||||
// Assert(False, 'Trace:Temp := '+Temp);
|
||||
// Assert(False, 'Trace:*******************');
|
||||
// Assert(False, 'Trace:Temp := '+Temp);
|
||||
Found := True;
|
||||
Break;
|
||||
end;
|
||||
@ -1892,6 +1890,12 @@ end.
|
||||
{ =============================================================================
|
||||
|
||||
$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
|
||||
Made Designer control the control movement and such. I am now using ISDesignMsg to move the controls.
|
||||
Shane
|
||||
|
||||
@ -20,17 +20,14 @@
|
||||
}
|
||||
{$H+}
|
||||
//{$DEFINE NEW_EDITOR}
|
||||
unit TestForm;
|
||||
program TestForm;
|
||||
|
||||
{$mode objfpc}
|
||||
|
||||
interface
|
||||
|
||||
uses
|
||||
classes, Controls, forms,buttons,sysutils, stdctrls,
|
||||
mwPasSyn,mwcustomedit, Graphics;
|
||||
// compiler, stdctrls,forms,buttons,menus,comctrls,
|
||||
// Spin, project,sysutils,global,editor, compileroptions,Controls,graphics,extctrls, TabNotBk,
|
||||
mwPasSyn,mwcustomedit, Graphics,
|
||||
LCLLinux;
|
||||
|
||||
type
|
||||
|
||||
@ -60,9 +57,6 @@ type
|
||||
var
|
||||
TestForm1 : TTestForm;
|
||||
|
||||
implementation
|
||||
uses
|
||||
LCLLinux;
|
||||
|
||||
constructor TTestForm.Create(AOwner: TComponent);
|
||||
begin
|
||||
@ -108,6 +102,7 @@ begin
|
||||
mwPasSyn1.KeyAttri.Foreground := clRed;
|
||||
mwPasSyn1.NumberAttri.Foreground := clGreen;
|
||||
|
||||
(*
|
||||
mwEdit1 := TmwCustomEdit.Create(Self);
|
||||
mwEdit1.Top := 25;
|
||||
mwEdit1.Left := 0;
|
||||
@ -129,7 +124,7 @@ begin
|
||||
// mwEdit1.Align := alClient;
|
||||
|
||||
Assert(False, 'Trace:Created mwCustomEdit ...');
|
||||
|
||||
*)
|
||||
cmdTest := TButton.Create(Self);
|
||||
|
||||
with cmdTest do
|
||||
@ -253,8 +248,8 @@ Begin
|
||||
Assert(False, 'Trace:[TTestForm.ButtonClick] SetEditText');
|
||||
// mwEdit1.Lines.Text := mwEdit1.Lines.Text + 'Lazarus test code ' + #10 ;
|
||||
mwEdit1.Lines.Add('Lazarus test code');
|
||||
Assert(False, 'Trace:[TTestForm.ButtonClick] Text --> ' + mwEdit1.Lines.Text);
|
||||
// mwEdit1.RePaint;
|
||||
// Assert(False, 'Trace:[TTestForm.ButtonClick] Text --> ' + mwEdit1.Lines.Text);
|
||||
mwEdit1.RePaint;
|
||||
except
|
||||
on E: Exception do WriteLN('Exception: ' + E.Message);
|
||||
//on Exception do;
|
||||
@ -295,6 +290,11 @@ begin
|
||||
mwEdit1.SetFocus;
|
||||
end;
|
||||
|
||||
|
||||
begin
|
||||
Application.Initialize;
|
||||
Application.CreateForm(TTestForm, TestForm1);
|
||||
Application.Run;
|
||||
end.
|
||||
|
||||
|
||||
@ -302,6 +302,12 @@ end.
|
||||
{ =============================================================================
|
||||
|
||||
$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
|
||||
+ Initial import
|
||||
|
||||
|
||||
13
lcl/Makefile
13
lcl/Makefile
@ -1,14 +1,13 @@
|
||||
#
|
||||
# Makefile generated by fpcmake v1.00 [2000/12/19]
|
||||
# Makefile generated by fpcmake v1.00 [2000/12/18]
|
||||
#
|
||||
|
||||
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 inWinNT when running under WinNT
|
||||
# define inOS2 when running under OS/2
|
||||
#####################################################################
|
||||
|
||||
# We need only / in the path
|
||||
@ -188,6 +187,7 @@ ZIPTARGET=install
|
||||
|
||||
# Defaults
|
||||
|
||||
override NEEDOPT=-Ca
|
||||
|
||||
# Directories
|
||||
|
||||
@ -799,6 +799,10 @@ ifdef VERBOSE
|
||||
override FPCOPT+=-vwni
|
||||
endif
|
||||
|
||||
ifdef NEEDOPT
|
||||
override FPCOPT+=$(NEEDOPT)
|
||||
endif
|
||||
|
||||
ifdef NEEDUNITDIR
|
||||
override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
|
||||
endif
|
||||
@ -1119,9 +1123,6 @@ endif
|
||||
ifeq ($(OS_TARGET),win32)
|
||||
PACKAGESUFFIX=w32
|
||||
endif
|
||||
ifeq ($(OS_TARGET),os2)
|
||||
PACKAGESUFFIX=emx
|
||||
endif
|
||||
endif
|
||||
|
||||
# Temporary path to pack a file
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
programs=allunits
|
||||
|
||||
[require]
|
||||
options=-Ca
|
||||
packages=fcl gtk
|
||||
|
||||
[clean]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user