* made the ide a package, so it can be build in parallel with the other packages, reasons:

  - lowers build times
  - ide is not that important anymore than years before
  - other utils like pastojs are also located in the packages tree

git-svn-id: trunk@37926 -

.gitattributes

@@ -910,109 +910,6 @@ compiler/x86_64/x8664tab.inc svneol=native#text/plain
 /fpmake.pp svneol=native#text/plain
 /fpmake_add1.inc svneol=native#text/plain
 /fpmake_proc1.inc svneol=native#text/plain
-ide/Makefile svneol=native#text/plain
-ide/Makefile.fpc svneol=native#text/plain
-ide/Makefile.fpc.fpcmake svneol=native#text/plain
-ide/README.txt svneol=native#text/plain
-ide/TODO.txt svneol=native#text/plain
-ide/compiler/Makefile svneol=native#text/plain
-ide/compiler/Makefile.fpc svneol=native#text/plain
-ide/compiler/compunit.pas svneol=native#text/plain
-ide/cvsco.tdf -text
-ide/cvsdiff.tdf -text
-ide/cvsup.tdf -text
-ide/empty.inc svneol=native#text/plain
-ide/fakegdb/Makefile svneol=native#text/plain
-ide/fakegdb/Makefile.fpc svneol=native#text/plain
-ide/fakegdb/gdbcon.pas svneol=native#text/plain
-ide/fakegdb/gdbint.pas svneol=native#text/plain
-ide/fp.ans -text
-ide/fp.pas svneol=native#text/plain
-ide/fp.term -text svneol=unset#application/octet-stream
-ide/fp32.ico -text
-ide/fp32.rc -text
-ide/fpcalc.pas svneol=native#text/plain
-ide/fpcatch.pas svneol=native#text/plain
-ide/fpcodcmp.pas svneol=native#text/plain
-ide/fpcodtmp.pas svneol=native#text/plain
-ide/fpcompil.pas svneol=native#text/plain
-ide/fpconst.pas svneol=native#text/plain
-ide/fpcygwin.pas svneol=native#text/plain
-ide/fpdebug.pas svneol=native#text/plain
-ide/fpdesk.pas svneol=native#text/plain
-ide/fpdpansi.pas svneol=native#text/plain
-ide/fpevalw.pas svneol=native#text/plain
-ide/fphelp.pas svneol=native#text/plain
-ide/fpide.pas svneol=native#text/plain
-ide/fpini.pas svneol=native#text/plain
-ide/fpintf.pas svneol=native#text/plain
-ide/fpkeys.pas svneol=native#text/plain
-ide/fpmake.pp svneol=native#text/plain
-ide/fpmansi.inc svneol=native#text/plain
-ide/fpmcomp.inc svneol=native#text/plain
-ide/fpmdebug.inc svneol=native#text/plain
-ide/fpmedit.inc svneol=native#text/plain
-ide/fpmfile.inc svneol=native#text/plain
-ide/fpmhelp.inc svneol=native#text/plain
-ide/fpmingw.pas svneol=native#text/plain
-ide/fpmopts.inc svneol=native#text/plain
-ide/fpmrun.inc svneol=native#text/plain
-ide/fpmsrch.inc svneol=native#text/plain
-ide/fpmtools.inc svneol=native#text/plain
-ide/fpmwnd.inc svneol=native#text/plain
-ide/fpredir.pas svneol=native#text/plain
-ide/fpregs.pas svneol=native#text/plain
-ide/fpswitch.pas svneol=native#text/plain
-ide/fpsymbol.pas svneol=native#text/plain
-ide/fptemplt.pas svneol=native#text/plain
-ide/fptools.pas svneol=native#text/plain
-ide/fpusrscr.pas svneol=native#text/plain
-ide/fputils.pas svneol=native#text/plain
-ide/fpvars.pas svneol=native#text/plain
-ide/fpviews.pas svneol=native#text/plain
-ide/fpw32.rc -text
-ide/gdbmicon.pas svneol=native#text/plain
-ide/gdbmiint.pas svneol=native#text/plain
-ide/gdbmiproc.pas svneol=native#text/plain
-ide/gdbmiwrap.pas svneol=native#text/plain
-ide/globdir.inc svneol=native#text/plain
-ide/gplprog.pt -text
-ide/gplunit.pt -text
-ide/grep.tdf -text
-ide/pmode.pas svneol=native#text/plain
-ide/program.pt -text
-ide/readme.ide -text
-ide/test.pas svneol=native#text/plain
-ide/test1.pas svneol=native#text/plain
-ide/test2.pas svneol=native#text/plain
-ide/tpgrep.tdf -text
-ide/unit.pt -text
-ide/vesa.pas svneol=native#text/plain
-ide/wansi.pas svneol=native#text/plain
-ide/wcedit.pas svneol=native#text/plain
-ide/wchmhwrap.pas svneol=native#text/plain
-ide/wconsole.pas svneol=native#text/plain
-ide/wconsts.pas svneol=native#text/plain
-ide/wconstse.inc svneol=native#text/plain
-ide/wconstsh.inc svneol=native#text/plain
-ide/weditor.pas svneol=native#text/plain
-ide/whelp.pas svneol=native#text/plain
-ide/whlpview.pas svneol=native#text/plain
-ide/whtml.pas svneol=native#text/plain
-ide/whtmlhlp.pas svneol=native#text/plain
-ide/whtmlscn.pas svneol=native#text/plain
-ide/winclip.pas svneol=native#text/plain
-ide/windebug.pas svneol=native#text/plain
-ide/wini.pas svneol=native#text/plain
-ide/wnghelp.pas svneol=native#text/plain
-ide/woahelp.pas svneol=native#text/plain
-ide/wos2help.pas svneol=native#text/plain
-ide/wresourc.pas svneol=native#text/plain
-ide/wtphwrit.pas svneol=native#text/plain
-ide/wutils.pas svneol=native#text/plain
-ide/wviews.pas svneol=native#text/plain
-ide/wvphelp.pas svneol=native#text/plain
-ide/wwinhelp.pas svneol=native#text/plain
 installer/Makefile svneol=native#text/plain
 installer/Makefile.fpc svneol=native#text/plain
 installer/install.dat svneol=native#text/plain
@@ -4878,6 +4775,109 @@ packages/iconvenc/fpmake.pp svneol=native#text/plain
 packages/iconvenc/src/iconvenc.pas svneol=native#text/plain
 packages/iconvenc/src/iconvenc_dyn.pas svneol=native#text/plain
 packages/iconvenc/src/iconvert.inc svneol=native#text/plain
+packages/ide/Makefile svneol=native#text/plain
+packages/ide/Makefile.fpc svneol=native#text/plain
+packages/ide/Makefile.fpc.fpcmake svneol=native#text/plain
+packages/ide/README.txt svneol=native#text/plain
+packages/ide/TODO.txt svneol=native#text/plain
+packages/ide/compiler/Makefile svneol=native#text/plain
+packages/ide/compiler/Makefile.fpc svneol=native#text/plain
+packages/ide/compiler/compunit.pas svneol=native#text/plain
+packages/ide/cvsco.tdf -text
+packages/ide/cvsdiff.tdf -text
+packages/ide/cvsup.tdf -text
+packages/ide/empty.inc svneol=native#text/plain
+packages/ide/fakegdb/Makefile svneol=native#text/plain
+packages/ide/fakegdb/Makefile.fpc svneol=native#text/plain
+packages/ide/fakegdb/gdbcon.pas svneol=native#text/plain
+packages/ide/fakegdb/gdbint.pas svneol=native#text/plain
+packages/ide/fp.ans -text
+packages/ide/fp.pas svneol=native#text/plain
+packages/ide/fp.term -text svneol=unset#application/octet-stream
+packages/ide/fp32.ico -text
+packages/ide/fp32.rc -text
+packages/ide/fpcalc.pas svneol=native#text/plain
+packages/ide/fpcatch.pas svneol=native#text/plain
+packages/ide/fpcodcmp.pas svneol=native#text/plain
+packages/ide/fpcodtmp.pas svneol=native#text/plain
+packages/ide/fpcompil.pas svneol=native#text/plain
+packages/ide/fpconst.pas svneol=native#text/plain
+packages/ide/fpcygwin.pas svneol=native#text/plain
+packages/ide/fpdebug.pas svneol=native#text/plain
+packages/ide/fpdesk.pas svneol=native#text/plain
+packages/ide/fpdpansi.pas svneol=native#text/plain
+packages/ide/fpevalw.pas svneol=native#text/plain
+packages/ide/fphelp.pas svneol=native#text/plain
+packages/ide/fpide.pas svneol=native#text/plain
+packages/ide/fpini.pas svneol=native#text/plain
+packages/ide/fpintf.pas svneol=native#text/plain
+packages/ide/fpkeys.pas svneol=native#text/plain
+packages/ide/fpmake.pp svneol=native#text/plain
+packages/ide/fpmansi.inc svneol=native#text/plain
+packages/ide/fpmcomp.inc svneol=native#text/plain
+packages/ide/fpmdebug.inc svneol=native#text/plain
+packages/ide/fpmedit.inc svneol=native#text/plain
+packages/ide/fpmfile.inc svneol=native#text/plain
+packages/ide/fpmhelp.inc svneol=native#text/plain
+packages/ide/fpmingw.pas svneol=native#text/plain
+packages/ide/fpmopts.inc svneol=native#text/plain
+packages/ide/fpmrun.inc svneol=native#text/plain
+packages/ide/fpmsrch.inc svneol=native#text/plain
+packages/ide/fpmtools.inc svneol=native#text/plain
+packages/ide/fpmwnd.inc svneol=native#text/plain
+packages/ide/fpredir.pas svneol=native#text/plain
+packages/ide/fpregs.pas svneol=native#text/plain
+packages/ide/fpswitch.pas svneol=native#text/plain
+packages/ide/fpsymbol.pas svneol=native#text/plain
+packages/ide/fptemplt.pas svneol=native#text/plain
+packages/ide/fptools.pas svneol=native#text/plain
+packages/ide/fpusrscr.pas svneol=native#text/plain
+packages/ide/fputils.pas svneol=native#text/plain
+packages/ide/fpvars.pas svneol=native#text/plain
+packages/ide/fpviews.pas svneol=native#text/plain
+packages/ide/fpw32.rc -text
+packages/ide/gdbmicon.pas svneol=native#text/plain
+packages/ide/gdbmiint.pas svneol=native#text/plain
+packages/ide/gdbmiproc.pas svneol=native#text/plain
+packages/ide/gdbmiwrap.pas svneol=native#text/plain
+packages/ide/globdir.inc svneol=native#text/plain
+packages/ide/gplprog.pt -text
+packages/ide/gplunit.pt -text
+packages/ide/grep.tdf -text
+packages/ide/pmode.pas svneol=native#text/plain
+packages/ide/program.pt -text
+packages/ide/readme.ide -text
+packages/ide/test.pas svneol=native#text/plain
+packages/ide/test1.pas svneol=native#text/plain
+packages/ide/test2.pas svneol=native#text/plain
+packages/ide/tpgrep.tdf -text
+packages/ide/unit.pt -text
+packages/ide/vesa.pas svneol=native#text/plain
+packages/ide/wansi.pas svneol=native#text/plain
+packages/ide/wcedit.pas svneol=native#text/plain
+packages/ide/wchmhwrap.pas svneol=native#text/plain
+packages/ide/wconsole.pas svneol=native#text/plain
+packages/ide/wconsts.pas svneol=native#text/plain
+packages/ide/wconstse.inc svneol=native#text/plain
+packages/ide/wconstsh.inc svneol=native#text/plain
+packages/ide/weditor.pas svneol=native#text/plain
+packages/ide/whelp.pas svneol=native#text/plain
+packages/ide/whlpview.pas svneol=native#text/plain
+packages/ide/whtml.pas svneol=native#text/plain
+packages/ide/whtmlhlp.pas svneol=native#text/plain
+packages/ide/whtmlscn.pas svneol=native#text/plain
+packages/ide/winclip.pas svneol=native#text/plain
+packages/ide/windebug.pas svneol=native#text/plain
+packages/ide/wini.pas svneol=native#text/plain
+packages/ide/wnghelp.pas svneol=native#text/plain
+packages/ide/woahelp.pas svneol=native#text/plain
+packages/ide/wos2help.pas svneol=native#text/plain
+packages/ide/wresourc.pas svneol=native#text/plain
+packages/ide/wtphwrit.pas svneol=native#text/plain
+packages/ide/wutils.pas svneol=native#text/plain
+packages/ide/wviews.pas svneol=native#text/plain
+packages/ide/wvphelp.pas svneol=native#text/plain
+packages/ide/wwinhelp.pas svneol=native#text/plain
 packages/imagemagick/Makefile svneol=native#text/plain
 packages/imagemagick/Makefile.fpc svneol=native#text/plain
 packages/imagemagick/Makefile.fpc.fpcmake svneol=native#text/plain

.gitignore

@@ -238,27 +238,6 @@ compiler/x86_64/lazbuild/fpcmade.*
 compiler/x86_64/lazbuild/units
 compiler/x86_64/units
 /fpcmade.*
-ide/*.bak
-ide/*.exe
-ide/*.o
-ide/*.ppu
-ide/*.s
-ide/compiler/*.bak
-ide/compiler/*.exe
-ide/compiler/*.o
-ide/compiler/*.ppu
-ide/compiler/*.s
-ide/compiler/fpcmade.*
-ide/compiler/units
-ide/fakegdb/*.bak
-ide/fakegdb/*.exe
-ide/fakegdb/*.o
-ide/fakegdb/*.ppu
-ide/fakegdb/*.s
-ide/fakegdb/fpcmade.*
-ide/fakegdb/units
-ide/fpcmade.*
-ide/units
 installer/*.bak
 installer/*.exe
 installer/*.o
@@ -2689,6 +2668,27 @@ packages/iconvenc/src/build-stamp.*
 packages/iconvenc/src/fpcmade.*
 packages/iconvenc/src/units
 packages/iconvenc/units
+packages/ide/*.bak
+packages/ide/*.exe
+packages/ide/*.o
+packages/ide/*.ppu
+packages/ide/*.s
+packages/ide/compiler/*.bak
+packages/ide/compiler/*.exe
+packages/ide/compiler/*.o
+packages/ide/compiler/*.ppu
+packages/ide/compiler/*.s
+packages/ide/compiler/fpcmade.*
+packages/ide/compiler/units
+packages/ide/fakegdb/*.bak
+packages/ide/fakegdb/*.exe
+packages/ide/fakegdb/*.o
+packages/ide/fakegdb/*.ppu
+packages/ide/fakegdb/*.s
+packages/ide/fakegdb/fpcmade.*
+packages/ide/fakegdb/units
+packages/ide/fpcmade.*
+packages/ide/units
 packages/imagemagick/*.bak
 packages/imagemagick/*.exe
 packages/imagemagick/*.o

Makefile.fpc

@@ -7,7 +7,7 @@ name=fpc
 version=3.1.1
 
 [target]
-dirs=compiler rtl utils packages ide installer
+dirs=compiler rtl utils packages installer
 
 [require]
 nortl=y
@@ -195,33 +195,6 @@ CLEANOPTS=FPC=$(PPNEW)
 BUILDOPTS=FPC=$(PPNEW) FPCFPMAKE=$(FPCFPMAKENEW) RELEASE=1 'OPT=$(OPTNEW)'
 INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
 
-# This list should be the same as in fpcbuild/Makefile.fpc and in ide/Makefile.fpc
-GDBMI_DEFAULT_OS_LIST=aix freebsd haiku linux netbsd openbsd solaris win32 win64
-#  Determine if we should use GDBMI for Text Mode IDE compilation
-ifndef NOGDBMI
-ifneq ($(findstring $(OS_TARGET),$(GDBMI_DEFAULT_OS_LIST)),)
-export GDBMI=1
-endif
-endif
-
-# Compile also IDE now enabled even for cross-compilation
-# if GDBMI is set
-ifdef GDBMI
-ifneq ($(GDBMI),0)
-IDE=1
-endif
-else # not GDBMI
-# Skipped by default for cross compiles, because it depends on libc
-ifndef CROSSCOMPILE
-ifneq ($(wildcard ide),)
-IDETARGETS=go32v2 win32 win64 linux freebsd os2 emx beos haiku
-ifneq ($(findstring $(OS_TARGET),$(IDETARGETS)),)
-IDE=1
-endif
-endif
-endif
-endif # not GDBMI
-
 # CPU targets for which we only build the compiler/rtl
 BuildOnlyBaseCPUs=jvm
 
@@ -328,19 +301,11 @@ endif
 ifdef UTILS
         $(MAKE) utils_clean $(CLEANOPTS)
 endif
-ifdef IDE
-        $(MAKE) ide_clean $(CLEANOPTS)
-        $(MAKE) installer_clean $(CLEANOPTS)
-endif
 # build everything
         $(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
         $(MAKE) packages_$(ALLTARGET) $(BUILDOPTS)
 ifdef UTILS
         $(MAKE) utils_all $(BUILDOPTS)
-endif
-ifdef IDE
-        $(MAKE) ide_all $(BUILDOPTS)
-        $(MAKE) installer_all $(BUILDOPTS)
 endif
         $(ECHOREDIR) Build > $(BUILDSTAMP)
         $(ECHOREDIR) Build > base.$(BUILDSTAMP)
@@ -373,9 +338,6 @@ installother:
 ifdef UTILS
         $(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
 endif
-ifdef IDE
-        $(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
-endif
 
 zipinstallbase:
         $(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=base $(INSTALLOPTS)
@@ -385,9 +347,6 @@ zipinstallother:
 ifdef UTILS
         $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS)
 endif
-ifdef IDE
-        $(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS)
-endif
 
 
 installall: $(BUILDSTAMP)

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-12-27 rev 37833]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux

packages/fpmake_add.inc

@@ -138,4 +138,5 @@
   add_libgc(ADirectory+IncludeTrailingPathDelimiter('libgc'));
   add_libfontconfig(ADirectory+IncludeTrailingPathDelimiter('libfontconfig'));
   add_fcl_report(ADirectory+IncludeTrailingPathDelimiter('fcl-report'));
+  add_ide(ADirectory+IncludeTrailingPathDelimiter('ide'));
   

packages/fpmake_proc.inc

@@ -788,3 +788,5 @@ begin
   with Installer do
 {$include fcl-report/fpmake.pp}
 end;
+
+{$include ide/fpmake.pp}

ide/Makefile → packages/ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-12-27 rev 37833]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
@@ -100,7 +100,7 @@ endif
 endif
 export ECHO
 endif
-override DEFAULT_FPCDIR=..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)

ide/Makefile.fpc → packages/ide/Makefile.fpc

@@ -9,7 +9,7 @@ fpcpackage=y
 fpcsubdir=ide
 
 [default]
-fpcdir=..
+fpcdir=../..
 
 [prerules]
 # Translate INSTALL_UNITDIR to fpmake's --unitinstalldir parameter

ide/fpmake.pp → packages/ide/fpmake.pp

@@ -68,7 +68,6 @@ procedure ide_check_gdb_availability(Sender: TObject);
   end;
 
 var
-  s: string;
   GDBLibDir: string;
   P: TPackage;
 
@@ -145,6 +144,7 @@ Var
   P : TPackage;
   T : TTarget;
   CompilerTarget : TCpu;
+  CompilerDir,
   s: string;
 
 begin
@@ -164,114 +164,122 @@ begin
       CompilerTarget:=StringToCPU(s)
     else
       CompilerTarget:=Defaults.CPU;
-
-    P:=AddPackage('ide');
-    P.Version:='3.1.1';
+    
+    if GDBMIOption or 
+      ( (Defaults.BuildOS=Defaults.OS) and (Defaults.BuildCPU=Defaults.CPU) and
+        (Defaults.OS in [go32v2,win32,win64,linux,freebsd,os2,emx,beos,haiku])
+      ) then
+      begin
+        P:=AddPackage('ide');
+        P.Version:='3.1.1';
 {$ifdef ALLPACKAGES}
-    P.Directory:=ADirectory;
+        P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
 
-    P.Dependencies.Add('rtl-extra');
-    P.Dependencies.Add('fv');
-    P.Dependencies.Add('chm');
-    { This one is only needed if DEBUG is set }
-    P.Dependencies.Add('regexpr');
-    if not (NoGDBOption) and not (GDBMIOption) then
-      P.Dependencies.Add('gdbint',AllOSes-AllAmigaLikeOSes);
-    if GDBMIOption then
-      P.Dependencies.Add('fcl-process');
-    P.Dependencies.Add('graph',[go32v2]);
-    P.Dependencies.Add('ami-extra',AllAmigaLikeOSes);
+        P.Dependencies.Add('rtl-extra');
+        P.Dependencies.Add('fv');
+        P.Dependencies.Add('chm');
+        { This one is only needed if DEBUG is set }
+        P.Dependencies.Add('regexpr');
+        if not (NoGDBOption) and not (GDBMIOption) then
+        P.Dependencies.Add('gdbint',AllOSes-AllAmigaLikeOSes);
+        if GDBMIOption then
+        P.Dependencies.Add('fcl-process');
+        P.Dependencies.Add('graph',[go32v2]);
+        P.Dependencies.Add('ami-extra',AllAmigaLikeOSes);
 
-    P.SupportBuildModes:=[bmOneByOne];
+        P.SupportBuildModes:=[bmOneByOne];
 
-    P.Options.Add('-Ur');
-    P.Options.Add('-dNOCATCH');
-    P.Options.Add('-dBrowserCol');
-    P.Options.Add('-dGDB');
+        P.Options.Add('-Ur');
+        P.Options.Add('-dNOCATCH');
+        P.Options.Add('-dBrowserCol');
+        P.Options.Add('-dGDB');
+        
+        CompilerDir:='../compiler';
 
-    P.Options.Add('-d'+CPUToString(CompilerTarget));
-    P.Options.Add('-Fu../compiler');
-    P.Options.Add('-Fu../compiler/'+CPUToString(CompilerTarget));
-    P.Options.Add('-Fu../compiler/targets');
-    P.Options.Add('-Fu../compiler/systems');
-    P.Options.Add('-Fi../compiler/'+CPUToString(CompilerTarget));
-    P.Options.Add('-Fi../compiler');
+        P.Options.Add('-d'+CPUToString(CompilerTarget));
+        P.Options.Add('-Fu'+CompilerDir);
+        P.Options.Add('-Fu'+CompilerDir+'/'+CPUToString(CompilerTarget));
+        P.Options.Add('-Fu'+CompilerDir+'/targets');
+        P.Options.Add('-Fu'+CompilerDir+'/systems');
+        P.Options.Add('-Fi'+CompilerDir+'/'+CPUToString(CompilerTarget));
+        P.Options.Add('-Fi'+CompilerDir);
 
-    if CompilerTarget in [x86_64, i386, i8086] then
-      P.Options.Add('-Fu../compiler/x86');
-    if CompilerTarget in [powerpc, powerpc64] then
-      P.Options.Add('-Fu../compiler/ppcgen');
-    if CompilerTarget in [sparc, sparc64] then
-      begin
-        P.Options.Add('-Fu../compiler/sparcgen');
-        P.Options.add('-Fi../compiler/sparcgen');
-      end;
-    if CompilerTarget = x86_64 then
-      P.Options.Add('-dNOOPT');
-    if CompilerTarget = mipsel then
-      P.Options.Add('-Fu../compiler/mips');
+        if CompilerTarget in [x86_64, i386, i8086] then
+        P.Options.Add('-Fu'+CompilerDir+'/x86');
+        if CompilerTarget in [powerpc, powerpc64] then
+        P.Options.Add('-Fu'+CompilerDir+'/ppcgen');
+        if CompilerTarget in [sparc, sparc64] then
+        begin
+            P.Options.Add('-Fu'+CompilerDir+'/sparcgen');
+            P.Options.add('-Fi'+CompilerDir+'/sparcgen');
+        end;
+        if CompilerTarget = x86_64 then
+        P.Options.Add('-dNOOPT');
+        if CompilerTarget = mipsel then
+        P.Options.Add('-Fu'+CompilerDir+'/mips');
 
-    { powerpc64-aix compiled IDE needs -CTsmalltoc option }
-    if (Defaults.OS=aix) and (Defaults.CPU=powerpc64) then
-     P.Options.Add('-CTsmalltoc');
-    { Handle SPECIALLINK environment variable if available }
-    s:=GetEnvironmentVariable('SPECIALLINK');
-    if s<>'' then
-      P.Options.Add(s);
-    P.Options.Add('-Sg');
-    P.IncludePath.Add('compiler');
+        { powerpc64-aix compiled IDE needs -CTsmalltoc option }
+        if (Defaults.OS=aix) and (Defaults.CPU=powerpc64) then
+        P.Options.Add('-CTsmalltoc');
+        { Handle SPECIALLINK environment variable if available }
+        s:=GetEnvironmentVariable('SPECIALLINK');
+        if s<>'' then
+        P.Options.Add(s);
+        P.Options.Add('-Sg');
+        P.IncludePath.Add('compiler');
 
-    T:=P.Targets.AddProgram('fp.pas');
-    with T.Dependencies do
-     begin
-      AddUnit('compunit');
-     end;
+        T:=P.Targets.AddProgram('fp.pas');
+        with T.Dependencies do
+        begin
+        AddUnit('compunit');
+        end;
 
-    T:=P.Targets.AddUnit('compunit.pas');
-    T.Directory:='compiler';
-    T.Install:=false;
+        T:=P.Targets.AddUnit('compunit.pas');
+        T.Directory:='compiler';
+        T.Install:=false;
 
-    P.InstallFiles.Add('fp.ans','$(bininstalldir)');
-    P.InstallFiles.Add('gplprog.pt','$(bininstalldir)');
-    P.InstallFiles.Add('gplunit.pt','$(bininstalldir)');
-    P.InstallFiles.Add('program.pt','$(bininstalldir)');
-    P.InstallFiles.Add('unit.pt','$(bininstalldir)');
-    P.InstallFiles.Add('cvsco.tdf','$(bininstalldir)');
-    P.InstallFiles.Add('cvsdiff.tdf','$(bininstalldir)');
-    P.InstallFiles.Add('cvsup.tdf','$(bininstalldir)');
-    P.InstallFiles.Add('grep.tdf','$(bininstalldir)');
-    P.InstallFiles.Add('tpgrep.tdf','$(bininstalldir)');
-    P.InstallFiles.Add('fp32.ico', [win32, win64], '$(bininstalldir)');
+        P.InstallFiles.Add('fp.ans','$(bininstalldir)');
+        P.InstallFiles.Add('gplprog.pt','$(bininstalldir)');
+        P.InstallFiles.Add('gplunit.pt','$(bininstalldir)');
+        P.InstallFiles.Add('program.pt','$(bininstalldir)');
+        P.InstallFiles.Add('unit.pt','$(bininstalldir)');
+        P.InstallFiles.Add('cvsco.tdf','$(bininstalldir)');
+        P.InstallFiles.Add('cvsdiff.tdf','$(bininstalldir)');
+        P.InstallFiles.Add('cvsup.tdf','$(bininstalldir)');
+        P.InstallFiles.Add('grep.tdf','$(bininstalldir)');
+        P.InstallFiles.Add('tpgrep.tdf','$(bininstalldir)');
+        P.InstallFiles.Add('fp32.ico', [win32, win64], '$(bininstalldir)');
 
-    with P.Sources do
-     begin
-      AddDoc('readme.ide');
-      AddSrc('readme.txt');
-      AddSrc('todo.txt');
-      AddSrc('fp.ans');
-      AddSrcFiles('*.tdf',P.Directory);
-      AddSrcFiles('*.pas',P.Directory,true);
-      AddSrcFiles('*.inc',P.Directory,true);
-      AddSrcFiles('*.rc',P.Directory);
-      AddSrcFiles('*.ico',P.Directory);
-      AddSrcFiles('*.term',P.Directory);
-      AddSrcFiles('*.pt',P.Directory);
-     end;
+        with P.Sources do
+        begin
+        AddDoc('readme.ide');
+        AddSrc('readme.txt');
+        AddSrc('todo.txt');
+        AddSrc('fp.ans');
+        AddSrcFiles('*.tdf',P.Directory);
+        AddSrcFiles('*.pas',P.Directory,true);
+        AddSrcFiles('*.inc',P.Directory,true);
+        AddSrcFiles('*.rc',P.Directory);
+        AddSrcFiles('*.ico',P.Directory);
+        AddSrcFiles('*.term',P.Directory);
+        AddSrcFiles('*.pt',P.Directory);
+        end;
 
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)ppheap.ppu');
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)compiler.ppu');
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)comphook.ppu');
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)cpuinfo.ppu');
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)browcol.ppu');
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)ppheap.o');
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)compiler.o');
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)comphook.o');
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)cpuinfo.o');
-    P.CleanFiles.Add('$(UNITSOUTPUTDIR)browcol.o');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)ppheap.ppu');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)compiler.ppu');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)comphook.ppu');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)cpuinfo.ppu');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)browcol.ppu');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)ppheap.o');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)compiler.o');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)comphook.o');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)cpuinfo.o');
+        P.CleanFiles.Add('$(UNITSOUTPUTDIR)browcol.o');
 
-    P.BeforeCompileProc:=@ide_check_gdb_availability;
-    end;
+        P.BeforeCompileProc:=@ide_check_gdb_availability;
+      end;
+  end;
 end;
 
 {$ifndef ALLPACKAGES}