1Index: components/cgi/ide/cgilazide.pas 2=================================================================== 3--- components/cgi/ide/cgilazide.pas (revision 23296) 4+++ components/cgi/ide/cgilazide.pas (working copy) 5@@ -1,13 +1,13 @@ 6-{ This file was automatically created by Lazarus. Do not edit! 7-This source is only used to compile and install the package. 8+{ This file was automatically created by Lazarus. do not edit! 9+ This source is only used to compile and install the package. 10 } 11 12-unit CGILazIDE; 13+unit cgilazide; 14 15 interface 16 17 uses 18- CGILazIDEIntf, LazarusPackageIntf; 19+ CGILazIDEIntf, LazarusPackageIntf; 20 21 implementation 22 23Index: components/cgi/ide/Makefile 24=================================================================== 25--- components/cgi/ide/Makefile (revision 23296) 26+++ components/cgi/ide/Makefile (working copy) 27@@ -1,5 +1,5 @@ 28 # 29-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11] 30+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/11/02] 31 # 32 default: all 33 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded 34@@ -59,9 +59,11 @@ 35 endif 36 ifdef COMSPEC 37 ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) 38+ifndef RUNBATCH 39 RUNBATCH=$(COMSPEC) /C 40 endif 41 endif 42+endif 43 ifdef inUnix 44 PATHSEP=/ 45 else 46@@ -114,7 +116,11 @@ 47 endif 48 ifneq ($(findstring Error,$(FPC)),) 49 override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) 50+else 51+ifeq ($(strip $(wildcard $(FPC))),) 52+FPC:=$(firstword $(FPCPROG)) 53 endif 54+endif 55 else 56 override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) 57 endif 58@@ -972,178 +978,178 @@ 59 override COMPILER_INCLUDEDIR+=./ 60 endif 61 ifeq ($(FULL_TARGET),i386-linux) 62-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 63+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 64 endif 65 ifeq ($(FULL_TARGET),i386-go32v2) 66-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 67+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 68 endif 69 ifeq ($(FULL_TARGET),i386-win32) 70-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 71+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 72 endif 73 ifeq ($(FULL_TARGET),i386-os2) 74-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 75+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 76 endif 77 ifeq ($(FULL_TARGET),i386-freebsd) 78-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 79+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 80 endif 81 ifeq ($(FULL_TARGET),i386-beos) 82-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 83+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 84 endif 85 ifeq ($(FULL_TARGET),i386-haiku) 86-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 87+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 88 endif 89 ifeq ($(FULL_TARGET),i386-netbsd) 90-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 91+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 92 endif 93 ifeq ($(FULL_TARGET),i386-solaris) 94-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 95+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 96 endif 97 ifeq ($(FULL_TARGET),i386-qnx) 98-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 99+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 100 endif 101 ifeq ($(FULL_TARGET),i386-netware) 102-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 103+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 104 endif 105 ifeq ($(FULL_TARGET),i386-openbsd) 106-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 107+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 108 endif 109 ifeq ($(FULL_TARGET),i386-wdosx) 110-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 111+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 112 endif 113 ifeq ($(FULL_TARGET),i386-darwin) 114-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 115+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 116 endif 117 ifeq ($(FULL_TARGET),i386-emx) 118-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 119+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 120 endif 121 ifeq ($(FULL_TARGET),i386-watcom) 122-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 123+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 124 endif 125 ifeq ($(FULL_TARGET),i386-netwlibc) 126-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 127+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 128 endif 129 ifeq ($(FULL_TARGET),i386-wince) 130-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 131+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 132 endif 133 ifeq ($(FULL_TARGET),i386-embedded) 134-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 135+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 136 endif 137 ifeq ($(FULL_TARGET),i386-symbian) 138-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 139+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 140 endif 141 ifeq ($(FULL_TARGET),m68k-linux) 142-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 143+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 144 endif 145 ifeq ($(FULL_TARGET),m68k-freebsd) 146-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 147+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 148 endif 149 ifeq ($(FULL_TARGET),m68k-netbsd) 150-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 151+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 152 endif 153 ifeq ($(FULL_TARGET),m68k-amiga) 154-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 155+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 156 endif 157 ifeq ($(FULL_TARGET),m68k-atari) 158-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 159+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 160 endif 161 ifeq ($(FULL_TARGET),m68k-openbsd) 162-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 163+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 164 endif 165 ifeq ($(FULL_TARGET),m68k-palmos) 166-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 167+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 168 endif 169 ifeq ($(FULL_TARGET),m68k-embedded) 170-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 171+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 172 endif 173 ifeq ($(FULL_TARGET),powerpc-linux) 174-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 175+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 176 endif 177 ifeq ($(FULL_TARGET),powerpc-netbsd) 178-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 179+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 180 endif 181 ifeq ($(FULL_TARGET),powerpc-amiga) 182-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 183+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 184 endif 185 ifeq ($(FULL_TARGET),powerpc-macos) 186-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 187+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 188 endif 189 ifeq ($(FULL_TARGET),powerpc-darwin) 190-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 191+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 192 endif 193 ifeq ($(FULL_TARGET),powerpc-morphos) 194-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 195+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 196 endif 197 ifeq ($(FULL_TARGET),powerpc-embedded) 198-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 199+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 200 endif 201 ifeq ($(FULL_TARGET),sparc-linux) 202-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 203+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 204 endif 205 ifeq ($(FULL_TARGET),sparc-netbsd) 206-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 207+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 208 endif 209 ifeq ($(FULL_TARGET),sparc-solaris) 210-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 211+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 212 endif 213 ifeq ($(FULL_TARGET),sparc-embedded) 214-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 215+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 216 endif 217 ifeq ($(FULL_TARGET),x86_64-linux) 218-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 219+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 220 endif 221 ifeq ($(FULL_TARGET),x86_64-freebsd) 222-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 223+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 224 endif 225 ifeq ($(FULL_TARGET),x86_64-darwin) 226-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 227+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 228 endif 229 ifeq ($(FULL_TARGET),x86_64-win64) 230-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 231+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 232 endif 233 ifeq ($(FULL_TARGET),x86_64-embedded) 234-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 235+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 236 endif 237 ifeq ($(FULL_TARGET),arm-linux) 238-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 239+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 240 endif 241 ifeq ($(FULL_TARGET),arm-palmos) 242-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 243+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 244 endif 245 ifeq ($(FULL_TARGET),arm-darwin) 246-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 247+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 248 endif 249 ifeq ($(FULL_TARGET),arm-wince) 250-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 251+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 252 endif 253 ifeq ($(FULL_TARGET),arm-gba) 254-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 255+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 256 endif 257 ifeq ($(FULL_TARGET),arm-nds) 258-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 259+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 260 endif 261 ifeq ($(FULL_TARGET),arm-embedded) 262-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 263+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 264 endif 265 ifeq ($(FULL_TARGET),arm-symbian) 266-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 267+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 268 endif 269 ifeq ($(FULL_TARGET),powerpc64-linux) 270-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 271+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 272 endif 273 ifeq ($(FULL_TARGET),powerpc64-darwin) 274-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 275+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 276 endif 277 ifeq ($(FULL_TARGET),powerpc64-embedded) 278-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 279+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 280 endif 281 ifeq ($(FULL_TARGET),avr-embedded) 282-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 283+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 284 endif 285 ifeq ($(FULL_TARGET),armeb-linux) 286-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 287+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 288 endif 289 ifeq ($(FULL_TARGET),armeb-embedded) 290-override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 291+override COMPILER_UNITDIR+=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 292 endif 293 ifeq ($(FULL_TARGET),i386-linux) 294 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) 295@@ -1537,6 +1543,7 @@ 296 ifeq ($(OS_TARGET),go32v2) 297 STATICLIBPREFIX= 298 SHORTSUFFIX=dos 299+IMPORTLIBPREFIX= 300 endif 301 ifeq ($(OS_TARGET),watcom) 302 STATICLIBPREFIX= 303@@ -1544,6 +1551,7 @@ 304 ASMEXT=.asm 305 SHAREDLIBEXT=.dll 306 SHORTSUFFIX=wat 307+IMPORTLIBPREFIX= 308 endif 309 ifeq ($(OS_TARGET),linux) 310 BATCHEXT=.sh 311@@ -1580,6 +1588,7 @@ 312 SHAREDLIBEXT=.dll 313 SHORTSUFFIX=os2 314 ECHO=echo 315+IMPORTLIBPREFIX= 316 endif 317 ifeq ($(OS_TARGET),emx) 318 BATCHEXT=.cmd 319@@ -1588,6 +1597,7 @@ 320 SHAREDLIBEXT=.dll 321 SHORTSUFFIX=emx 322 ECHO=echo 323+IMPORTLIBPREFIX= 324 endif 325 ifeq ($(OS_TARGET),amiga) 326 EXEEXT= 327@@ -1627,17 +1637,20 @@ 328 EXEEXT=.nlm 329 STATICLIBPREFIX= 330 SHORTSUFFIX=nw 331+IMPORTLIBPREFIX=imp 332 endif 333 ifeq ($(OS_TARGET),netwlibc) 334 EXEEXT=.nlm 335 STATICLIBPREFIX= 336 SHORTSUFFIX=nwl 337+IMPORTLIBPREFIX=imp 338 endif 339 ifeq ($(OS_TARGET),macos) 340 BATCHEXT= 341 EXEEXT= 342 DEBUGSYMEXT=.xcoff 343 SHORTSUFFIX=mac 344+IMPORTLIBPREFIX=imp 345 endif 346 ifeq ($(OS_TARGET),darwin) 347 BATCHEXT=.sh 348@@ -1664,14 +1677,17 @@ 349 SHAREDLIBEXT=.so1 350 STATICLIBPREFIX= 351 SHORTSUFFIX=v1 352+IMPORTLIBPREFIX= 353 endif 354 ifeq ($(OS_TARGET),go32v2) 355 STATICLIBPREFIX= 356 SHORTSUFFIX=dos 357+IMPORTLIBPREFIX= 358 endif 359 ifeq ($(OS_TARGET),watcom) 360 STATICLIBPREFIX= 361 SHORTSUFFIX=wat 362+IMPORTLIBPREFIX= 363 endif 364 ifeq ($(OS_TARGET),linux) 365 BATCHEXT=.sh 366@@ -1718,6 +1734,7 @@ 367 SHAREDLIBEXT=.dll 368 SHORTSUFFIX=os2 369 ECHO=echo 370+IMPORTLIBPREFIX= 371 endif 372 ifeq ($(OS_TARGET),amiga) 373 EXEEXT= 374@@ -1778,6 +1795,7 @@ 375 SHAREDLIBEXT=.nlm 376 EXEEXT=.nlm 377 SHORTSUFFIX=nw 378+IMPORTLIBPREFIX=imp 379 endif 380 ifeq ($(OS_TARGET),netwlibc) 381 STATICLIBPREFIX= 382@@ -1789,6 +1807,7 @@ 383 SHAREDLIBEXT=.nlm 384 EXEEXT=.nlm 385 SHORTSUFFIX=nwl 386+IMPORTLIBPREFIX=imp 387 endif 388 ifeq ($(OS_TARGET),macos) 389 BATCHEXT= 390@@ -1800,6 +1819,7 @@ 391 EXEEXT= 392 DEBUGSYMEXT=.xcoff 393 SHORTSUFFIX=mac 394+IMPORTLIBPREFIX=imp 395 endif 396 endif 397 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) 398Index: components/cgi/ide/Makefile.fpc 399=================================================================== 400--- components/cgi/ide/Makefile.fpc (revision 23296) 401+++ components/cgi/ide/Makefile.fpc (working copy) 402@@ -2,7 +2,7 @@ 403 # 404 # Makefile.fpc for CGILazIDE 0.0 405 # 406-# This file was generated on 25-9-2008 407+# This file was generated on 16.12.2009 408 409 [package] 410 name=cgilazide 411@@ -10,7 +10,7 @@ 412 413 [compiler] 414 unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET) 415-unitdir=../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 416+unitdir=../../../../../lazarus/components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./ 417 includedir=./ 418 options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi 419 420Index: components/rtticontrols/runtimetypeinfocontrols.pas 421=================================================================== 422--- components/rtticontrols/runtimetypeinfocontrols.pas (revision 23296) 423+++ components/rtticontrols/runtimetypeinfocontrols.pas (working copy) 424@@ -1,13 +1,13 @@ 425-{ Diese Datei wurde automatisch von Lazarus erzeugt. Sie darf nicht bearbeitet werden! 426-Dieser Quelltext dient nur dem �bersetzen und Installieren des Packages. 427+{ This file was automatically created by Lazarus. do not edit! 428+ This source is only used to compile and install the package. 429 } 430 431-unit RunTimeTypeInfoControls; 432+unit runtimetypeinfocontrols; 433 434 interface 435 436 uses 437- RTTICtrls, RTTIGrids, LazarusPackageIntf; 438+ RTTICtrls, RTTIGrids, LazarusPackageIntf; 439 440 implementation 441 442Index: components/tachart/tachartlazaruspkg.pas 443=================================================================== 444--- components/tachart/tachartlazaruspkg.pas (revision 23296) 445+++ components/tachart/tachartlazaruspkg.pas (working copy) 446@@ -1,4 +1,4 @@ 447-{ This file was automatically created by Lazarus. do not edit ! 448+{ This file was automatically created by Lazarus. do not edit! 449 This source is only used to compile and install the package. 450 } 451 452Index: components/tdbf/dbflaz.pas 453=================================================================== 454--- components/tdbf/dbflaz.pas (revision 23296) 455+++ components/tdbf/dbflaz.pas (working copy) 456@@ -1,13 +1,13 @@ 457-{ This file was automatically created by Lazarus. Do not edit! 458-This source is only used to compile and install the package. 459+{ This file was automatically created by Lazarus. do not edit! 460+ This source is only used to compile and install the package. 461 } 462 463-unit DBFLaz; 464+unit dbflaz; 465 466 interface 467 468 uses 469- RegisterDBF, Dbf, LazarusPackageIntf; 470+ RegisterDBF, Dbf, LazarusPackageIntf; 471 472 implementation 473 474Index: designer/objinspext.pas 475=================================================================== 476--- designer/objinspext.pas (revision 23296) 477+++ designer/objinspext.pas (working copy) 478@@ -77,6 +77,9 @@ 479 480 implementation 481 482+uses 483+ uMakeSite; 484+ 485 function CreateDefaultOIFavouriteProperties: TOIFavouriteProperties; 486 487 procedure Add(ABaseClass: TPersistentClass; const APropertyName: string); 488@@ -200,7 +203,7 @@ 489 end; 490 except 491 on E: Exception do begin 492- debugln('Error: LoadOIFavouriteProperties: unable to write ', 493+ debugln('Error: SaveOIFavouriteProperties: unable to write ', 494 GetOIFavouriteConfigFilename); 495 end; 496 end; 497Index: ide/codeexplorer.lfm 498=================================================================== 499--- ide/codeexplorer.lfm (revision 23296) 500+++ ide/codeexplorer.lfm (working copy) 501@@ -25,14 +25,14 @@ 502 TabOrder = 0 503 object CodePage: TPage 504 Caption = 'CodePage' 505- ClientWidth = 213 506- ClientHeight = 488 507+ ClientWidth = 207 508+ ClientHeight = 489 509 object CodeTreeview: TTreeView 510 AnchorSideTop.Side = asrBottom 511 Left = 0 512- Height = 462 513+ Height = 463 514 Top = 26 515- Width = 213 516+ Width = 207 517 Align = alClient 518 BorderSpacing.Top = 1 519 HideSelection = False 520@@ -50,14 +50,14 @@ 521 Left = 0 522 Height = 25 523 Top = 0 524- Width = 213 525+ Width = 207 526 Align = alTop 527 BevelOuter = bvNone 528 ClientHeight = 25 529- ClientWidth = 213 530+ ClientWidth = 207 531 TabOrder = 1 532 object OptionsSpeedButton: TSpeedButton 533- Left = 186 534+ Left = 180 535 Height = 22 536 Hint = 'Options for CodeExplorer' 537 Top = 1 538@@ -70,7 +70,7 @@ 539 ParentShowHint = False 540 end 541 object RefreshSpeedButton: TSpeedButton 542- Left = 138 543+ Left = 132 544 Height = 22 545 Hint = 'Refresh CodeExplorer' 546 Top = 1 547@@ -83,7 +83,7 @@ 548 ParentShowHint = False 549 end 550 object ModeSpeedButton: TSpeedButton 551- Left = 162 552+ Left = 156 553 Height = 22 554 Top = 1 555 Width = 23 556@@ -102,7 +102,7 @@ 557 Left = 0 558 Height = 23 559 Top = 0 560- Width = 136 561+ Width = 130 562 Anchors = [akTop, akLeft, akRight] 563 OnChange = CodeFilterEditChange 564 TabOrder = 0 565@@ -112,17 +112,17 @@ 566 end 567 object DirectivesPage: TPage 568 Caption = 'DirectivesPage' 569- ClientWidth = 213 570- ClientHeight = 488 571+ ClientWidth = 207 572+ ClientHeight = 489 573 object DirectivesFilterEdit: TEdit 574 AnchorSideLeft.Control = DirectivesPage 575 AnchorSideTop.Control = DirectivesPage 576 AnchorSideRight.Control = DirectivesPage 577 AnchorSideRight.Side = asrBottom 578 Left = 0 579- Height = 27 580+ Height = 21 581 Top = 0 582- Width = 213 583+ Width = 207 584 Anchors = [akTop, akLeft, akRight] 585 OnChange = DirectivesFilterEditChange 586 TabOrder = 0 587@@ -132,13 +132,13 @@ 588 AnchorSideTop.Control = DirectivesFilterEdit 589 AnchorSideTop.Side = asrBottom 590 Left = 0 591- Height = 460 592- Top = 28 593- Width = 213 594+ Height = 467 595+ Top = 22 596+ Width = 207 597 Align = alBottom 598 Anchors = [akTop, akLeft, akRight, akBottom] 599 BorderSpacing.Top = 1 600- DefaultItemHeight = 19 601+ DefaultItemHeight = 15 602 PopupMenu = TreePopupmenu 603 ReadOnly = True 604 TabOrder = 1 605Index: ide/codeexplorer.lrs 606=================================================================== 607--- ide/codeexplorer.lrs (revision 23296) 608+++ ide/codeexplorer.lrs (working copy) 609@@ -10,9 +10,9 @@ 610 +'asrBottom'#4'Left'#2#0#6'Height'#3#3#2#3'Top'#2#2#5'Width'#3#215#0#5'Align' 611 +#7#8'alClient'#17'BorderSpacing.Top'#2#2#13'OnPageChanged'#7#23'MainNotebook' 612 +'PageChanged'#9'PageIndex'#2#1#8'TabOrder'#2#0#0#5'TPage'#8'CodePage'#7'Capt' 613- +'ion'#6#8'CodePage'#11'ClientWidth'#3#213#0#12'ClientHeight'#3#232#1#0#9'TTr' 614+ +'ion'#6#8'CodePage'#11'ClientWidth'#3#207#0#12'ClientHeight'#3#233#1#0#9'TTr' 615 +'eeView'#12'CodeTreeview'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6 616- +'Height'#3#206#1#3'Top'#2#26#5'Width'#3#213#0#5'Align'#7#8'alClient'#17'Bord' 617+ +'Height'#3#207#1#3'Top'#2#26#5'Width'#3#207#0#5'Align'#7#8'alClient'#17'Bord' 618 +'erSpacing.Top'#2#1#13'HideSelection'#8#6'Images'#7#10'Imagelist1'#9'PopupMe' 619 +'nu'#7#13'TreePopupmenu'#8'ReadOnly'#9#16'RightClickSelect'#9#8'TabOrder'#2#0 620 +#10'OnDblClick'#7#20'CodeTreeviewDblClick'#10'OnDeletion'#7#20'CodeTreeviewD' 621@@ -20,36 +20,36 @@ 622 +'ght'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#19'tvoRightClickSelect'#14't' 623 +'voShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'#22'tvoNoDou' 624 +'bleClickExpand'#0#0#0#6'TPanel'#23'CodeTreeviewButtonPanel'#4'Left'#2#0#6'H' 625- +'eight'#2#25#3'Top'#2#0#5'Width'#3#213#0#5'Align'#7#5'alTop'#10'BevelOuter'#7 626- +#6'bvNone'#12'ClientHeight'#2#25#11'ClientWidth'#3#213#0#8'TabOrder'#2#1#0#12 627- +'TSpeedButton'#18'OptionsSpeedButton'#4'Left'#3#186#0#6'Height'#2#22#4'Hint' 628+ +'eight'#2#25#3'Top'#2#0#5'Width'#3#207#0#5'Align'#7#5'alTop'#10'BevelOuter'#7 629+ +#6'bvNone'#12'ClientHeight'#2#25#11'ClientWidth'#3#207#0#8'TabOrder'#2#1#0#12 630+ +'TSpeedButton'#18'OptionsSpeedButton'#4'Left'#3#180#0#6'Height'#2#22#4'Hint' 631 +#6#24'Options for CodeExplorer'#3'Top'#2#1#5'Width'#2#23#7'Anchors'#11#5'akT' 632 +'op'#7'akRight'#0#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#23'O' 633 +'ptionsSpeedButtonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedBut' 634- +'ton'#18'RefreshSpeedButton'#4'Left'#3#138#0#6'Height'#2#22#4'Hint'#6#20'Ref' 635+ +'ton'#18'RefreshSpeedButton'#4'Left'#3#132#0#6'Height'#2#22#4'Hint'#6#20'Ref' 636 +'resh CodeExplorer'#3'Top'#2#1#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRigh' 637 +'t'#0#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#23'RefreshSpeedB' 638 +'uttonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#15'Mode' 639- +'SpeedButton'#4'Left'#3#162#0#6'Height'#2#22#3'Top'#2#1#5'Width'#2#23#7'Anch' 640+ +'SpeedButton'#4'Left'#3#156#0#6'Height'#2#22#3'Top'#2#1#5'Width'#2#23#7'Anch' 641 +'ors'#11#5'akTop'#7'akRight'#0#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'On' 642 +'Click'#7#20'ModeSpeedButtonClick'#8'ShowHint'#9#14'ParentShowHint'#8#0#0#5 643 +'TEdit'#14'CodeFilterEdit'#22'AnchorSideLeft.Control'#7#8'CodePage'#21'Ancho' 644 +'rSideTop.Control'#7#8'CodePage'#23'AnchorSideRight.Control'#7#8'CodePage'#20 645 +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#23#3'Top'#2#0#5 646- +'Width'#3#136#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'OnChange'#7 647+ +'Width'#3#130#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'OnChange'#7 648 +#20'CodeFilterEditChange'#8'TabOrder'#2#0#4'Text'#6#14'CodeFilterEdit'#0#0#0 649 +#0#5'TPage'#14'DirectivesPage'#7'Caption'#6#14'DirectivesPage'#11'ClientWidt' 650- +'h'#3#213#0#12'ClientHeight'#3#232#1#0#5'TEdit'#20'DirectivesFilterEdit'#22 651+ +'h'#3#207#0#12'ClientHeight'#3#233#1#0#5'TEdit'#20'DirectivesFilterEdit'#22 652 +'AnchorSideLeft.Control'#7#14'DirectivesPage'#21'AnchorSideTop.Control'#7#14 653 +'DirectivesPage'#23'AnchorSideRight.Control'#7#14'DirectivesPage'#20'AnchorS' 654- +'ideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#27#3'Top'#2#0#5'Width' 655- +#3#213#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'OnChange'#7#26'Dire' 656+ +'ideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#21#3'Top'#2#0#5'Width' 657+ +#3#207#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'OnChange'#7#26'Dire' 658 +'ctivesFilterEditChange'#8'TabOrder'#2#0#4'Text'#6#20'DirectivesFilterEdit'#0 659 +#0#9'TTreeView'#18'DirectivesTreeView'#21'AnchorSideTop.Control'#7#20'Direct' 660 +'ivesFilterEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height' 661- +#3#204#1#3'Top'#2#28#5'Width'#3#213#0#5'Align'#7#8'alBottom'#7'Anchors'#11#5 662+ +#3#211#1#3'Top'#2#22#5'Width'#3#207#0#5'Align'#7#8'alBottom'#7'Anchors'#11#5 663 +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'BorderSpacing.Top'#2#1#17'Defa' 664- +'ultItemHeight'#2#19#9'PopupMenu'#7#13'TreePopupmenu'#8'ReadOnly'#9#8'TabOrd' 665+ +'ultItemHeight'#2#15#9'PopupMenu'#7#13'TreePopupmenu'#8'ReadOnly'#9#8'TabOrd' 666 +'er'#2#1#10'OnDblClick'#7#26'DirectivesTreeViewDblClick'#10'OnDeletion'#7#26 667 +'DirectivesTreeViewDeletion'#7'OnKeyUp'#7#23'DirectivesTreeViewKeyUp'#7'Opti' 668 +'ons'#11#17'tvoAutoItemHeight'#16'tvoHideSelection'#21'tvoKeepCollapsedNodes' 669Index: ide/codeexplorer.pas 670=================================================================== 671--- ide/codeexplorer.pas (revision 23296) 672+++ ide/codeexplorer.pas (working copy) 673@@ -134,7 +134,9 @@ 674 RefreshSpeedButton: TSpeedButton; 675 ModeSpeedButton: TSpeedButton; 676 TreePopupmenu: TPopupMenu; 677+ {$IFDEF EnableIdeDocking} 678 ControlDocker: TLazControlDocker; 679+ {$ENDIF} 680 procedure CodeExplorerViewClose(Sender: TObject; 681 var CloseAction: TCloseAction); 682 procedure CodeExplorerViewCreate(Sender: TObject); 683@@ -359,9 +361,9 @@ 684 Name:=NonModalIDEWindowNames[nmiwCodeExplorerName]; 685 Caption := lisMenuViewCodeExplorer; 686 EnvironmentOptions.IDEWindowLayoutList.Apply(Self,Name); 687+ {$IFDEF EnableIDEDocking} 688 ControlDocker:=TLazControlDocker.Create(Self); 689 ControlDocker.Name:='CodeExplorer'; 690- {$IFDEF EnableIDEDocking} 691 ControlDocker.Manager:=LazarusIDE.DockingManager; 692 {$ENDIF} 693 694@@ -467,7 +469,9 @@ 695 696 procedure TCodeExplorerView.DockingMenuItemClick(Sender: TObject); 697 begin 698+ {$IFDEF EnableIdeDocking} 699 ControlDocker.ShowDockingEditor; 700+ {$ENDIF} 701 end; 702 703 procedure TCodeExplorerView.IdleTimer1Timer(Sender: TObject); 704Index: ide/fpdoceditwindow.lfm 705=================================================================== 706--- ide/fpdoceditwindow.lfm (revision 23296) 707+++ ide/fpdoceditwindow.lfm (working copy) 708@@ -25,7 +25,7 @@ 709 OnPageChanged = PageControlChange 710 object ShortTabSheet: TTabSheet 711 Caption = 'ShortTabSheet' 712- ClientHeight = 98 713+ ClientHeight = 100 714 ClientWidth = 682 715 object LinkLabel: TLabel 716 AnchorSideTop.Control = LinkEdit 717@@ -105,7 +105,7 @@ 718 end 719 object InheritedTabSheet: TTabSheet 720 Caption = 'InheritedTabSheet' 721- ClientHeight = 98 722+ ClientHeight = 100 723 ClientWidth = 682 724 object InheritedShortLabel: TLabel 725 Left = 0 726@@ -178,11 +178,11 @@ 727 end 728 object DescrTabSheet: TTabSheet 729 Caption = 'DescrTabSheet' 730- ClientHeight = 98 731+ ClientHeight = 100 732 ClientWidth = 682 733 object DescrMemo: TMemo 734 Left = 0 735- Height = 94 736+ Height = 96 737 Top = 0 738 Width = 680 739 Align = alClient 740@@ -198,11 +198,11 @@ 741 end 742 object ErrorsTabSheet: TTabSheet 743 Caption = 'ErrorsTabSheet' 744- ClientHeight = 98 745+ ClientHeight = 100 746 ClientWidth = 682 747 object ErrorsMemo: TMemo 748 Left = 0 749- Height = 94 750+ Height = 96 751 Top = 0 752 Width = 680 753 Align = alClient 754@@ -218,11 +218,11 @@ 755 end 756 object SeeAlsoTabSheet: TTabSheet 757 Caption = 'SeeAlsoTabSheet' 758- ClientHeight = 98 759+ ClientHeight = 100 760 ClientWidth = 682 761 object SeeAlsoMemo: TMemo 762 Left = 0 763- Height = 98 764+ Height = 100 765 Top = 0 766 Width = 682 767 Align = alClient 768@@ -236,7 +236,7 @@ 769 end 770 object ExampleTabSheet: TTabSheet 771 Caption = 'ExampleTabSheet' 772- ClientHeight = 98 773+ ClientHeight = 100 774 ClientWidth = 682 775 object ExampleEdit: TEdit 776 Left = 0 777@@ -270,35 +270,35 @@ 778 end 779 object TopicSheet: TTabSheet 780 Caption = 'Topics' 781- ClientHeight = 98 782+ ClientHeight = 100 783 ClientWidth = 682 784 object Panel1: TPanel 785 Left = 512 786- Height = 98 787+ Height = 100 788 Top = 0 789 Width = 170 790 Align = alRight 791 BorderSpacing.Left = 5 792 BevelOuter = bvNone 793- ClientHeight = 98 794+ ClientHeight = 100 795 ClientWidth = 170 796 TabOrder = 0 797 object Panel2: TPanel 798 Left = 0 799- Height = 25 800+ Height = 23 801 Top = 0 802 Width = 170 803 Align = alTop 804 AutoSize = True 805 BevelOuter = bvNone 806- ClientHeight = 25 807+ ClientHeight = 23 808 ClientWidth = 170 809 TabOrder = 0 810 object NewTopicButton: TButton 811- Left = 120 812- Height = 25 813+ Left = 123 814+ Height = 23 815 Top = 0 816- Width = 50 817+ Width = 47 818 Align = alRight 819 AutoSize = True 820 Caption = 'New' 821@@ -307,9 +307,9 @@ 822 end 823 object NewTopicNameEdit: TEdit 824 Left = 0 825- Height = 25 826+ Height = 23 827 Top = 0 828- Width = 115 829+ Width = 118 830 Align = alClient 831 BorderSpacing.Right = 5 832 OnEnter = TopicControlEnter 833@@ -318,8 +318,8 @@ 834 end 835 object TopicListBox: TListBox 836 Left = 0 837- Height = 68 838- Top = 30 839+ Height = 72 840+ Top = 28 841 Width = 170 842 Align = alClient 843 BorderSpacing.Top = 5 844@@ -331,17 +331,17 @@ 845 end 846 object Panel3: TPanel 847 Left = 0 848- Height = 98 849+ Height = 100 850 Top = 0 851 Width = 507 852 Align = alClient 853 BevelOuter = bvNone 854- ClientHeight = 98 855+ ClientHeight = 100 856 ClientWidth = 507 857 TabOrder = 1 858 object TopicShort: TEdit 859 Left = 0 860- Height = 23 861+ Height = 21 862 Top = 0 863 Width = 507 864 Align = alTop 865@@ -352,8 +352,8 @@ 866 end 867 object TopicDescr: TMemo 868 Left = 0 869- Height = 70 870- Top = 28 871+ Height = 74 872+ Top = 26 873 Width = 507 874 Align = alClient 875 BorderSpacing.Top = 5 876Index: ide/fpdoceditwindow.lrs 877=================================================================== 878--- ide/fpdoceditwindow.lrs (revision 23296) 879+++ ide/fpdoceditwindow.lrs (working copy) 880@@ -10,7 +10,7 @@ 881 +'nt'#8'TabIndex'#2#6#8'TabOrder'#2#0#11'TabPosition'#7#8'tpBottom'#8'OnChang' 882 +'e'#7#17'PageControlChange'#13'OnPageChanged'#7#17'PageControlChange'#0#9'TT' 883 +'abSheet'#13'ShortTabSheet'#7'Caption'#6#13'ShortTabSheet'#12'ClientHeight'#2 884- +'b'#11'ClientWidth'#3#170#2#0#6'TLabel'#9'LinkLabel'#21'AnchorSideTop.Contro' 885+ +'d'#11'ClientWidth'#3#170#2#0#6'TLabel'#9'LinkLabel'#21'AnchorSideTop.Contro' 886 +'l'#7#8'LinkEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height' 887 +#2#16#3'Top'#2#28#5'Width'#2'3'#17'BorderSpacing.Top'#2#6#7'Caption'#6#9'Lin' 888 +'kLabel'#11'ParentColor'#8#0#0#6'TLabel'#10'ShortLabel'#22'AnchorSideLeft.Co' 889@@ -36,7 +36,7 @@ 890 +'pacing.Top'#2#2#19'BorderSpacing.Right'#2#2#8'OnChange'#7#14'LinkEditChange' 891 +#13'OnEditingDone'#7#19'LinkEditEditingDone'#8'TabOrder'#2#2#4'Text'#6#8'Lin' 892 +'kEdit'#0#0#0#9'TTabSheet'#17'InheritedTabSheet'#7'Caption'#6#17'InheritedTa' 893- +'bSheet'#12'ClientHeight'#2'b'#11'ClientWidth'#3#170#2#0#6'TLabel'#19'Inheri' 894+ +'bSheet'#12'ClientHeight'#2'd'#11'ClientWidth'#3#170#2#0#6'TLabel'#19'Inheri' 895 +'tedShortLabel'#4'Left'#2#0#6'Height'#2#16#3'Top'#2#2#5'Width'#3#170#2#5'Ali' 896 +'gn'#7#5'alTop'#17'BorderSpacing.Top'#2#2#7'Caption'#6#19'InheritedShortLabe' 897 +'l'#11'ParentColor'#8#0#0#5'TEdit'#18'InheritedShortEdit'#22'AnchorSideLeft.' 898@@ -61,23 +61,23 @@ 899 +'utton'#4'Left'#3'R'#1#6'Height'#2#25#3'Top'#2'1'#5'Width'#3#167#0#8'AutoSiz' 900 +'e'#9#18'BorderSpacing.Left'#2#10#7'Caption'#6#24'AddLinkToInheritedButton'#7 901 +'OnClick'#7#29'AddLinkToInheritedButtonClick'#8'TabOrder'#2#3#0#0#0#9'TTabSh' 902- +'eet'#13'DescrTabSheet'#7'Caption'#6#13'DescrTabSheet'#12'ClientHeight'#2'b' 903- +#11'ClientWidth'#3#170#2#0#5'TMemo'#9'DescrMemo'#4'Left'#2#0#6'Height'#2'^'#3 904+ +'eet'#13'DescrTabSheet'#7'Caption'#6#13'DescrTabSheet'#12'ClientHeight'#2'd' 905+ +#11'ClientWidth'#3#170#2#0#5'TMemo'#9'DescrMemo'#4'Left'#2#0#6'Height'#2'`'#3 906 +'Top'#2#0#5'Width'#3#168#2#5'Align'#7#8'alClient'#19'BorderSpacing.Right'#2#2 907 +#20'BorderSpacing.Bottom'#2#4#13'Lines.Strings'#1#6#9'DescrMemo'#0#8'OnChang' 908 ,'e'#7#15'DescrMemoChange'#13'OnEditingDone'#7#20'DescrMemoEditingDone'#8'Tab' 909 +'Order'#2#0#0#0#0#9'TTabSheet'#14'ErrorsTabSheet'#7'Caption'#6#14'ErrorsTabS' 910- +'heet'#12'ClientHeight'#2'b'#11'ClientWidth'#3#170#2#0#5'TMemo'#10'ErrorsMem' 911- +'o'#4'Left'#2#0#6'Height'#2'^'#3'Top'#2#0#5'Width'#3#168#2#5'Align'#7#8'alCl' 912+ +'heet'#12'ClientHeight'#2'd'#11'ClientWidth'#3#170#2#0#5'TMemo'#10'ErrorsMem' 913+ +'o'#4'Left'#2#0#6'Height'#2'`'#3'Top'#2#0#5'Width'#3#168#2#5'Align'#7#8'alCl' 914 +'ient'#19'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4#13'Lines.Str' 915 +'ings'#1#6#10'ErrorsMemo'#0#8'OnChange'#7#16'ErrorsMemoChange'#13'OnEditingD' 916 +'one'#7#21'ErrorsMemoEditingDone'#8'TabOrder'#2#0#0#0#0#9'TTabSheet'#15'SeeA' 917- +'lsoTabSheet'#7'Caption'#6#15'SeeAlsoTabSheet'#12'ClientHeight'#2'b'#11'Clie' 918- +'ntWidth'#3#170#2#0#5'TMemo'#11'SeeAlsoMemo'#4'Left'#2#0#6'Height'#2'b'#3'To' 919+ +'lsoTabSheet'#7'Caption'#6#15'SeeAlsoTabSheet'#12'ClientHeight'#2'd'#11'Clie' 920+ +'ntWidth'#3#170#2#0#5'TMemo'#11'SeeAlsoMemo'#4'Left'#2#0#6'Height'#2'd'#3'To' 921 +'p'#2#0#5'Width'#3#170#2#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#11'See' 922 +'AlsoMemo'#0#8'OnChange'#7#17'SeeAlsoMemoChange'#13'OnEditingDone'#7#22'SeeA' 923 +'lsoMemoEditingDone'#8'TabOrder'#2#0#0#0#0#9'TTabSheet'#15'ExampleTabSheet'#7 924- +'Caption'#6#15'ExampleTabSheet'#12'ClientHeight'#2'b'#11'ClientWidth'#3#170#2 925+ +'Caption'#6#15'ExampleTabSheet'#12'ClientHeight'#2'd'#11'ClientWidth'#3#170#2 926 +#0#5'TEdit'#11'ExampleEdit'#4'Left'#2#0#6'Height'#2#23#3'Top'#2#0#5'Width'#3 927 +#168#2#5'Align'#7#5'alTop'#10'AutoSelect'#8#19'BorderSpacing.Right'#2#2#8'On' 928 +'Change'#7#17'ExampleEditChange'#13'OnEditingDone'#7#22'ExampleEditEditingDo' 929@@ -88,27 +88,27 @@ 930 +'idth'#3#144#0#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSp' 931 +'acing.Around'#2#6#7'Caption'#6#19'BrowseExampleButton'#7'OnClick'#7#24'Brow' 932 +'seExampleButtonClick'#8'TabOrder'#2#1#0#0#0#9'TTabSheet'#10'TopicSheet'#7'C' 933- +'aption'#6#6'Topics'#12'ClientHeight'#2'b'#11'ClientWidth'#3#170#2#0#6'TPane' 934- +'l'#6'Panel1'#4'Left'#3#0#2#6'Height'#2'b'#3'Top'#2#0#5'Width'#3#170#0#5'Ali' 935+ +'aption'#6#6'Topics'#12'ClientHeight'#2'd'#11'ClientWidth'#3#170#2#0#6'TPane' 936+ +'l'#6'Panel1'#4'Left'#3#0#2#6'Height'#2'd'#3'Top'#2#0#5'Width'#3#170#0#5'Ali' 937 +'gn'#7#7'alRight'#18'BorderSpacing.Left'#2#5#10'BevelOuter'#7#6'bvNone'#12'C' 938- +'lientHeight'#2'b'#11'ClientWidth'#3#170#0#8'TabOrder'#2#0#0#6'TPanel'#6'Pan' 939- +'el2'#4'Left'#2#0#6'Height'#2#25#3'Top'#2#0#5'Width'#3#170#0#5'Align'#7#5'al' 940- +'Top'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2#25#11'Clie' 941+ +'lientHeight'#2'd'#11'ClientWidth'#3#170#0#8'TabOrder'#2#0#0#6'TPanel'#6'Pan' 942+ +'el2'#4'Left'#2#0#6'Height'#2#23#3'Top'#2#0#5'Width'#3#170#0#5'Align'#7#5'al' 943+ +'Top'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2#23#11'Clie' 944 +'ntWidth'#3#170#0#8'TabOrder'#2#0#0#7'TButton'#14'NewTopicButton'#4'Left'#2 945- +'x'#6'Height'#2#25#3'Top'#2#0#5'Width'#2'2'#5'Align'#7#7'alRight'#8'AutoSize' 946+ +'{'#6'Height'#2#23#3'Top'#2#0#5'Width'#2'/'#5'Align'#7#7'alRight'#8'AutoSize' 947 +#9#7'Caption'#6#3'New'#7'OnClick'#7#19'NewTopicButtonClick'#8'TabOrder'#2#0#0 948- +#0#5'TEdit'#16'NewTopicNameEdit'#4'Left'#2#0#6'Height'#2#25#3'Top'#2#0#5'Wid' 949- +'th'#2's'#5'Align'#7#8'alClient'#19'BorderSpacing.Right'#2#5#7'OnEnter'#7#17 950+ +#0#5'TEdit'#16'NewTopicNameEdit'#4'Left'#2#0#6'Height'#2#23#3'Top'#2#0#5'Wid' 951+ +'th'#2'v'#5'Align'#7#8'alClient'#19'BorderSpacing.Right'#2#5#7'OnEnter'#7#17 952 +'TopicControlEnter'#8'TabOrder'#2#1#0#0#0#8'TListBox'#12'TopicListBox'#4'Lef' 953- +'t'#2#0#6'Height'#2'D'#3'Top'#2#30#5'Width'#3#170#0#5'Align'#7#8'alClient'#17 954+ +'t'#2#0#6'Height'#2'H'#3'Top'#2#28#5'Width'#3#170#0#5'Align'#7#8'alClient'#17 955 +'BorderSpacing.Top'#2#5#10'ItemHeight'#2#0#7'OnClick'#7#17'TopicListBoxClick' 956 +#7'OnEnter'#7#17'TopicControlEnter'#8'TabOrder'#2#1#0#0#0#6'TPanel'#6'Panel3' 957- +#4'Left'#2#0#6'Height'#2'b'#3'Top'#2#0#5'Width'#3#251#1#5'Align'#7#8'alClien' 958- +'t'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'b'#11'ClientWidth'#3#251#1 959- +#8'TabOrder'#2#1#0#5'TEdit'#10'TopicShort'#4'Left'#2#0#6'Height'#2#23#3'Top' 960+ +#4'Left'#2#0#6'Height'#2'd'#3'Top'#2#0#5'Width'#3#251#1#5'Align'#7#8'alClien' 961+ +'t'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'd'#11'ClientWidth'#3#251#1 962+ +#8'TabOrder'#2#1#0#5'TEdit'#10'TopicShort'#4'Left'#2#0#6'Height'#2#21#3'Top' 963 +#2#0#5'Width'#3#251#1#5'Align'#7#5'alTop'#10'AutoSelect'#8#8'OnChange'#7#16 964 +'TopicDescrChange'#7'OnEnter'#7#17'TopicControlEnter'#8'TabOrder'#2#0#0#0#5 965- +'TMemo'#10'TopicDescr'#4'Left'#2#0#6'Height'#2'F'#3'Top'#2#28#5'Width'#3#251 966+ +'TMemo'#10'TopicDescr'#4'Left'#2#0#6'Height'#2'J'#3'Top'#2#26#5'Width'#3#251 967 +#1#5'Align'#7#8'alClient'#17'BorderSpacing.Top'#2#5#8'OnChange'#7#16'TopicDe' 968 +'scrChange'#7'OnEnter'#7#17'TopicControlEnter'#8'TabOrder'#2#1#0#0#0#0#0#6'T' 969 +'Panel'#12'LeftBtnPanel'#4'Left'#2#0#6'Height'#2'~'#3'Top'#2#0#5'Width'#2'?' 970Index: ide/fpdoceditwindow.pas 971=================================================================== 972--- ide/fpdoceditwindow.pas (revision 23296) 973+++ ide/fpdoceditwindow.pas (working copy) 974@@ -69,7 +69,9 @@ 975 TopicListBox: TListBox; 976 NewTopicNameEdit: TEdit; 977 NewTopicButton: TButton; 978+ {$IFDEF EnableIdeDocking} 979 ControlDocker: TLazControlDocker; 980+ {$ENDIF} 981 CopyFromInheritedButton: TButton; 982 CreateButton: TButton; 983 DescrMemo: TMemo; 984@@ -271,9 +273,9 @@ 985 986 Name := NonModalIDEWindowNames[nmiwFPDocEditorName]; 987 EnvironmentOptions.IDEWindowLayoutList.Apply(Self, Name); 988+ {$IFDEF EnableIDEDocking} 989 ControlDocker:=TLazControlDocker.Create(Self); 990 ControlDocker.Name:='FPDocEditor'; 991- {$IFDEF EnableIDEDocking} 992 ControlDocker.Manager:=LazarusIDE.DockingManager; 993 {$ENDIF} 994 995Index: ide/include/ide.inc 996=================================================================== 997--- ide/include/ide.inc (revision 23296) 998+++ ide/include/ide.inc (working copy) 999@@ -55,3 +55,4 @@ 1000 1001 // end. 1002 1003+ 1004Index: ide/lazarus.lpi 1005=================================================================== 1006--- ide/lazarus.lpi (revision 23296) 1007+++ ide/lazarus.lpi (working copy) 1008@@ -17,6 +17,7 @@ 1009 <Icon Value="0"/> 1010 <UseXPManifest Value="True"/> 1011 </General> 1012+ <LazDoc Paths="../docs/xml/ide"/> 1013 <PublishOptions> 1014 <Version Value="2"/> 1015 <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> 1016@@ -29,21 +30,24 @@ 1017 <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> 1018 </local> 1019 </RunParams> 1020- <RequiredPackages Count="4"> 1021+ <RequiredPackages Count="5"> 1022 <Item1> 1023- <PackageName Value="CodeTools"/> 1024+ <PackageName Value="EasyDockMgr"/> 1025 </Item1> 1026 <Item2> 1027- <PackageName Value="IDEIntf"/> 1028+ <PackageName Value="CodeTools"/> 1029 </Item2> 1030 <Item3> 1031- <PackageName Value="LCL"/> 1032+ <PackageName Value="IDEIntf"/> 1033 </Item3> 1034 <Item4> 1035+ <PackageName Value="LCL"/> 1036+ </Item4> 1037+ <Item5> 1038 <PackageName Value="SynEdit"/> 1039- </Item4> 1040+ </Item5> 1041 </RequiredPackages> 1042- <Units Count="52"> 1043+ <Units Count="55"> 1044 <Unit0> 1045 <Filename Value="lazarus.pp"/> 1046 <IsPartOfProject Value="True"/> 1047@@ -400,12 +404,27 @@ 1048 <ResourceBaseClass Value="Form"/> 1049 <UnitName Value="AskCompNameDlg"/> 1050 </Unit51> 1051+ <Unit52> 1052+ <Filename Value="mainbase.pas"/> 1053+ <IsPartOfProject Value="True"/> 1054+ <UnitName Value="MainBase"/> 1055+ </Unit52> 1056+ <Unit53> 1057+ <Filename Value="mainintf.pas"/> 1058+ <IsPartOfProject Value="True"/> 1059+ <UnitName Value="MainIntf"/> 1060+ </Unit53> 1061+ <Unit54> 1062+ <Filename Value="dialogprocs.pas"/> 1063+ <IsPartOfProject Value="True"/> 1064+ <UnitName Value="DialogProcs"/> 1065+ </Unit54> 1066 </Units> 1067 </ProjectOptions> 1068 <CompilerOptions> 1069 <Version Value="8"/> 1070 <Target> 1071- <Filename Value="../lazarus"/> 1072+ <Filename Value="../lazarus3"/> 1073 </Target> 1074 <SearchPaths> 1075 <IncludeFiles Value="include/"/> 1076@@ -418,12 +437,12 @@ 1077 </SyntaxOptions> 1078 </Parsing> 1079 <Other> 1080+ <CustomOptions Value="-dDoDi -dSynDualView"/> 1081 <CompilerPath Value="$(CompPath)"/> 1082 <ExecuteBefore> 1083 <ScanForFPCMsgs Value="True"/> 1084 <ScanForMakeMsgs Value="True"/> 1085 </ExecuteBefore> 1086 </Other> 1087- <CompileReasons Compile="False" Build="False" Run="False"/> 1088 </CompilerOptions> 1089 </CONFIG> 1090Index: ide/lazarus.pp 1091=================================================================== 1092--- ide/lazarus.pp (revision 23296) 1093+++ ide/lazarus.pp (working copy) 1094@@ -90,7 +90,7 @@ 1095 // end of build flags 1096 1097 LazarusRevisionStr:=RevisionStr; 1098- Application.Title:='Lazarus'; 1099+ Application.Title:= {$IFDEF DoDi} 'DoDi ' + {$ENDIF} 'Lazarus'; 1100 Application.Initialize; 1101 TMainIDE.ParseCmdLineOptions; 1102 if Application.Terminated then exit; 1103Index: ide/main.pp 1104=================================================================== 1105--- ide/main.pp (revision 23296) 1106+++ ide/main.pp (working copy) 1107@@ -63,7 +63,13 @@ 1108 // lcl 1109 LCLProc, LCLMemManager, LCLType, LCLIntf, LConvEncoding, LMessages, ComCtrls, 1110 LResources, StdCtrls, Forms, Buttons, Menus, FileUtil, Controls, GraphType, 1111- HelpIntfs, Graphics, ExtCtrls, Dialogs, InterfaceBase, LDockCtrl, UTF8Process, 1112+ HelpIntfs, Graphics, ExtCtrls, Dialogs, InterfaceBase, 1113+{$IFDEF EnableIdeDocking} 1114+ LDockCtrl, 1115+{$ELSE} 1116+ uMakeSite, 1117+{$ENDIF} 1118+ UTF8Process, 1119 // codetools 1120 CodeBeautifier, FindDeclarationTool, LinkScanner, BasicCodeTools, AVL_Tree, 1121 Laz_XMLCfg, CodeToolsStructs, CodeToolManager, CodeCache, DefineTemplates, 1122@@ -1191,7 +1197,16 @@ 1123 {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Create INHERITED');{$ENDIF} 1124 1125 FWaitForClose := False; 1126+ {$IFDEF EnableIdeDocking} 1127 FDockingManager:=TLazDockingManager.Create(Self); 1128+ {$ELSE} 1129+ { TODO -cdocking : create DockMaster - when? } 1130+ if assigned(OwningComponent) then begin 1131+ TDockMaster.Create(OwningComponent); 1132+ DockMaster.ForIDE := True; //try some workarounds 1133+ end else 1134+ DebugLn('--- no OwningComponent for create DockMaster'); 1135+ {$ENDIF} 1136 1137 SetupDialogs; 1138 RunExternalTool:=@OnRunExternalTool; 1139@@ -1226,7 +1241,7 @@ 1140 // build and position the MainIDE form 1141 Application.CreateForm(TMainIDEBar,MainIDEBar); 1142 MainIDEBar.OnDestroy:=@OnMainBarDestroy; 1143- {$IFNDEF IDEDocking} 1144+ {$IFNDEF EnableIDEDocking} 1145 MainIDEBar.Constraints.MaxHeight:=110; 1146 {$ENDIF} 1147 MainIDEBar.Name := NonModalIDEWindowNames[nmiwMainIDEName]; 1148@@ -1294,6 +1309,9 @@ 1149 Screen.AddHandlerRemoveForm(@OnScreenRemoveForm); 1150 SetupHints; 1151 1152+{ TODO : register all forms } 1153+ RegisterClasses([TCodeExplorerView, TMessagesView, TObjectInspectorDlg]); 1154+ 1155 // Now load a project 1156 SetupStartProject; 1157 1158@@ -1371,7 +1389,9 @@ 1159 DebugLn('[TMainIDE.Destroy] B -> inherited Destroy... ',ClassName); 1160 {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Destroy B ');{$ENDIF} 1161 FreeThenNil(MainBuildBoss); 1162+ {$IFDEF EnableIdeDocking} 1163 FreeThenNil(FDockingManager); 1164+ {$ENDIF} 1165 inherited Destroy; 1166 {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Destroy C ');{$ENDIF} 1167 1168@@ -1805,8 +1825,10 @@ 1169 end; 1170 1171 procedure TMainIDE.SetupObjectInspector; 1172+{$IFDEF EnableIdeDocking} 1173 var 1174 OIControlDocker: TLazControlDocker; 1175+{$ENDIF} 1176 begin 1177 ObjectInspector1 := TObjectInspectorDlg.Create(OwningComponent); 1178 ObjectInspector1.BorderStyle:=bsSizeable; 1179@@ -1826,9 +1848,9 @@ 1180 ObjectInspector1.OnPropertyHint:=@OIOnPropertyHint; 1181 ObjectInspector1.OnDestroy:=@OIOnDestroy; 1182 1183+ {$IFDEF EnableIDEDocking} 1184 OIControlDocker:=TLazControlDocker.Create(ObjectInspector1); 1185 OIControlDocker.Name:='ObjectInspector'; 1186- {$IFDEF EnableIDEDocking} 1187 OIControlDocker.Manager:=LazarusIDE.DockingManager; 1188 {$ENDIF} 1189 IDECmdScopeObjectInspectorOnly.AddWindowClass(TObjectInspectorDlg); 1190@@ -2092,11 +2114,17 @@ 1191 FRemoteControlTimer.Enabled:=true; 1192 end; 1193 1194+function GetLayoutFile: string; 1195+begin 1196+ Result := AppendPathDelim(GetPrimaryConfigPath) + 'default.lyt'; 1197+end; 1198+ 1199 procedure TMainIDE.ReOpenIDEWindows; 1200 var 1201 i: Integer; 1202 ALayout: TIDEWindowLayout; 1203 FormEnum: TNonModalIDEWindow; 1204+ fn: string; 1205 begin 1206 for i:=0 to EnvironmentOptions.IDEWindowLayoutList.Count-1 do begin 1207 ALayout:=EnvironmentOptions.IDEWindowLayoutList[i]; 1208@@ -2132,6 +2160,13 @@ 1209 ;//itmAssembler.OnClick(Self); 1210 end; 1211 end; 1212+{ TODO : load layout where? } 1213+ if assigned(DockMaster) then begin 1214+ fn := GetLayoutFile; 1215+ if FileExists(fn) then begin 1216+ DockMaster.LoadFromFile(fn); 1217+ end; 1218+ end; 1219 end; 1220 1221 procedure TMainIDE.CloseIDEWindows; 1222@@ -2139,6 +2174,9 @@ 1223 i: Integer; 1224 AForm: TCustomForm; 1225 begin 1226+{ TODO : save layout where? } 1227+ if assigned(DockMaster) then 1228+ DockMaster.SaveToFile(GetLayoutFile); 1229 i:=Screen.CustomFormCount-1; 1230 while i>=0 do begin 1231 AForm:=Screen.CustomForms[i]; 1232@@ -16088,7 +16126,7 @@ 1233 begin 1234 if (ALayout=nil) or (ALayout.Form=nil) then exit; 1235 // debugln('TMainIDE.OnApplyWindowLayout ',ALayout.Form.Name,' ',ALayout.Form.Classname,' ',IDEWindowPlacementNames[ALayout.WindowPlacement],' ',ALayout.CustomCoordinatesAreValid,' ',ALayout.Left,' ',ALayout.Top,' ',ALayout.Width,' ',ALayout.Height); 1236- DockingAllowed:={$IFDEF IDEDocking}true{$ELSE}false{$ENDIF}; 1237+ DockingAllowed:={$IFDEF EnableIDEDocking}true{$ELSE}false{$ENDIF}; 1238 if DockingAllowed then begin 1239 ALayout.Form.Constraints.MaxHeight:=0; 1240 end; 1241@@ -16097,8 +16135,17 @@ 1242 if DockingAllowed then begin 1243 if l in [nmiwSourceNoteBookName] then 1244 ALayout.WindowPlacement:=iwpDocked; 1245+ end else if assigned(DockMaster) then begin 1246+ { TODO -cdocking : make docker/dockable } 1247+ case l of 1248+ nmiwNone: ; 1249+ nmiwMainIDEName: DockMaster.AddElasticSites(ALayout.Form, [alBottom]); 1250+ nmiwSourceNoteBookName: DockMaster.AddElasticSites(ALayout.Form, [alLeft, alRight, alBottom]); 1251+ else 1252+ DockMaster.MakeDockable(ALayout.Form, True); 1253+ //DockMaster.MakeDockable(ALayout.Form, False); 1254 end; 1255- 1256+ end; 1257 case ALayout.WindowPlacement of 1258 iwpCustomPosition,iwpRestoreWindowGeometry: 1259 begin 1260@@ -16236,3 +16283,5 @@ 1261 end. 1262 1263 1264+ 1265+ 1266Index: ide/mainbar.pas 1267=================================================================== 1268--- ide/mainbar.pas (revision 23296) 1269+++ ide/mainbar.pas (working copy) 1270@@ -40,7 +40,10 @@ 1271 MemCheck, 1272 {$ENDIF} 1273 Classes, SysUtils, LCLProc, StdCtrls, Forms, Controls, Buttons, Menus, 1274- ComCtrls, ExtCtrls, Dialogs, LDockCtrl, 1275+ ComCtrls, ExtCtrls, Dialogs, 1276+{$IFDEF EnableIdeDocking} 1277+ LDockCtrl, 1278+{$ENDIF} 1279 // IDEIntf 1280 ProjectIntf, NewItemIntf, MenuIntf, LazIDEIntf, 1281 EnvironmentOpts, LazarusIDEStrConsts; 1282@@ -341,7 +344,9 @@ 1283 procedure NewUFDefaultClick(Sender: TObject); 1284 procedure NewUnitFormPopupMenuPopup(Sender: TObject); 1285 public 1286+ {$IFDEF EnableIdeDocking} 1287 ControlDocker: TLazControlDocker; 1288+ {$ENDIF} 1289 constructor Create(TheOwner: TComponent); override; 1290 procedure HideIDE; 1291 procedure UnhideIDE; 1292@@ -424,9 +429,9 @@ 1293 begin 1294 inherited Create(TheOwner); 1295 1296+ {$IFDEF EnableIDEDocking} 1297 ControlDocker:=TLazControlDocker.Create(Self); 1298 ControlDocker.Name:='MainIDEBar'; 1299- {$IFDEF EnableIDEDocking} 1300 ControlDocker.Manager:=LazarusIDE.DockingManager; 1301 {$ENDIF} 1302 end; 1303Index: ide/msgview.pp 1304=================================================================== 1305--- ide/msgview.pp (revision 23296) 1306+++ ide/msgview.pp (working copy) 1307@@ -133,7 +133,9 @@ 1308 procedure Changed; 1309 procedure SetTVNodeImage(TVNode: TTreeNode; Msg: TLazMessageLine); 1310 public 1311+ {$IFDEF EnableIdeDocking} 1312 ControlDocker: TLazControlDocker; 1313+ {$ENDIF} 1314 constructor Create(TheOwner: TComponent); override; 1315 destructor Destroy; override; 1316 procedure BeginUpdateNotification(Sender: TObject); 1317@@ -344,9 +346,9 @@ 1318 {$ENDIF} 1319 1320 EnvironmentOptions.IDEWindowLayoutList.Apply(Self, Name); 1321+ {$IFDEF EnableIDEDocking} 1322 ControlDocker:=TLazControlDocker.Create(Self); 1323 ControlDocker.Name:='Messages'; 1324- {$IFDEF EnableIDEDocking} 1325 ControlDocker.Manager:=LazarusIDE.DockingManager; 1326 {$ENDIF} 1327 end; 1328@@ -932,7 +934,9 @@ 1329 1330 procedure TMessagesView.DockMenuItemClick(Sender: TObject); 1331 begin 1332+ {$IFDEF IdeDocking} 1333 ControlDocker.ShowDockingEditor; 1334+ {$ENDIF} 1335 end; 1336 1337 procedure TMessagesView.FormDeactivate(Sender: TObject); 1338Index: ide/projectinspector.lfm 1339=================================================================== 1340--- ide/projectinspector.lfm (revision 23296) 1341+++ ide/projectinspector.lfm (working copy) 1342@@ -9,7 +9,7 @@ 1343 ClientHeight = 309 1344 ClientWidth = 433 1345 OnShow = ProjectInspectorFormShow 1346- LCLVersion = '0.9.27' 1347+ LCLVersion = '0.9.29' 1348 object OpenBitBtn: TSpeedButton 1349 AnchorSideLeft.Control = Owner 1350 AnchorSideTop.Control = Owner 1351Index: ide/projectinspector.lrs 1352=================================================================== 1353--- ide/projectinspector.lrs (revision 23296) 1354+++ ide/projectinspector.lrs (working copy) 1355@@ -1,11 +1,11 @@ 1356-{ Ceci est un fichier ressource généré automatiquement par Lazarus } 1357+{ This is an automatically generated lazarus resource file } 1358 1359 LazarusResources.Add('TProjectInspectorForm','FORMDATA',[ 1360 'TPF0'#21'TProjectInspectorForm'#20'ProjectInspectorForm'#4'Left'#3#201#1#6'H' 1361 +'eight'#3'5'#1#3'Top'#3#143#1#5'Width'#3#177#1#13'ActiveControl'#7#13'ItemsT' 1362 +'reeView'#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#20'ProjectInspe' 1363 +'ctorForm'#12'ClientHeight'#3'5'#1#11'ClientWidth'#3#177#1#6'OnShow'#7#24'Pr' 1364- +'ojectInspectorFormShow'#10'LCLVersion'#6#6'0.9.27'#0#12'TSpeedButton'#10'Op' 1365+ +'ojectInspectorFormShow'#10'LCLVersion'#6#6'0.9.29'#0#12'TSpeedButton'#10'Op' 1366 +'enBitBtn'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7 1367 +#5'Owner'#4'Left'#2#0#6'Height'#2#23#3'Top'#2#0#5'Width'#2'<'#5'Color'#7#9'c' 1368 +'lBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#15'OpenBitBtnClick'#8'ShowHint'#9#14 1369Index: ide/projectinspector.pas 1370=================================================================== 1371--- ide/projectinspector.pas (revision 23296) 1372+++ ide/projectinspector.pas (working copy) 1373@@ -68,7 +68,10 @@ 1374 OpenBitBtn: TSpeedButton; 1375 ItemsTreeView: TTreeView; 1376 ItemsPopupMenu: TPopupMenu; 1377+ {$IFDEF DoDi} 1378+ {$ELSE} 1379 ControlDocker: TLazControlDocker; 1380+ {$ENDIF} 1381 OptionsBitBtn: TSpeedButton; 1382 RemoveBitBtn: TSpeedButton; 1383 procedure AddBitBtnClick(Sender: TObject); 1384@@ -490,7 +493,8 @@ 1385 end; 1386 FilesNode.Expanded:=true; 1387 Tree.Free; 1388- end else begin 1389+ end else if assigned(FilesNode) then begin 1390+ { TODO 1 : FilesNode may be nil } 1391 // delete file nodes 1392 FilesNode.HasChildren:=false; 1393 end; 1394@@ -532,7 +536,8 @@ 1395 CurNode:=NextNode; 1396 end; 1397 DependenciesNode.Expanded:=true; 1398- end else begin 1399+ end else if assigned(DependenciesNode) then begin 1400+ { TODO 1 : node maybe nil } 1401 // delete dependency nodes 1402 DependenciesNode.HasChildren:=false; 1403 end; 1404@@ -706,9 +711,9 @@ 1405 KeyPreview:=true; 1406 1407 EnvironmentOptions.IDEWindowLayoutList.Apply(Self,Name); 1408+ {$IFDEF EnableIDEDocking} 1409 ControlDocker:=TLazControlDocker.Create(Self); 1410 ControlDocker.Name:='ProjectInspector'; 1411- {$IFDEF EnableIDEDocking} 1412 ControlDocker.Manager:=LazarusIDE.DockingManager; 1413 {$ENDIF} 1414 1415Index: ide/sourceeditor.lfm 1416=================================================================== 1417--- ide/sourceeditor.lfm (revision 23296) 1418+++ ide/sourceeditor.lfm (working copy) 1419@@ -10,8 +10,8 @@ 1420 OnMouseUp = FormMouseUp 1421 object StatusBar: TStatusBar[0] 1422 Left = 0 1423- Height = 23 1424- Top = 277 1425+ Height = 20 1426+ Top = 280 1427 Width = 400 1428 Panels = < 1429 item 1430Index: ide/sourceeditor.lrs 1431=================================================================== 1432--- ide/sourceeditor.lrs (revision 23296) 1433+++ ide/sourceeditor.lrs (working copy) 1434@@ -5,7 +5,7 @@ 1435 +','#1#3'Top'#3'v'#1#5'Width'#3#144#1#14'AllowDropFiles'#9#7'Caption'#6#14'So' 1436 +'urceNotebook'#12'ClientHeight'#3','#1#11'ClientWidth'#3#144#1#9'OnMouseUp'#7 1437 +#11'FormMouseUp'#0#242#2#0#10'TStatusBar'#9'StatusBar'#4'Left'#2#0#6'Height' 1438- +#2#23#3'Top'#3#21#1#5'Width'#3#144#1#6'Panels'#14#1#5'Width'#2'd'#0#1#5'Widt' 1439+ +#2#20#3'Top'#3#24#1#5'Width'#3#144#1#6'Panels'#14#1#5'Width'#2'd'#0#1#5'Widt' 1440 +'h'#3#150#0#0#1#5'Width'#2'2'#0#1#4'Text'#6#3'INS'#5'Width'#2'2'#0#0#10'Simp' 1441 +'leText'#6#14'This is a test'#11'SimplePanel'#8#10'OnDblClick'#7#17'StatusBa' 1442 +'rDblClick'#0#0#0 1443Index: ide/sourceeditor.pp 1444=================================================================== 1445--- ide/sourceeditor.pp (revision 23296) 1446+++ ide/sourceeditor.pp (working copy) 1447@@ -43,7 +43,11 @@ 1448 Classes, SysUtils, Math, Controls, LCLProc, LCLType, LResources, LCLIntf, 1449 FileUtil, Forms, Buttons, ComCtrls, Dialogs, StdCtrls, GraphType, Graphics, 1450 Translations, ClipBrd, TypInfo, types, Extctrls, Menus, HelpIntfs, 1451- LazHelpIntf, LConvEncoding, LDockCtrl, 1452+ LazHelpIntf, LConvEncoding, 1453+{$IFDEF DoDi} 1454+{$ELSE} 1455+ LDockCtrl, 1456+{$ENDIF} 1457 // codetools 1458 BasicCodeTools, CodeBeautifier, CodeToolManager, CodeCache, SourceLog, 1459 // synedit 1460@@ -713,7 +717,10 @@ 1461 public 1462 FindReplaceDlgHistoryIndex: array[TFindDlgComponent] of integer; 1463 FindReplaceDlgUserText: array[TFindDlgComponent] of string; 1464+ {$IFDEF EnableIdeDocking} 1465 ControlDocker: TLazControlDocker; 1466+ {$ELSE} 1467+ {$ENDIF} 1468 1469 constructor Create(AOwner: TComponent); override; 1470 destructor Destroy; override; 1471@@ -3539,9 +3546,9 @@ 1472 SourceEditorWindow:=Self; 1473 1474 EnvironmentOptions.IDEWindowLayoutList.Apply(Self,Name); 1475+ {$IFDEF EnableIDEDocking} 1476 ControlDocker:=TLazControlDocker.Create(Self); 1477 ControlDocker.Name:='SourceEditor'; 1478- {$IFDEF EnableIDEDocking} 1479 ControlDocker.Manager:=LazarusIDE.DockingManager; 1480 {$ENDIF} 1481 1482@@ -6128,7 +6135,10 @@ 1483 1484 procedure TSourceNotebook.DockingClicked(Sender: TObject); 1485 begin 1486+ {$IFDEF EnableIdeDocking} 1487 ControlDocker.ShowDockingEditor; 1488+ {$ELSE} 1489+ {$ENDIF} 1490 end; 1491 1492 {This is called from outside to toggle a bookmark} 1493Index: ideintf/lazideintf.pas 1494=================================================================== 1495--- ideintf/lazideintf.pas (revision 23296) 1496+++ ideintf/lazideintf.pas (working copy) 1497@@ -23,7 +23,8 @@ 1498 1499 uses 1500 Classes, SysUtils, LCLProc, Forms, Controls, Dialogs, PropEdits, LazHelpHTML, 1501- IDEExternToolIntf, IDEOptionsIntf, ProjectIntf, SrcEditorIntf, LDockCtrl; 1502+ IDEExternToolIntf, IDEOptionsIntf, ProjectIntf, SrcEditorIntf 1503+ {$IFDEF dodi} {$ELSE} , LDockCtrl {$ENDIF} ; 1504 1505 type 1506 // open file flags 1507@@ -150,7 +151,9 @@ 1508 const AMethod: TMethod); 1509 protected 1510 fOwningComponent: TComponent; 1511+ {$IFDEF EnableIdeDocking} 1512 FDockingManager: TLazDockingManager; 1513+ {$ENDIF} 1514 1515 function GetActiveProject: TLazProject; virtual; abstract; 1516 procedure DoCallNotifyHandler(HandlerType: TLazarusIDEHandlerType); 1517@@ -167,7 +170,9 @@ 1518 // the main window with the IDE menu 1519 function GetMainBar: TComponent; virtual; abstract; 1520 property MainBarSubTitle: string read FMainBarSubTitle write SetMainBarSubTitle; 1521+ {$IFDEF EnableIdeDocking} 1522 property DockingManager: TLazDockingManager read FDockingManager; 1523+ {$ENDIF} 1524 1525 // find file 1526 function FindUnitFile(const AFilename: string): string; virtual; abstract; 1527Index: ideintf/objectinspector.lfm 1528=================================================================== 1529--- ideintf/objectinspector.lfm (revision 23296) 1530+++ ideintf/objectinspector.lfm (working copy) 1531@@ -2,18 +2,18 @@ 1532 Left = 292 1533 Height = 669 1534 Top = 175 1535- Width = 275 1536+ Width = 292 1537 Caption = 'ObjectInspectorDlg' 1538 ClientHeight = 669 1539- ClientWidth = 275 1540+ ClientWidth = 292 1541 KeyPreview = True 1542 OnResize = ObjectInspectorResize 1543 LCLVersion = '0.9.29' 1544 object StatusBar: TStatusBar 1545 Left = 0 1546- Height = 23 1547- Top = 646 1548- Width = 275 1549+ Height = 20 1550+ Top = 649 1551+ Width = 292 1552 Panels = < 1553 item 1554 Width = 100 1555@@ -27,8 +27,9 @@ 1556 Left = 0 1557 Height = 21 1558 Top = 0 1559- Width = 275 1560- Align = alTop 1561+ Width = 268 1562+ Anchors = [akTop, akLeft, akRight] 1563+ DragKind = dkDock 1564 ItemHeight = 13 1565 OnCloseUp = AvailComboBoxCloseUp 1566 Style = csDropDownList 1567Index: ideintf/objectinspector.lrs 1568=================================================================== 1569--- ideintf/objectinspector.lrs (revision 23296) 1570+++ ideintf/objectinspector.lrs (working copy) 1571@@ -2,14 +2,14 @@ 1572 1573 LazarusResources.Add('TObjectInspectorDlg','FORMDATA',[ 1574 'TPF0'#19'TObjectInspectorDlg'#18'ObjectInspectorDlg'#4'Left'#3'$'#1#6'Height' 1575- +#3#157#2#3'Top'#3#175#0#5'Width'#3#19#1#7'Caption'#6#18'ObjectInspectorDlg' 1576- +#12'ClientHeight'#3#157#2#11'ClientWidth'#3#19#1#10'KeyPreview'#9#8'OnResize' 1577+ +#3#157#2#3'Top'#3#175#0#5'Width'#3'$'#1#7'Caption'#6#18'ObjectInspectorDlg' 1578+ +#12'ClientHeight'#3#157#2#11'ClientWidth'#3'$'#1#10'KeyPreview'#9#8'OnResize' 1579 +#7#21'ObjectInspectorResize'#10'LCLVersion'#6#6'0.9.29'#0#10'TStatusBar'#9'S' 1580- +'tatusBar'#4'Left'#2#0#6'Height'#2#23#3'Top'#3#134#2#5'Width'#3#19#1#6'Panel' 1581+ +'tatusBar'#4'Left'#2#0#6'Height'#2#20#3'Top'#3#137#2#5'Width'#3'$'#1#6'Panel' 1582 +'s'#14#1#5'Width'#2'd'#0#1#5'Width'#2'2'#0#0#11'SimplePanel'#8#0#0#9'TComboB' 1583 +'ox'#23'AvailPersistentComboBox'#4'Left'#2#0#6'Height'#2#21#3'Top'#2#0#5'Wid' 1584- +'th'#3#19#1#5'Align'#7#5'alTop'#10'ItemHeight'#2#13#9'OnCloseUp'#7#20'AvailC' 1585- +'omboBoxCloseUp'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#0#0#0#10'TPopup' 1586- +'Menu'#13'MainPopupMenu'#7'OnPopup'#7#20'OnMainPopupMenuPopup'#4'left'#2#8#3 1587- +'top'#2#11#0#0#0 1588+ +'th'#3#12#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'DragKind'#7#6'dk' 1589+ +'Dock'#10'ItemHeight'#2#13#9'OnCloseUp'#7#20'AvailComboBoxCloseUp'#5'Style'#7 1590+ +#14'csDropDownList'#8'TabOrder'#2#0#0#0#10'TPopupMenu'#13'MainPopupMenu'#7'O' 1591+ +'nPopup'#7#20'OnMainPopupMenuPopup'#4'left'#2#8#3'top'#2#11#0#0#0 1592 ]); 1593Index: JCFSettings.cfg 1594=================================================================== 1595--- JCFSettings.cfg (revision 23296) 1596+++ JCFSettings.cfg (working copy) 1597@@ -1,7 +1,7 @@ 1598 <?xml version="1.0" ?> 1599 <JediCodeFormatSettings> 1600 <WriteVersion> 2.44 </WriteVersion> 1601- <WriteDateTime> 40160.959233287 </WriteDateTime> 1602+ <WriteDateTime> 40174.4210324421 </WriteDateTime> 1603 <Description> format settings for use with Lazarus </Description> 1604 <Obfuscate> 1605 <Enabled> False </Enabled> 1606Index: lcl/include/control.inc 1607=================================================================== 1608--- lcl/include/control.inc (revision 23296) 1609+++ lcl/include/control.inc (working copy) 1610@@ -114,7 +114,9 @@ 1611 begin 1612 if (NewDockSite = nil) then Parent := nil; 1613 if NewDockSite<>nil then begin 1614+ {$IFDEF VerboseDrag} 1615 DebugLn('TControl.DoDock BEFORE Adjusting ',Name,' ',dbgs(ARect)); 1616+ {$ENDIF} 1617 // adjust new bounds, so that they at least fit into the client area of 1618 // its parent 1619 LCLProc.MoveRectToFit(ARect, NewDockSite.GetLogicalClientRect); 1620@@ -125,14 +127,18 @@ 1621 alRight: OffsetRect(ARect,NewDockSite.ClientWidth-ARect.Right,0); 1622 alBottom: OffsetRect(ARect,0,NewDockSite.ClientHeight-ARect.Bottom); 1623 end; 1624+ {$IFDEF VerboseDrag} 1625 DebugLn('TControl.DoDock AFTER Adjusting ',Name,' ',dbgs(ARect),' Align=',AlignNames[Align],' NewDockSite.ClientRect=',dbgs(NewDockSite.ClientRect)); 1626+ {$ENDIF} 1627 end; 1628 //debugln('TControl.DoDock BEFORE MOVE ',Name,' BoundsRect=',dbgs(BoundsRect),' NewRect=',dbgs(ARect)); 1629 if Parent<>NewDockSite then 1630 BoundsRectForNewParent := ARect 1631 else 1632 BoundsRect := ARect; 1633+ {$IFDEF VerboseDrag} 1634 debugln('TControl.DoDock AFTER MOVE ',Name,' BoundsRect=',dbgs(BoundsRect),' TriedRect=',dbgs(ARect)); 1635+ {$ENDIF} 1636 end; 1637 1638 {------------------------------------------------------------------------------ 1639@@ -3918,7 +3924,9 @@ 1640 NewBounds.TopLeft:=ControlOrigin; 1641 end; 1642 NewBounds := Bounds(NewBounds.Left,NewBounds.Top,UndockWidth,UndockHeight); 1643+ {$IFDEF VerboseDrag} 1644 DebugLn('TControl.ManualDock ',Name,' NewDockSite=nil HostDockSiteManagerAvailable=',dbgs(HostDockSiteManagerAvailable(HostDockSite)),' NewBounds=',dbgs(NewBounds)); 1645+ {$ENDIF} 1646 Result := ManualFloat(NewBounds); 1647 end 1648 else 1649@@ -3932,12 +3940,16 @@ 1650 // - this only undocks from the DockManager 1651 // - this control still uses the DockSite as parent control 1652 { TODO -cdocking : Combine with ManualFloat, for consistent handling } 1653+ {$IFDEF VerboseDrag} 1654 DebugLn('TControl.ManualDock UNDOCKING ',Name); 1655+ {$ENDIF} 1656 Result:=HostDockSite.DoUndock(NewDockSite,Self); 1657 end; 1658 1659 if Result then begin 1660+ {$IFDEF VerboseDrag} 1661 DebugLn('TControl.ManualDock DOCKING ',Name); 1662+ {$ENDIF} 1663 // create TDragDockObject for docking parameters 1664 DockObject := TDragDockObject.Create(Self); 1665 try 1666@@ -3954,7 +3966,9 @@ 1667 // map from screen coordinates to new HostSite coordinates 1668 NewPosition:=NewDockSite.ScreenToClient(NewPosition); 1669 // DockDrop 1670+ {$IFDEF VerboseDrag} 1671 DebugLn('TControl.ManualDock DOCKDROP ',Name,' DockRect=',dbgs(DockObject.DockRect),' NewPos=',dbgs(NewPosition)); 1672+ {$ENDIF} 1673 NewDockSite.DockDrop(DockObject,NewPosition.X,NewPosition.Y); 1674 finally 1675 DockObject.Free; 1676@@ -3976,7 +3990,9 @@ 1677 var 1678 FloatHost: TWinControl; 1679 begin 1680+ {$IFDEF VerboseDrag} 1681 DebugLn(['TControl.ManualFloat ',DbgSName(Self)]); 1682+ {$ENDIF} 1683 // undock from old host dock site 1684 if HostDockSite = nil then 1685 begin 1686Index: lcl/include/toolbutton.inc 1687=================================================================== 1688--- lcl/include/toolbutton.inc (revision 23296) 1689+++ lcl/include/toolbutton.inc (working copy) 1690@@ -314,6 +314,7 @@ 1691 begin 1692 // if toolbar is not flat then normal and disabled state is drawn as hot 1693 TempDetails := Details; 1694+ { TODO : bad effect on gtk2 - appearance should be reversed there } 1695 if ((FToolBar <> nil) and not FToolBar.Flat) and (TempDetails.State in [1, 4]) then 1696 TempDetails.State := 2; 1697 1698Index: lcl/include/wincontrol.inc 1699=================================================================== 1700--- lcl/include/wincontrol.inc (revision 23296) 1701+++ lcl/include/wincontrol.inc (working copy) 1702@@ -3742,7 +3742,7 @@ 1703 Result := LRESULT(TargetControl); 1704 end; 1705 else 1706- Result := inherited; 1707+ Result := inherited DoDragMsg(ADragMessage, APosition, ADragObject, ATarget, ADocking); 1708 end; 1709 end; 1710 1711@@ -5159,7 +5159,9 @@ 1712 procedure TWinControl.DoRemoveDockClient(Client: TControl); 1713 begin 1714 // empty (this method exists for descendent overrides) 1715+ {$IFDEF VerboseDrag} 1716 DebugLn(['TWinControl.DoRemoveDockClient ',DbgSName(Self),' ',DbgSName(Client)]); 1717+ {$ENDIF} 1718 end; 1719 1720 {------------------------------------------------------------------------------ 1721@@ -5171,7 +5173,9 @@ 1722 var 1723 NewBounds: TRect; 1724 begin 1725+ {$IFDEF VerboseDrag} 1726 DebugLn('TWinControl.DoUnDock ',Name,' NewTarget=',DbgSName(NewTarget),' Client=',DbgSName(Client)); 1727+ {$ENDIF} 1728 Result := True; 1729 if Assigned(FOnUnDock) then 1730 begin 1731@@ -7529,7 +7533,9 @@ 1732 function TWinControl.DoUnDockClientMsg(NewTarget, Client: TControl): boolean; 1733 begin 1734 Result := True; 1735+ {$IFDEF VerboseDrag} 1736 DebugLn(['TWinControl.DoUnDockClientMsg ',DbgSName(Self),' ',DbgSName(Client),' ',DbgSName(Client.Parent)]); 1737+ {$ENDIF} 1738 if FUseDockManager and (DockManager <> nil) then 1739 DockManager.RemoveControl(Client); 1740 end; 1741