From df4191acb367b965f4d4f331c758f4931c805574 Mon Sep 17 00:00:00 2001 From: joost Date: Sun, 2 Jun 2013 17:55:23 +0000 Subject: [PATCH] * Handle the location of each package at run-time, not at compilation time * Added a fpmake.pp in the root, to compile the utils and packages in one go git-svn-id: trunk@24783 - --- .gitattributes | 3 + fpmake.pp | 56 ++++++++ fpmake_add1.inc | 4 + fpmake_proc1.inc | 14 ++ ide/fpmake.pp | 7 +- packages/a52/fpmake.pp | 2 +- packages/amunits/fpmake.pp | 2 +- packages/aspell/fpmake.pp | 4 +- packages/bfd/fpmake.pp | 2 +- packages/bzip2/fpmake.pp | 4 +- packages/cairo/fpmake.pp | 2 +- packages/cdrom/fpmake.pp | 2 +- packages/chm/fpmake.pp | 2 +- packages/cocoaint/fpmake.pp | 2 +- packages/dblib/fpmake.pp | 8 +- packages/dbus/fpmake.pp | 2 +- packages/dts/fpmake.pp | 2 +- packages/fastcgi/fpmake.pp | 2 +- packages/fcl-async/fpmake.pp | 2 +- packages/fcl-base/fpmake.pp | 2 +- packages/fcl-db/fpmake.pp | 8 +- packages/fcl-extra/fpmake.pp | 2 +- packages/fcl-fpcunit/fpmake.pp | 2 +- packages/fcl-image/fpmake.pp | 2 +- packages/fcl-js/fpmake.pp | 2 +- packages/fcl-json/fpmake.pp | 2 +- packages/fcl-net/fpmake.pp | 2 +- packages/fcl-passrc/fpmake.pp | 2 +- packages/fcl-process/fpmake.pp | 2 +- packages/fcl-registry/fpmake.pp | 2 +- packages/fcl-res/fpmake.pp | 2 +- packages/fcl-sdo/fpmake.pp | 2 +- packages/fcl-stl/fpmake.pp | 2 +- packages/fcl-web/fpmake.pp | 2 +- packages/fcl-xml/fpmake.pp | 2 +- packages/fftw/fpmake.pp | 2 +- packages/fpgtk/fpmake.pp | 2 +- packages/fpindexer/fpmake.pp | 8 +- packages/fpmake.pp | 18 ++- packages/fpmake_add.inc | 232 +++++++++++++++---------------- packages/fpmake_proc.inc | 232 +++++++++++++++---------------- packages/fpmkunit/fpmake.pp | 2 +- packages/fppkg/fpmake.pp | 8 +- packages/fv/fpmake.pp | 2 +- packages/gdbint/fpmake.pp | 8 +- packages/gdbm/fpmake.pp | 2 +- packages/ggi/fpmake.pp | 2 +- packages/gmp/fpmake.pp | 2 +- packages/gnome1/fpmake.pp | 2 +- packages/graph/fpmake.pp | 2 +- packages/gtk1/fpmake.pp | 2 +- packages/gtk2/fpmake.pp | 2 +- packages/hash/fpmake.pp | 2 +- packages/hermes/fpmake.pp | 2 +- packages/httpd13/fpmake.pp | 2 +- packages/httpd20/fpmake.pp | 2 +- packages/httpd22/fpmake.pp | 2 +- packages/httpd24/fpmake.pp | 2 +- packages/ibase/fpmake.pp | 2 +- packages/iconvenc/fpmake.pp | 2 +- packages/imagemagick/fpmake.pp | 2 +- packages/imlib/fpmake.pp | 2 +- packages/jni/fpmake.pp | 2 +- packages/ldap/fpmake.pp | 2 +- packages/libc/fpmake.pp | 2 +- packages/libcurl/fpmake.pp | 2 +- packages/libgbafpc/fpmake.pp | 2 +- packages/libgd/fpmake.pp | 2 +- packages/libndsfpc/fpmake.pp | 2 +- packages/libogcfpc/fpmake.pp | 2 +- packages/libpng/fpmake.pp | 2 +- packages/librsvg/fpmake.pp | 2 +- packages/libsee/fpmake.pp | 2 +- packages/libtar/fpmake.pp | 2 +- packages/libvlc/fpmake.pp | 2 +- packages/libxml/fpmake.pp | 2 +- packages/lua/fpmake.pp | 2 +- packages/mad/fpmake.pp | 2 +- packages/modplug/fpmake.pp | 2 +- packages/mysql/fpmake.pp | 2 +- packages/ncurses/fpmake.pp | 2 +- packages/newt/fpmake.pp | 2 +- packages/numlib/fpmake.pp | 2 +- packages/nvapi/fpmake.pp | 2 +- packages/objcrtl/fpmake.pp | 2 +- packages/odbc/fpmake.pp | 2 +- packages/oggvorbis/fpmake.pp | 2 +- packages/openal/fpmake.pp | 2 +- packages/opencl/fpmake.pp | 2 +- packages/opengl/fpmake.pp | 2 +- packages/opengles/fpmake.pp | 2 +- packages/openssl/fpmake.pp | 2 +- packages/oracle/fpmake.pp | 2 +- packages/os2units/fpmake.pp | 2 +- packages/palmunits/fpmake.pp | 2 +- packages/pasjpeg/fpmake.pp | 2 +- packages/paszlib/fpmake.pp | 2 +- packages/pcap/fpmake.pp | 2 +- packages/postgres/fpmake.pp | 2 +- packages/proj4/fpmake.pp | 2 +- packages/ptc/fpmake.pp | 2 +- packages/pthreads/fpmake.pp | 2 +- packages/pxlib/fpmake.pp | 2 +- packages/regexpr/fpmake.pp | 2 +- packages/rexx/fpmake.pp | 2 +- packages/sdl/fpmake.pp | 2 +- packages/sqlite/fpmake.pp | 2 +- packages/svgalib/fpmake.pp | 2 +- packages/symbolic/fpmake.pp | 2 +- packages/syslog/fpmake.pp | 2 +- packages/tcl/fpmake.pp | 2 +- packages/univint/fpmake.pp | 2 +- packages/unixutil/fpmake.pp | 2 +- packages/unzip/fpmake.pp | 2 +- packages/users/fpmake.pp | 2 +- packages/utmp/fpmake.pp | 2 +- packages/uuid/fpmake.pp | 2 +- packages/winceunits/fpmake.pp | 3 +- packages/winunits-base/fpmake.pp | 2 +- packages/winunits-jedi/fpmake.pp | 2 +- packages/x11/fpmake.pp | 2 +- packages/xforms/fpmake.pp | 2 +- packages/zlib/fpmake.pp | 2 +- packages/zorba/fpmake.pp | 2 +- utils/dxegen/fpmake.pp | 8 +- utils/fpcm/fpmake.pp | 4 +- utils/fpcm/revision.inc | 2 +- utils/fpcmkcfg/fpmake.pp | 8 +- utils/fpcres/fpmake.pp | 8 +- utils/fpcreslipo/fpmake.pp | 8 +- utils/fpdoc/fpmake.pp | 8 +- utils/fpmake.pp | 39 ++++-- utils/fpmake_add.inc | 36 ++--- utils/fpmc/fpmake.pp | 6 +- utils/fppkg/fpmake.pp | 8 +- utils/fprcp/fpmake.pp | 8 +- utils/h2pas/fpmake.pp | 8 +- utils/importtl/fpmake.pp | 8 +- utils/instantfpc/fpmake.pp | 8 +- utils/pas2fpm/fpmake.pp | 8 +- utils/pas2jni/fpmake.pp | 8 +- utils/pas2ut/fpmake.pp | 8 +- utils/rmwait/fpmake.pp | 6 +- utils/tply/fpmake.pp | 8 +- utils/unicode/fpmake.pp | 4 +- 145 files changed, 553 insertions(+), 489 deletions(-) create mode 100644 fpmake.pp create mode 100644 fpmake_add1.inc create mode 100644 fpmake_proc1.inc diff --git a/.gitattributes b/.gitattributes index f3fe033724..356a1a14ec 100644 --- a/.gitattributes +++ b/.gitattributes @@ -822,6 +822,9 @@ compiler/x86_64/x8664nop.inc svneol=native#text/plain compiler/x86_64/x8664op.inc svneol=native#text/plain compiler/x86_64/x8664pro.inc svneol=native#text/plain 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 diff --git a/fpmake.pp b/fpmake.pp new file mode 100644 index 0000000000..443a1c4bba --- /dev/null +++ b/fpmake.pp @@ -0,0 +1,56 @@ +{$mode objfpc}{$H+} +{$define allpackages} +program fpmake; + +{$IFDEF OS2} + {$DEFINE NO_UNIT_PROCESS} +{$ENDIF OS2} + +{$IFDEF GO32V2} + {$DEFINE NO_UNIT_PROCESS} +{$ENDIF GO32V2} + +{$ifndef NO_UNIT_PROCESS} + {$define HAS_UNIT_PROCESS} +{$endif NO_UNIT_PROCESS} + +uses + fpmkunit, + classes, +{$IFDEF HAS_UNIT_PROCESS} + process, +{$ENDIF HAS_UNIT_PROCESS} + sysutils; + + +Var + TBuild,T : TTarget; + PBuild,P : TPackage; + D : TDependency; + I : Integer; + +(* + +The include files are generated with the following commands: + +rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do cleanedname=`dirname $file | sed -e 's+-+_+g'` ; if ! `grep -i "^procedure add_$cleanedname" $file >/dev/null` ; then printf 'procedure add_%s(const ADirectory: string);\nbegin\n with Installer do\n{$include %s}\nend;\n\n' $cleanedname $file >> fpmake_proc.inc; else printf '{$include %s}\n\n' $file >> fpmake_proc.inc; fi; echo " add_$cleanedname(ADirectory+IncludeTrailingPathDelimiter('$cleanedname'));" >> fpmake_add.inc; done + +*) + +{$include fpmake_proc1.inc} + +procedure add_fpc(const ADirectory: string); + +begin +{$include fpmake_add1.inc} + +end; + +begin + add_fpc(''); + Installer.Run; +end. + + + + diff --git a/fpmake_add1.inc b/fpmake_add1.inc new file mode 100644 index 0000000000..d5e000809d --- /dev/null +++ b/fpmake_add1.inc @@ -0,0 +1,4 @@ + //add_ide(IncludeTrailingPathDelimiter(ADirectory+'ide')); + add_packages(ADirectory+IncludeTrailingPathDelimiter('packages')); + //add_rtl(IncludeTrailingPathDelimiter(ADirectory+'rtl')); + add_utils(IncludeTrailingPathDelimiter(ADirectory+'utils')); diff --git a/fpmake_proc1.inc b/fpmake_proc1.inc new file mode 100644 index 0000000000..c6825a8c7e --- /dev/null +++ b/fpmake_proc1.inc @@ -0,0 +1,14 @@ +{ $include ide/fpmake.pp} + +{$include packages/fpmake.pp} + +(* +procedure add_rtl(const ADirectory: string); +begin + with Installer do +{$include rtl/fpmake.pp} +end; +*) + +{$include utils/fpmake.pp} + diff --git a/ide/fpmake.pp b/ide/fpmake.pp index 5f3b8a089b..d0b9bc9244 100644 --- a/ide/fpmake.pp +++ b/ide/fpmake.pp @@ -118,7 +118,7 @@ begin end; end; -procedure add_ide; +procedure add_ide(const ADirectory: string); Var P : TPackage; @@ -139,6 +139,9 @@ begin P:=AddPackage('ide'); P.Version:='2.7.1'; +{$ifdef ALLPACKAGES} + P.Directory:=ADirectory; +{$endif ALLPACKAGES} P.Dependencies.Add('rtl'); P.Dependencies.Add('fv'); @@ -210,7 +213,7 @@ end; {$ifndef ALLPACKAGES} begin - add_ide; + add_ide(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/packages/a52/fpmake.pp b/packages/a52/fpmake.pp index 153418b57e..634c08b412 100644 --- a/packages/a52/fpmake.pp +++ b/packages/a52/fpmake.pp @@ -23,7 +23,7 @@ begin P.OSes := [linux.win32]; {$ifdef ALLPACKAGES} - P.Directory:='a52'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/amunits/fpmake.pp b/packages/amunits/fpmake.pp index c8f8cf63ab..209a07816c 100644 --- a/packages/amunits/fpmake.pp +++ b/packages/amunits/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('amunits'); {$ifdef ALLPACKAGES} - P.Directory:='amunits'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/aspell/fpmake.pp b/packages/aspell/fpmake.pp index ef5e2960b4..697256366a 100644 --- a/packages/aspell/fpmake.pp +++ b/packages/aspell/fpmake.pp @@ -13,9 +13,11 @@ begin {$endif ALLPACKAGES} P:=AddPackage('aspell'); + {$ifdef ALLPACKAGES} - P.Directory:='aspell'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} + P.Version:='2.7.1'; P.Author := 'header:Aleš Katona, library: Kevin Atkinson'; diff --git a/packages/bfd/fpmake.pp b/packages/bfd/fpmake.pp index 9701102dad..30a70151f5 100644 --- a/packages/bfd/fpmake.pp +++ b/packages/bfd/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('bfd'); {$ifdef ALLPACKAGES} - P.Directory:='bfd'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: Cygnus Support, header: by Uli Tessel'; diff --git a/packages/bzip2/fpmake.pp b/packages/bzip2/fpmake.pp index cfa4dc2fd5..ab6630c5f1 100644 --- a/packages/bzip2/fpmake.pp +++ b/packages/bzip2/fpmake.pp @@ -13,9 +13,11 @@ begin {$endif ALLPACKAGES} P:=AddPackage('bzip2'); + {$ifdef ALLPACKAGES} - P.Directory:='bzip2'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} + P.Version:='2.7.1'; P.Version:='2.7.1'; diff --git a/packages/cairo/fpmake.pp b/packages/cairo/fpmake.pp index 81c404144c..527d787bb6 100644 --- a/packages/cairo/fpmake.pp +++ b/packages/cairo/fpmake.pp @@ -13,7 +13,7 @@ begin {$endif ALLPACKAGES} P:=AddPackage('cairo'); {$ifdef ALLPACKAGES} - P.Directory:='cairo'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: University of Southern California + Red Hat Inc., header: Luiz AmXrico Pereira CXmara'; diff --git a/packages/cdrom/fpmake.pp b/packages/cdrom/fpmake.pp index 6f4fdd2eaa..6a2e117afd 100644 --- a/packages/cdrom/fpmake.pp +++ b/packages/cdrom/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('cdrom'); {$ifdef ALLPACKAGES} - P.Directory:='cdrom'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=[Win32,Win64,Linux]; diff --git a/packages/chm/fpmake.pp b/packages/chm/fpmake.pp index 9b3a6e5320..adbce22c92 100644 --- a/packages/chm/fpmake.pp +++ b/packages/chm/fpmake.pp @@ -15,7 +15,7 @@ begin P:=AddPackage('chm'); {$ifdef ALLPACKAGES} - P.Directory:='chm'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/cocoaint/fpmake.pp b/packages/cocoaint/fpmake.pp index 608d02e53f..18ad58a5c8 100644 --- a/packages/cocoaint/fpmake.pp +++ b/packages/cocoaint/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('cocoaint'); {$ifdef ALLPACKAGES} - P.Directory:='cocoaint'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.CPUs:=[i386,x86_64,powerpc,powerpc64]; diff --git a/packages/dblib/fpmake.pp b/packages/dblib/fpmake.pp index 099246557a..35fcd1f912 100644 --- a/packages/dblib/fpmake.pp +++ b/packages/dblib/fpmake.pp @@ -6,7 +6,7 @@ uses fpmkunit; {$endif not ALLPACKAGES} -procedure add_dblib; +procedure add_dblib(const ADirectory: string); Const DBLibOSes = [linux,freebsd,netbsd,openbsd,solaris,win32,win64,haiku,android]; @@ -18,9 +18,7 @@ begin With Installer do begin P:=AddPackage('dblib'); -{$ifdef ALLPACKAGES} - P.Directory:='dblib'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='1.0'; P.Author := 'Library: (FreeTDS/Microsoft), header: Ladislav Karrach'; P.License := 'Library: FreeTDS License, header: LGPL with modification, '; @@ -38,7 +36,7 @@ end; {$ifndef ALLPACKAGES} begin - add_dblib; + add_dblib(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/packages/dbus/fpmake.pp b/packages/dbus/fpmake.pp index 2a0788894b..fb584b6510 100644 --- a/packages/dbus/fpmake.pp +++ b/packages/dbus/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('dbus'); {$ifdef ALLPACKAGES} - P.Directory:='dbus'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/dts/fpmake.pp b/packages/dts/fpmake.pp index 7a1a67b7bd..1f1e2088b8 100644 --- a/packages/dts/fpmake.pp +++ b/packages/dts/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('dts'); {$ifdef ALLPACKAGES} - P.Directory:='dts'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/fastcgi/fpmake.pp b/packages/fastcgi/fpmake.pp index 862fee9ca6..8e6be58d40 100644 --- a/packages/fastcgi/fpmake.pp +++ b/packages/fastcgi/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fastcgi'); {$ifdef ALLPACKAGES} - P.Directory:='fastcgi'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/fcl-async/fpmake.pp b/packages/fcl-async/fpmake.pp index 5286dc28a7..a39b3d3855 100644 --- a/packages/fcl-async/fpmake.pp +++ b/packages/fcl-async/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-async'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-async'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/fcl-base/fpmake.pp b/packages/fcl-base/fpmake.pp index 80e1126389..2804b83dae 100644 --- a/packages/fcl-base/fpmake.pp +++ b/packages/fcl-base/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-base'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-base'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('univint',[Darwin,iPhoneSim]); diff --git a/packages/fcl-db/fpmake.pp b/packages/fcl-db/fpmake.pp index 9f31f0ad17..54e0fcaa74 100644 --- a/packages/fcl-db/fpmake.pp +++ b/packages/fcl-db/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_fcl_db; +procedure add_fcl_db(const ADirectory: string); const ParadoxOSes = [beos,haiku,linux,freebsd,netbsd,openbsd,win32]; @@ -34,9 +34,7 @@ begin P.NeedLibC:= false; P.OSes:=AllOSes-[embedded]; -{$ifdef ALLPACKAGES} - P.Directory:='fcl-db'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.SourcePath.Add('src'); P.SourcePath.Add('src/base'); @@ -774,7 +772,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fcl_db; + add_fcl_db(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/packages/fcl-extra/fpmake.pp b/packages/fcl-extra/fpmake.pp index feebce685b..c8ca6a07dc 100644 --- a/packages/fcl-extra/fpmake.pp +++ b/packages/fcl-extra/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-extra'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-extra'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); diff --git a/packages/fcl-fpcunit/fpmake.pp b/packages/fcl-fpcunit/fpmake.pp index 3ee20af171..d461c742c4 100644 --- a/packages/fcl-fpcunit/fpmake.pp +++ b/packages/fcl-fpcunit/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-fpcunit'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-fpcunit'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('paszlib'); diff --git a/packages/fcl-image/fpmake.pp b/packages/fcl-image/fpmake.pp index 2910008e65..ecd838a0b4 100644 --- a/packages/fcl-image/fpmake.pp +++ b/packages/fcl-image/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-image'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-image'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('pasjpeg'); diff --git a/packages/fcl-js/fpmake.pp b/packages/fcl-js/fpmake.pp index 098f733a56..e40a643d1e 100644 --- a/packages/fcl-js/fpmake.pp +++ b/packages/fcl-js/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-js'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-js'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Michael Van Canneyt'; diff --git a/packages/fcl-json/fpmake.pp b/packages/fcl-json/fpmake.pp index fe16f4dbf6..5a4069bb8d 100644 --- a/packages/fcl-json/fpmake.pp +++ b/packages/fcl-json/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-json'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-json'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); diff --git a/packages/fcl-net/fpmake.pp b/packages/fcl-net/fpmake.pp index cbec39da78..0472e08253 100644 --- a/packages/fcl-net/fpmake.pp +++ b/packages/fcl-net/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-net'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-net'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); diff --git a/packages/fcl-passrc/fpmake.pp b/packages/fcl-passrc/fpmake.pp index 39214f2de4..d7685726a7 100644 --- a/packages/fcl-passrc/fpmake.pp +++ b/packages/fcl-passrc/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-passrc'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-passrc'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); diff --git a/packages/fcl-process/fpmake.pp b/packages/fcl-process/fpmake.pp index 187533aa3a..bcad687af5 100644 --- a/packages/fcl-process/fpmake.pp +++ b/packages/fcl-process/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-process'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-process'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Michael van Canneyt and Free Pascal Development team'; diff --git a/packages/fcl-registry/fpmake.pp b/packages/fcl-registry/fpmake.pp index 19e1a415d3..760bfc27ad 100644 --- a/packages/fcl-registry/fpmake.pp +++ b/packages/fcl-registry/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-registry'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-registry'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); diff --git a/packages/fcl-res/fpmake.pp b/packages/fcl-res/fpmake.pp index 6c4f4d37b9..c9cde6e79a 100644 --- a/packages/fcl-res/fpmake.pp +++ b/packages/fcl-res/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-res'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-res'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Giulio Bernardi'; diff --git a/packages/fcl-sdo/fpmake.pp b/packages/fcl-sdo/fpmake.pp index 0dcaf668ce..d7a6904b68 100644 --- a/packages/fcl-sdo/fpmake.pp +++ b/packages/fcl-sdo/fpmake.pp @@ -13,7 +13,7 @@ begin {$endif ALLPACKAGES} P:=AddPackage('fcl-sdo'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-sdo'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Dependencies.Add('fcl-base'); P.Dependencies.Add('fcl-xml'); diff --git a/packages/fcl-stl/fpmake.pp b/packages/fcl-stl/fpmake.pp index 0df8b2a452..e87ba5c83f 100644 --- a/packages/fcl-stl/fpmake.pp +++ b/packages/fcl-stl/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-stl'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-stl'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/fcl-web/fpmake.pp b/packages/fcl-web/fpmake.pp index e868e87298..025c2676de 100644 --- a/packages/fcl-web/fpmake.pp +++ b/packages/fcl-web/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fcl-web'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-web'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,win32,win64,wince,aix]; diff --git a/packages/fcl-xml/fpmake.pp b/packages/fcl-xml/fpmake.pp index 6646e41cb4..260b5be0a3 100644 --- a/packages/fcl-xml/fpmake.pp +++ b/packages/fcl-xml/fpmake.pp @@ -15,7 +15,7 @@ begin P:=AddPackage('fcl-xml'); {$ifdef ALLPACKAGES} - P.Directory:='fcl-xml'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Options.Add('-S2h'); diff --git a/packages/fftw/fpmake.pp b/packages/fftw/fpmake.pp index dbf573e7ee..4ca4fa802e 100644 --- a/packages/fftw/fpmake.pp +++ b/packages/fftw/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fftw'); {$ifdef ALLPACKAGES} - P.Directory:='fftw'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/fpgtk/fpmake.pp b/packages/fpgtk/fpmake.pp index a855fa6e2e..c29cfbd589 100644 --- a/packages/fpgtk/fpmake.pp +++ b/packages/fpgtk/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fpgtk'); {$ifdef ALLPACKAGES} - P.Directory:='fpgtk'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [beos,haiku,freebsd,solaris,netbsd,openbsd,linux,win32,win64,os2,emx,aix]; diff --git a/packages/fpindexer/fpmake.pp b/packages/fpindexer/fpmake.pp index 04232c8d60..19da7eb903 100644 --- a/packages/fpindexer/fpmake.pp +++ b/packages/fpindexer/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_fpindexer; +procedure add_fpindexer(const ADirectory: string); Const SqldbConnectionOSes = [beos,haiku,linux,freebsd,win32,win64,wince,darwin,iphonesim,netbsd,openbsd,aix]; SqliteOSes = [beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,win32,wince,aix]; @@ -17,9 +17,7 @@ begin With Installer do begin P:=AddPackage('fpindexer'); -{$ifdef ALLPACKAGES} - P.Directory:='fpindexer'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.OSes := [beos,haiku,freebsd,darwin,solaris,netbsd,openbsd,linux,win32,win64,wince,aix]; P.Dependencies.Add('fcl-base'); @@ -71,7 +69,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fpindexer; + add_fpindexer(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/packages/fpmake.pp b/packages/fpmake.pp index d4ce7de7f2..db9022c771 100644 --- a/packages/fpmake.pp +++ b/packages/fpmake.pp @@ -1,5 +1,7 @@ -{$mode objfpc}{$H+} +{$ifndef ALLPACKAGES} {$define allpackages} +{$define no_parent} +{$mode objfpc}{$H+} program fpmake; uses fpmkunit, sysutils, Classes; @@ -10,16 +12,20 @@ Var D : TDependency; I : Integer; +{$endif ALLPACKAGES} + (* The include files are generated with the following commands: -rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do cleanedname=`dirname $file | sed -e 's+-+_+g'` ; if ! `grep -i "^procedure add_$cleanedname" $file >/dev/null` ; then printf 'procedure add_%s;\nbegin\n with Installer do\n{$include %s}\nend;\n\n' $cleanedname $file >> fpmake_proc.inc; else printf '{$include %s}\n\n' $file >> fpmake_proc.inc; fi; echo " add_$cleanedname;" >> fpmake_add.inc; done +rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do cleanedname=`dirname $file | sed -e 's+-+_+g'` ; if ! `grep -i "^procedure add_$cleanedname" $file >/dev/null` ; then printf 'procedure add_%s(const ADirectory: string);\nbegin\n with Installer do\n{$include %s}\nend;\n\n' $cleanedname $file >> fpmake_proc.inc; else printf '{$include %s}\n\n' $file >> fpmake_proc.inc; fi; echo " add_$cleanedname(ADirectory+IncludeTrailingPathDelimiter('$cleanedname'));" >> fpmake_add.inc; done *) {$include fpmake_proc.inc} +procedure add_packages(const ADirectory: string); + begin {$include fpmake_add.inc} @@ -28,6 +34,12 @@ begin // Create fpc-all package PBuild:=AddPackage('fpc-all'); PBuild.Version:='2.7.1'; - Run; end; +end; + +{$ifdef no_parent} +begin + add_packages(''); + Installer.Run; end. +{$endif no_parent} diff --git a/packages/fpmake_add.inc b/packages/fpmake_add.inc index 4d4f4581df..abf548ce45 100644 --- a/packages/fpmake_add.inc +++ b/packages/fpmake_add.inc @@ -1,116 +1,116 @@ - add_a52; - add_amunits; - add_aspell; - add_bfd; - add_bzip2; - add_cairo; - add_cdrom; - add_chm; - add_cocoaint; - add_dblib; - add_dbus; - add_dts; - add_fastcgi; - add_fcl_async; - add_fcl_base; - add_fcl_db; - add_fcl_extra; - add_fcl_fpcunit; - add_fcl_image; - add_fcl_js; - add_fcl_json; - add_fcl_net; - add_fcl_passrc; - add_fcl_process; - add_fcl_registry; - add_fcl_res; - add_fcl_sdo; - add_fcl_stl; - add_fcl_web; - add_fcl_xml; - add_fftw; - add_fpgtk; - add_fpindexer; - add_fpmkunit; - add_fppkg; - add_fv; - add_gdbint; - add_gdbm; - add_ggi; - add_gmp; - add_gnome1; - add_graph; - add_gtk1; - add_gtk2; - add_hash; - add_hermes; - add_httpd13; - add_httpd20; - add_httpd22; - add_httpd24; - add_ibase; - add_iconvenc; - add_imagemagick; - add_imlib; - add_jni; - add_ldap; - add_libc; - add_libcurl; - add_libgbafpc; - add_libgd; - add_libndsfpc; - add_libogcfpc; - add_libpng; - add_librsvg; - add_libsee; - add_libtar; - add_libvlc; - add_libxml; - add_lua; - add_mad; - add_modplug; - add_mysql; - add_ncurses; - add_newt; - add_numlib; - add_nvapi; - add_objcrtl; - add_odbc; - add_oggvorbis; - add_openal; - add_opencl; - add_opengles; - add_opengl; - add_openssl; - add_oracle; - add_os2units; - add_palmunits; - add_pasjpeg; - add_paszlib; - add_pcap; - add_postgres; - add_proj4; - add_ptc; - add_pthreads; - add_pxlib; - add_regexpr; - add_rexx; - add_sdl; - add_sqlite; - add_svgalib; - add_symbolic; - add_syslog; - add_tcl; - add_univint; - add_unixutil; - add_unzip; - add_users; - add_utmp; - add_uuid; - add_winceunits; - add_winunits_base; - add_winunits_jedi; - add_x11; - add_xforms; - add_zlib; - add_zorba; + add_a52(ADirectory+IncludeTrailingPathDelimiter('a52')); + add_amunits(ADirectory+IncludeTrailingPathDelimiter('amunits')); + add_aspell(ADirectory+IncludeTrailingPathDelimiter('aspell')); + add_bfd(ADirectory+IncludeTrailingPathDelimiter('bfd')); + add_bzip2(ADirectory+IncludeTrailingPathDelimiter('bzip2')); + add_cairo(ADirectory+IncludeTrailingPathDelimiter('cairo')); + add_cdrom(ADirectory+IncludeTrailingPathDelimiter('cdrom')); + add_chm(ADirectory+IncludeTrailingPathDelimiter('chm')); + add_cocoaint(ADirectory+IncludeTrailingPathDelimiter('cocoaint')); + add_dblib(ADirectory+IncludeTrailingPathDelimiter('dblib')); + add_dbus(ADirectory+IncludeTrailingPathDelimiter('dbus')); + add_dts(ADirectory+IncludeTrailingPathDelimiter('dts')); + add_fastcgi(ADirectory+IncludeTrailingPathDelimiter('fastcgi')); + add_fcl_async(ADirectory+IncludeTrailingPathDelimiter('fcl-async')); + add_fcl_base(ADirectory+IncludeTrailingPathDelimiter('fcl-base')); + add_fcl_db(ADirectory+IncludeTrailingPathDelimiter('fcl-db')); + add_fcl_extra(ADirectory+IncludeTrailingPathDelimiter('fcl-extra')); + add_fcl_fpcunit(ADirectory+IncludeTrailingPathDelimiter('fcl-fpcunit')); + add_fcl_image(ADirectory+IncludeTrailingPathDelimiter('fcl-image')); + add_fcl_js(ADirectory+IncludeTrailingPathDelimiter('fcl-js')); + add_fcl_json(ADirectory+IncludeTrailingPathDelimiter('fcl-json')); + add_fcl_net(ADirectory+IncludeTrailingPathDelimiter('fcl-net')); + add_fcl_passrc(ADirectory+IncludeTrailingPathDelimiter('fcl-passrc')); + add_fcl_process(ADirectory+IncludeTrailingPathDelimiter('fcl-process')); + add_fcl_registry(ADirectory+IncludeTrailingPathDelimiter('fcl-registry')); + add_fcl_res(ADirectory+IncludeTrailingPathDelimiter('fcl-res')); + add_fcl_sdo(ADirectory+IncludeTrailingPathDelimiter('fcl-sdo')); + add_fcl_stl(ADirectory+IncludeTrailingPathDelimiter('fcl-stl')); + add_fcl_web(ADirectory+IncludeTrailingPathDelimiter('fcl-web')); + add_fcl_xml(ADirectory+IncludeTrailingPathDelimiter('fcl-xml')); + add_fftw(ADirectory+IncludeTrailingPathDelimiter('fftw')); + add_fpgtk(ADirectory+IncludeTrailingPathDelimiter('fpgtk')); + add_fpindexer(ADirectory+IncludeTrailingPathDelimiter('fpindexer')); + add_fpmkunit(ADirectory+IncludeTrailingPathDelimiter('fpmkunit')); + add_fppkg(ADirectory+IncludeTrailingPathDelimiter('fppkg')); + add_fv(ADirectory+IncludeTrailingPathDelimiter('fv')); + add_gdbint(ADirectory+IncludeTrailingPathDelimiter('gdbint')); + add_gdbm(ADirectory+IncludeTrailingPathDelimiter('gdbm')); + add_ggi(ADirectory+IncludeTrailingPathDelimiter('ggi')); + add_gmp(ADirectory+IncludeTrailingPathDelimiter('gmp')); + add_gnome1(ADirectory+IncludeTrailingPathDelimiter('gnome1')); + add_graph(ADirectory+IncludeTrailingPathDelimiter('graph')); + add_gtk1(ADirectory+IncludeTrailingPathDelimiter('gtk1')); + add_gtk2(ADirectory+IncludeTrailingPathDelimiter('gtk2')); + add_hash(ADirectory+IncludeTrailingPathDelimiter('hash')); + add_hermes(ADirectory+IncludeTrailingPathDelimiter('hermes')); + add_httpd13(ADirectory+IncludeTrailingPathDelimiter('httpd13')); + add_httpd20(ADirectory+IncludeTrailingPathDelimiter('httpd20')); + add_httpd22(ADirectory+IncludeTrailingPathDelimiter('httpd22')); + add_httpd24(ADirectory+IncludeTrailingPathDelimiter('httpd24')); + add_ibase(ADirectory+IncludeTrailingPathDelimiter('ibase')); + add_iconvenc(ADirectory+IncludeTrailingPathDelimiter('iconvenc')); + add_imagemagick(ADirectory+IncludeTrailingPathDelimiter('imagemagick')); + add_imlib(ADirectory+IncludeTrailingPathDelimiter('imlib')); + add_jni(ADirectory+IncludeTrailingPathDelimiter('jni')); + add_ldap(ADirectory+IncludeTrailingPathDelimiter('ldap')); + add_libc(ADirectory+IncludeTrailingPathDelimiter('libc')); + add_libcurl(ADirectory+IncludeTrailingPathDelimiter('libcurl')); + add_libgbafpc(ADirectory+IncludeTrailingPathDelimiter('libgbafpc')); + add_libgd(ADirectory+IncludeTrailingPathDelimiter('libgd')); + add_libndsfpc(ADirectory+IncludeTrailingPathDelimiter('libndsfpc')); + add_libogcfpc(ADirectory+IncludeTrailingPathDelimiter('libogcfpc')); + add_libpng(ADirectory+IncludeTrailingPathDelimiter('libpng')); + add_librsvg(ADirectory+IncludeTrailingPathDelimiter('librsvg')); + add_libsee(ADirectory+IncludeTrailingPathDelimiter('libsee')); + add_libtar(ADirectory+IncludeTrailingPathDelimiter('libtar')); + add_libvlc(ADirectory+IncludeTrailingPathDelimiter('libvlc')); + add_libxml(ADirectory+IncludeTrailingPathDelimiter('libxml')); + add_lua(ADirectory+IncludeTrailingPathDelimiter('lua')); + add_mad(ADirectory+IncludeTrailingPathDelimiter('mad')); + add_modplug(ADirectory+IncludeTrailingPathDelimiter('modplug')); + add_mysql(ADirectory+IncludeTrailingPathDelimiter('mysql')); + add_ncurses(ADirectory+IncludeTrailingPathDelimiter('ncurses')); + add_newt(ADirectory+IncludeTrailingPathDelimiter('newt')); + add_numlib(ADirectory+IncludeTrailingPathDelimiter('numlib')); + add_nvapi(ADirectory+IncludeTrailingPathDelimiter('nvapi')); + add_objcrtl(ADirectory+IncludeTrailingPathDelimiter('objcrtl')); + add_odbc(ADirectory+IncludeTrailingPathDelimiter('odbc')); + add_oggvorbis(ADirectory+IncludeTrailingPathDelimiter('oggvorbis')); + add_openal(ADirectory+IncludeTrailingPathDelimiter('openal')); + add_opencl(ADirectory+IncludeTrailingPathDelimiter('opencl')); + add_opengl(ADirectory+IncludeTrailingPathDelimiter('opengl')); + add_opengles(ADirectory+IncludeTrailingPathDelimiter('opengles')); + add_openssl(ADirectory+IncludeTrailingPathDelimiter('openssl')); + add_oracle(ADirectory+IncludeTrailingPathDelimiter('oracle')); + add_os2units(ADirectory+IncludeTrailingPathDelimiter('os2units')); + add_palmunits(ADirectory+IncludeTrailingPathDelimiter('palmunits')); + add_pasjpeg(ADirectory+IncludeTrailingPathDelimiter('pasjpeg')); + add_paszlib(ADirectory+IncludeTrailingPathDelimiter('paszlib')); + add_pcap(ADirectory+IncludeTrailingPathDelimiter('pcap')); + add_postgres(ADirectory+IncludeTrailingPathDelimiter('postgres')); + add_proj4(ADirectory+IncludeTrailingPathDelimiter('proj4')); + add_ptc(ADirectory+IncludeTrailingPathDelimiter('ptc')); + add_pthreads(ADirectory+IncludeTrailingPathDelimiter('pthreads')); + add_pxlib(ADirectory+IncludeTrailingPathDelimiter('pxlib')); + add_regexpr(ADirectory+IncludeTrailingPathDelimiter('regexpr')); + add_rexx(ADirectory+IncludeTrailingPathDelimiter('rexx')); + add_sdl(ADirectory+IncludeTrailingPathDelimiter('sdl')); + add_sqlite(ADirectory+IncludeTrailingPathDelimiter('sqlite')); + add_svgalib(ADirectory+IncludeTrailingPathDelimiter('svgalib')); + add_symbolic(ADirectory+IncludeTrailingPathDelimiter('symbolic')); + add_syslog(ADirectory+IncludeTrailingPathDelimiter('syslog')); + add_tcl(ADirectory+IncludeTrailingPathDelimiter('tcl')); + add_univint(ADirectory+IncludeTrailingPathDelimiter('univint')); + add_unixutil(ADirectory+IncludeTrailingPathDelimiter('unixutil')); + add_unzip(ADirectory+IncludeTrailingPathDelimiter('unzip')); + add_users(ADirectory+IncludeTrailingPathDelimiter('users')); + add_utmp(ADirectory+IncludeTrailingPathDelimiter('utmp')); + add_uuid(ADirectory+IncludeTrailingPathDelimiter('uuid')); + add_winceunits(ADirectory+IncludeTrailingPathDelimiter('winceunits')); + add_winunits_base(ADirectory+IncludeTrailingPathDelimiter('winunits_base')); + add_winunits_jedi(ADirectory+IncludeTrailingPathDelimiter('winunits_jedi')); + add_x11(ADirectory+IncludeTrailingPathDelimiter('x11')); + add_xforms(ADirectory+IncludeTrailingPathDelimiter('xforms')); + add_zlib(ADirectory+IncludeTrailingPathDelimiter('zlib')); + add_zorba(ADirectory+IncludeTrailingPathDelimiter('zorba')); diff --git a/packages/fpmake_proc.inc b/packages/fpmake_proc.inc index 3d5f9af778..761163e9d7 100644 --- a/packages/fpmake_proc.inc +++ b/packages/fpmake_proc.inc @@ -1,52 +1,52 @@ -procedure add_a52; +procedure add_a52(const ADirectory: string); begin with Installer do {$include a52/fpmake.pp} end; -procedure add_amunits; +procedure add_amunits(const ADirectory: string); begin with Installer do {$include amunits/fpmake.pp} end; -procedure add_aspell; +procedure add_aspell(const ADirectory: string); begin with Installer do {$include aspell/fpmake.pp} end; -procedure add_bfd; +procedure add_bfd(const ADirectory: string); begin with Installer do {$include bfd/fpmake.pp} end; -procedure add_bzip2; +procedure add_bzip2(const ADirectory: string); begin with Installer do {$include bzip2/fpmake.pp} end; -procedure add_cairo; +procedure add_cairo(const ADirectory: string); begin with Installer do {$include cairo/fpmake.pp} end; -procedure add_cdrom; +procedure add_cdrom(const ADirectory: string); begin with Installer do {$include cdrom/fpmake.pp} end; -procedure add_chm; +procedure add_chm(const ADirectory: string); begin with Installer do {$include chm/fpmake.pp} end; -procedure add_cocoaint; +procedure add_cocoaint(const ADirectory: string); begin with Installer do {$include cocoaint/fpmake.pp} @@ -54,31 +54,31 @@ end; {$include dblib/fpmake.pp} -procedure add_dbus; +procedure add_dbus(const ADirectory: string); begin with Installer do {$include dbus/fpmake.pp} end; -procedure add_dts; +procedure add_dts(const ADirectory: string); begin with Installer do {$include dts/fpmake.pp} end; -procedure add_fastcgi; +procedure add_fastcgi(const ADirectory: string); begin with Installer do {$include fastcgi/fpmake.pp} end; -procedure add_fcl_async; +procedure add_fcl_async(const ADirectory: string); begin with Installer do {$include fcl-async/fpmake.pp} end; -procedure add_fcl_base; +procedure add_fcl_base(const ADirectory: string); begin with Installer do {$include fcl-base/fpmake.pp} @@ -86,97 +86,97 @@ end; {$include fcl-db/fpmake.pp} -procedure add_fcl_extra; +procedure add_fcl_extra(const ADirectory: string); begin with Installer do {$include fcl-extra/fpmake.pp} end; -procedure add_fcl_fpcunit; +procedure add_fcl_fpcunit(const ADirectory: string); begin with Installer do {$include fcl-fpcunit/fpmake.pp} end; -procedure add_fcl_image; +procedure add_fcl_image(const ADirectory: string); begin with Installer do {$include fcl-image/fpmake.pp} end; -procedure add_fcl_js; +procedure add_fcl_js(const ADirectory: string); begin with Installer do {$include fcl-js/fpmake.pp} end; -procedure add_fcl_json; +procedure add_fcl_json(const ADirectory: string); begin with Installer do {$include fcl-json/fpmake.pp} end; -procedure add_fcl_net; +procedure add_fcl_net(const ADirectory: string); begin with Installer do {$include fcl-net/fpmake.pp} end; -procedure add_fcl_passrc; +procedure add_fcl_passrc(const ADirectory: string); begin with Installer do {$include fcl-passrc/fpmake.pp} end; -procedure add_fcl_process; +procedure add_fcl_process(const ADirectory: string); begin with Installer do {$include fcl-process/fpmake.pp} end; -procedure add_fcl_registry; +procedure add_fcl_registry(const ADirectory: string); begin with Installer do {$include fcl-registry/fpmake.pp} end; -procedure add_fcl_res; +procedure add_fcl_res(const ADirectory: string); begin with Installer do {$include fcl-res/fpmake.pp} end; -procedure add_fcl_sdo; +procedure add_fcl_sdo(const ADirectory: string); begin with Installer do {$include fcl-sdo/fpmake.pp} end; -procedure add_fcl_stl; +procedure add_fcl_stl(const ADirectory: string); begin with Installer do {$include fcl-stl/fpmake.pp} end; -procedure add_fcl_web; +procedure add_fcl_web(const ADirectory: string); begin with Installer do {$include fcl-web/fpmake.pp} end; -procedure add_fcl_xml; +procedure add_fcl_xml(const ADirectory: string); begin with Installer do {$include fcl-xml/fpmake.pp} end; -procedure add_fftw; +procedure add_fftw(const ADirectory: string); begin with Installer do {$include fftw/fpmake.pp} end; -procedure add_fpgtk; +procedure add_fpgtk(const ADirectory: string); begin with Installer do {$include fpgtk/fpmake.pp} @@ -184,7 +184,7 @@ end; {$include fpindexer/fpmake.pp} -procedure add_fpmkunit; +procedure add_fpmkunit(const ADirectory: string); begin with Installer do {$include fpmkunit/fpmake.pp} @@ -192,7 +192,7 @@ end; {$include fppkg/fpmake.pp} -procedure add_fv; +procedure add_fv(const ADirectory: string); begin with Installer do {$include fv/fpmake.pp} @@ -200,475 +200,475 @@ end; {$include gdbint/fpmake.pp} -procedure add_gdbm; +procedure add_gdbm(const ADirectory: string); begin with Installer do {$include gdbm/fpmake.pp} end; -procedure add_ggi; +procedure add_ggi(const ADirectory: string); begin with Installer do {$include ggi/fpmake.pp} end; -procedure add_gmp; +procedure add_gmp(const ADirectory: string); begin with Installer do {$include gmp/fpmake.pp} end; -procedure add_gnome1; +procedure add_gnome1(const ADirectory: string); begin with Installer do {$include gnome1/fpmake.pp} end; -procedure add_graph; +procedure add_graph(const ADirectory: string); begin with Installer do {$include graph/fpmake.pp} end; -procedure add_gtk1; +procedure add_gtk1(const ADirectory: string); begin with Installer do {$include gtk1/fpmake.pp} end; -procedure add_gtk2; +procedure add_gtk2(const ADirectory: string); begin with Installer do {$include gtk2/fpmake.pp} end; -procedure add_hash; +procedure add_hash(const ADirectory: string); begin with Installer do {$include hash/fpmake.pp} end; -procedure add_hermes; +procedure add_hermes(const ADirectory: string); begin with Installer do {$include hermes/fpmake.pp} end; -procedure add_httpd13; +procedure add_httpd13(const ADirectory: string); begin with Installer do {$include httpd13/fpmake.pp} end; -procedure add_httpd20; +procedure add_httpd20(const ADirectory: string); begin with Installer do {$include httpd20/fpmake.pp} end; -procedure add_httpd22; +procedure add_httpd22(const ADirectory: string); begin with Installer do {$include httpd22/fpmake.pp} end; -procedure add_httpd24; +procedure add_httpd24(const ADirectory: string); begin with Installer do {$include httpd24/fpmake.pp} end; -procedure add_ibase; +procedure add_ibase(const ADirectory: string); begin with Installer do {$include ibase/fpmake.pp} end; -procedure add_iconvenc; +procedure add_iconvenc(const ADirectory: string); begin with Installer do {$include iconvenc/fpmake.pp} end; -procedure add_imagemagick; +procedure add_imagemagick(const ADirectory: string); begin with Installer do {$include imagemagick/fpmake.pp} end; -procedure add_imlib; +procedure add_imlib(const ADirectory: string); begin with Installer do {$include imlib/fpmake.pp} end; -procedure add_jni; +procedure add_jni(const ADirectory: string); begin with Installer do {$include jni/fpmake.pp} end; -procedure add_ldap; +procedure add_ldap(const ADirectory: string); begin with Installer do {$include ldap/fpmake.pp} end; -procedure add_libc; +procedure add_libc(const ADirectory: string); begin with Installer do {$include libc/fpmake.pp} end; -procedure add_libcurl; +procedure add_libcurl(const ADirectory: string); begin with Installer do {$include libcurl/fpmake.pp} end; -procedure add_libgbafpc; +procedure add_libgbafpc(const ADirectory: string); begin with Installer do {$include libgbafpc/fpmake.pp} end; -procedure add_libgd; +procedure add_libgd(const ADirectory: string); begin with Installer do {$include libgd/fpmake.pp} end; -procedure add_libndsfpc; +procedure add_libndsfpc(const ADirectory: string); begin with Installer do {$include libndsfpc/fpmake.pp} end; -procedure add_libogcfpc; +procedure add_libogcfpc(const ADirectory: string); begin with Installer do {$include libogcfpc/fpmake.pp} end; -procedure add_libpng; +procedure add_libpng(const ADirectory: string); begin with Installer do {$include libpng/fpmake.pp} end; -procedure add_librsvg; +procedure add_librsvg(const ADirectory: string); begin with Installer do {$include librsvg/fpmake.pp} end; -procedure add_libsee; +procedure add_libsee(const ADirectory: string); begin with Installer do {$include libsee/fpmake.pp} end; -procedure add_libtar; +procedure add_libtar(const ADirectory: string); begin with Installer do {$include libtar/fpmake.pp} end; -procedure add_libvlc; +procedure add_libvlc(const ADirectory: string); begin with Installer do {$include libvlc/fpmake.pp} end; -procedure add_libxml; +procedure add_libxml(const ADirectory: string); begin with Installer do {$include libxml/fpmake.pp} end; -procedure add_lua; +procedure add_lua(const ADirectory: string); begin with Installer do {$include lua/fpmake.pp} end; -procedure add_mad; +procedure add_mad(const ADirectory: string); begin with Installer do {$include mad/fpmake.pp} end; -procedure add_modplug; +procedure add_modplug(const ADirectory: string); begin with Installer do {$include modplug/fpmake.pp} end; -procedure add_mysql; +procedure add_mysql(const ADirectory: string); begin with Installer do {$include mysql/fpmake.pp} end; -procedure add_ncurses; +procedure add_ncurses(const ADirectory: string); begin with Installer do {$include ncurses/fpmake.pp} end; -procedure add_newt; +procedure add_newt(const ADirectory: string); begin with Installer do {$include newt/fpmake.pp} end; -procedure add_numlib; +procedure add_numlib(const ADirectory: string); begin with Installer do {$include numlib/fpmake.pp} end; -procedure add_nvapi; +procedure add_nvapi(const ADirectory: string); begin with Installer do {$include nvapi/fpmake.pp} end; -procedure add_objcrtl; +procedure add_objcrtl(const ADirectory: string); begin with Installer do {$include objcrtl/fpmake.pp} end; -procedure add_odbc; +procedure add_odbc(const ADirectory: string); begin with Installer do {$include odbc/fpmake.pp} end; -procedure add_oggvorbis; +procedure add_oggvorbis(const ADirectory: string); begin with Installer do {$include oggvorbis/fpmake.pp} end; -procedure add_openal; +procedure add_openal(const ADirectory: string); begin with Installer do {$include openal/fpmake.pp} end; -procedure add_opencl; +procedure add_opencl(const ADirectory: string); begin with Installer do {$include opencl/fpmake.pp} end; -procedure add_opengles; -begin - with Installer do -{$include opengles/fpmake.pp} -end; - -procedure add_opengl; +procedure add_opengl(const ADirectory: string); begin with Installer do {$include opengl/fpmake.pp} end; -procedure add_openssl; +procedure add_opengles(const ADirectory: string); +begin + with Installer do +{$include opengles/fpmake.pp} +end; + +procedure add_openssl(const ADirectory: string); begin with Installer do {$include openssl/fpmake.pp} end; -procedure add_oracle; +procedure add_oracle(const ADirectory: string); begin with Installer do {$include oracle/fpmake.pp} end; -procedure add_os2units; +procedure add_os2units(const ADirectory: string); begin with Installer do {$include os2units/fpmake.pp} end; -procedure add_palmunits; +procedure add_palmunits(const ADirectory: string); begin with Installer do {$include palmunits/fpmake.pp} end; -procedure add_pasjpeg; +procedure add_pasjpeg(const ADirectory: string); begin with Installer do {$include pasjpeg/fpmake.pp} end; -procedure add_paszlib; +procedure add_paszlib(const ADirectory: string); begin with Installer do {$include paszlib/fpmake.pp} end; -procedure add_pcap; +procedure add_pcap(const ADirectory: string); begin with Installer do {$include pcap/fpmake.pp} end; -procedure add_postgres; +procedure add_postgres(const ADirectory: string); begin with Installer do {$include postgres/fpmake.pp} end; -procedure add_proj4; +procedure add_proj4(const ADirectory: string); begin with Installer do {$include proj4/fpmake.pp} end; -procedure add_ptc; +procedure add_ptc(const ADirectory: string); begin with Installer do {$include ptc/fpmake.pp} end; -procedure add_pthreads; +procedure add_pthreads(const ADirectory: string); begin with Installer do {$include pthreads/fpmake.pp} end; -procedure add_pxlib; +procedure add_pxlib(const ADirectory: string); begin with Installer do {$include pxlib/fpmake.pp} end; -procedure add_regexpr; +procedure add_regexpr(const ADirectory: string); begin with Installer do {$include regexpr/fpmake.pp} end; -procedure add_rexx; +procedure add_rexx(const ADirectory: string); begin with Installer do {$include rexx/fpmake.pp} end; -procedure add_sdl; +procedure add_sdl(const ADirectory: string); begin with Installer do {$include sdl/fpmake.pp} end; -procedure add_sqlite; +procedure add_sqlite(const ADirectory: string); begin with Installer do {$include sqlite/fpmake.pp} end; -procedure add_svgalib; +procedure add_svgalib(const ADirectory: string); begin with Installer do {$include svgalib/fpmake.pp} end; -procedure add_symbolic; +procedure add_symbolic(const ADirectory: string); begin with Installer do {$include symbolic/fpmake.pp} end; -procedure add_syslog; +procedure add_syslog(const ADirectory: string); begin with Installer do {$include syslog/fpmake.pp} end; -procedure add_tcl; +procedure add_tcl(const ADirectory: string); begin with Installer do {$include tcl/fpmake.pp} end; -procedure add_univint; +procedure add_univint(const ADirectory: string); begin with Installer do {$include univint/fpmake.pp} end; -procedure add_unixutil; +procedure add_unixutil(const ADirectory: string); begin with Installer do {$include unixutil/fpmake.pp} end; -procedure add_unzip; +procedure add_unzip(const ADirectory: string); begin with Installer do {$include unzip/fpmake.pp} end; -procedure add_users; +procedure add_users(const ADirectory: string); begin with Installer do {$include users/fpmake.pp} end; -procedure add_utmp; +procedure add_utmp(const ADirectory: string); begin with Installer do {$include utmp/fpmake.pp} end; -procedure add_uuid; +procedure add_uuid(const ADirectory: string); begin with Installer do {$include uuid/fpmake.pp} end; -procedure add_winceunits; +procedure add_winceunits(const ADirectory: string); begin with Installer do {$include winceunits/fpmake.pp} end; -procedure add_winunits_base; +procedure add_winunits_base(const ADirectory: string); begin with Installer do {$include winunits-base/fpmake.pp} end; -procedure add_winunits_jedi; +procedure add_winunits_jedi(const ADirectory: string); begin with Installer do {$include winunits-jedi/fpmake.pp} end; -procedure add_x11; +procedure add_x11(const ADirectory: string); begin with Installer do {$include x11/fpmake.pp} end; -procedure add_xforms; +procedure add_xforms(const ADirectory: string); begin with Installer do {$include xforms/fpmake.pp} end; -procedure add_zlib; +procedure add_zlib(const ADirectory: string); begin with Installer do {$include zlib/fpmake.pp} end; -procedure add_zorba; +procedure add_zorba(const ADirectory: string); begin with Installer do {$include zorba/fpmake.pp} diff --git a/packages/fpmkunit/fpmake.pp b/packages/fpmkunit/fpmake.pp index a9394a4832..409b5c360e 100644 --- a/packages/fpmkunit/fpmake.pp +++ b/packages/fpmkunit/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fpmkunit'); {$ifdef ALLPACKAGES} - P.Directory:='fpmkunit'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Description:='Free Pascal Make Tool'; diff --git a/packages/fppkg/fpmake.pp b/packages/fppkg/fpmake.pp index 2ed526803e..9b572a280e 100644 --- a/packages/fppkg/fpmake.pp +++ b/packages/fppkg/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit, sysutils; {$endif ALLPACKAGES} -procedure add_fppkg; +procedure add_fppkg(const ADirectory: string); const TargetsWithWGet = [linux,beos,haiku,freebsd,netbsd,openbsd,darwin,iphonesim,solaris,win32,win64,wince,aix]; @@ -23,9 +23,7 @@ begin begin P:=AddPackage('fppkg'); -{$ifdef ALLPACKAGES} - P.Directory:='fppkg'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); @@ -91,7 +89,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fppkg; + add_fppkg(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/packages/fv/fpmake.pp b/packages/fv/fpmake.pp index 0dd8d85b2b..4486bf618c 100644 --- a/packages/fv/fpmake.pp +++ b/packages/fv/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('fv'); {$ifdef ALLPACKAGES} - P.Directory:='fv'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Leon De Boer and Pierre Mueller'; diff --git a/packages/gdbint/fpmake.pp b/packages/gdbint/fpmake.pp index 4eb66d8b16..7270a8f6cc 100644 --- a/packages/gdbint/fpmake.pp +++ b/packages/gdbint/fpmake.pp @@ -133,7 +133,7 @@ begin end; end; -procedure add_gdbint; +procedure add_gdbint(const ADirectory: string); Var P : TPackage; @@ -142,9 +142,7 @@ begin With Installer do begin P:=AddPackage('gdbint'); -{$ifdef ALLPACKAGES} - P.Directory:='gdbint'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Author := 'Library : Cygnus, header: Peter Vreman'; P.License := 'Library: GPL2 or later, header: LGPL with modification, '; @@ -187,7 +185,7 @@ end; {$ifndef ALLPACKAGES} begin - add_gdbint; + add_gdbint(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/packages/gdbm/fpmake.pp b/packages/gdbm/fpmake.pp index 89337eea7d..33d842cfd4 100644 --- a/packages/gdbm/fpmake.pp +++ b/packages/gdbm/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('gdbm'); {$ifdef ALLPACKAGES} - P.Directory:='gdbm'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: GNU, header: Michael van Canneyt'; diff --git a/packages/ggi/fpmake.pp b/packages/ggi/fpmake.pp index ceffae7e4b..736a68592b 100644 --- a/packages/ggi/fpmake.pp +++ b/packages/ggi/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('ggi'); {$ifdef ALLPACKAGES} - P.Directory:='ggi'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: ?, header: Sebastian Guenther'; diff --git a/packages/gmp/fpmake.pp b/packages/gmp/fpmake.pp index 87763befa0..c1f7825e09 100644 --- a/packages/gmp/fpmake.pp +++ b/packages/gmp/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('gmp'); {$ifdef ALLPACKAGES} - P.Directory:='gmp'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/gnome1/fpmake.pp b/packages/gnome1/fpmake.pp index 125cd2beec..9d1d24948d 100644 --- a/packages/gnome1/fpmake.pp +++ b/packages/gnome1/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('gnome1'); {$ifdef ALLPACKAGES} - P.Directory:='gnome1'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=AllUnixOSes-[darwin,iphonesim,Android]; diff --git a/packages/graph/fpmake.pp b/packages/graph/fpmake.pp index a426bdd18e..a3d9009e36 100644 --- a/packages/graph/fpmake.pp +++ b/packages/graph/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('graph'); {$ifdef ALLPACKAGES} - P.Directory:='graph'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'FPC team'; diff --git a/packages/gtk1/fpmake.pp b/packages/gtk1/fpmake.pp index a9d8bb74ba..3a93284f2e 100644 --- a/packages/gtk1/fpmake.pp +++ b/packages/gtk1/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('gtk1'); {$ifdef ALLPACKAGES} - P.Directory:='gtk1'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: Peter Mattis, Spencer Kimball and Josh MacDonald, header: Peter Vreman'; diff --git a/packages/gtk2/fpmake.pp b/packages/gtk2/fpmake.pp index c375ce7951..e694b9ef9c 100644 --- a/packages/gtk2/fpmake.pp +++ b/packages/gtk2/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('gtk2'); {$ifdef ALLPACKAGES} - P.Directory:='gtk2'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SupportBuildModes := [bmOneByOne]; diff --git a/packages/hash/fpmake.pp b/packages/hash/fpmake.pp index 4e1bb2a781..d7ac911cca 100644 --- a/packages/hash/fpmake.pp +++ b/packages/hash/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('hash'); {$ifdef ALLPACKAGES} - P.Directory:='hash'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Author := 'Free Pascal development team, Mark Adler, Jacques Nomssi Nzali'; diff --git a/packages/hermes/fpmake.pp b/packages/hermes/fpmake.pp index a310b3d607..f77aa0ce50 100644 --- a/packages/hermes/fpmake.pp +++ b/packages/hermes/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('hermes'); {$ifdef ALLPACKAGES} - P.Directory:='hermes'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/httpd13/fpmake.pp b/packages/httpd13/fpmake.pp index 75f1295cef..8285b232cf 100644 --- a/packages/httpd13/fpmake.pp +++ b/packages/httpd13/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('httpd13'); {$ifdef ALLPACKAGES} - P.Directory:='httpd13'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: Apache Foundation, header: Felipe Monteiro de Carvalho'; diff --git a/packages/httpd20/fpmake.pp b/packages/httpd20/fpmake.pp index 09f6f5c2b0..debce277d4 100644 --- a/packages/httpd20/fpmake.pp +++ b/packages/httpd20/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('httpd20'); {$ifdef ALLPACKAGES} - P.Directory:='httpd20'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: Apache Foundation, header: Felipe Monteiro de Carvalho'; diff --git a/packages/httpd22/fpmake.pp b/packages/httpd22/fpmake.pp index 518ed88024..2a68a3eb3e 100644 --- a/packages/httpd22/fpmake.pp +++ b/packages/httpd22/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('httpd22'); {$ifdef ALLPACKAGES} - P.Directory:='httpd22'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: Apache Foundation, header: Felipe Monteiro de Carvalho'; diff --git a/packages/httpd24/fpmake.pp b/packages/httpd24/fpmake.pp index 89b187b681..52283e498d 100644 --- a/packages/httpd24/fpmake.pp +++ b/packages/httpd24/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('httpd24'); {$ifdef ALLPACKAGES} - P.Directory:='httpd24'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: Apache Foundation, header: Felipe Monteiro de Carvalho'; diff --git a/packages/ibase/fpmake.pp b/packages/ibase/fpmake.pp index 3c776a084f..1b1983c54a 100644 --- a/packages/ibase/fpmake.pp +++ b/packages/ibase/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('ibase'); {$ifdef ALLPACKAGES} - P.Directory:='ibase'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: (Codegear?), header: ?'; diff --git a/packages/iconvenc/fpmake.pp b/packages/iconvenc/fpmake.pp index dc55f38336..fe8a95b951 100644 --- a/packages/iconvenc/fpmake.pp +++ b/packages/iconvenc/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('iconvenc'); {$ifdef ALLPACKAGES} - P.Directory:='iconvenc'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Marco van de Voort'; diff --git a/packages/imagemagick/fpmake.pp b/packages/imagemagick/fpmake.pp index 34761345de..06ae6eb056 100644 --- a/packages/imagemagick/fpmake.pp +++ b/packages/imagemagick/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('imagemagick'); {$ifdef ALLPACKAGES} - P.Directory:='imagemagick'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/imlib/fpmake.pp b/packages/imlib/fpmake.pp index ad57eec7b6..476ad0501a 100644 --- a/packages/imlib/fpmake.pp +++ b/packages/imlib/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('imlib'); {$ifdef ALLPACKAGES} - P.Directory:='imlib'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/jni/fpmake.pp b/packages/jni/fpmake.pp index 7e91924758..cab09cd2f1 100644 --- a/packages/jni/fpmake.pp +++ b/packages/jni/fpmake.pp @@ -15,7 +15,7 @@ begin P:=AddPackage('jni'); {$ifdef ALLPACKAGES} - P.Directory:='jni'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/ldap/fpmake.pp b/packages/ldap/fpmake.pp index 9089ca633b..a85ed1ad75 100644 --- a/packages/ldap/fpmake.pp +++ b/packages/ldap/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('ldap'); {$ifdef ALLPACKAGES} - P.Directory:='ldap'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: Howard Chu, Pierangelo Masarati and Kurt Zeilenga, header: Ivo Steinmann'; diff --git a/packages/libc/fpmake.pp b/packages/libc/fpmake.pp index 02e998fac4..be8387f287 100644 --- a/packages/libc/fpmake.pp +++ b/packages/libc/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('libc'); {$ifdef ALLPACKAGES} - P.Directory:='libc'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/libcurl/fpmake.pp b/packages/libcurl/fpmake.pp index ce4b99b4a3..fac9026bcc 100644 --- a/packages/libcurl/fpmake.pp +++ b/packages/libcurl/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('libcurl'); {$ifdef ALLPACKAGES} - P.Directory:='libcurl'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/libgbafpc/fpmake.pp b/packages/libgbafpc/fpmake.pp index 5bb035b3de..49fa01f98e 100644 --- a/packages/libgbafpc/fpmake.pp +++ b/packages/libgbafpc/fpmake.pp @@ -16,7 +16,7 @@ begin P.OSes:=[gba]; P.CPUs:=[arm]; {$ifdef ALLPACKAGES} - P.Directory:='libgbafpc'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: libgba and maxmod from devkitARM; headers: Francesco Lombardi'; diff --git a/packages/libgd/fpmake.pp b/packages/libgd/fpmake.pp index ad75e77d98..580bc2b29d 100644 --- a/packages/libgd/fpmake.pp +++ b/packages/libgd/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('libgd'); {$ifdef ALLPACKAGES} - P.Directory:='libgd'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/libndsfpc/fpmake.pp b/packages/libndsfpc/fpmake.pp index b031e7b38e..acc0e85a43 100644 --- a/packages/libndsfpc/fpmake.pp +++ b/packages/libndsfpc/fpmake.pp @@ -16,7 +16,7 @@ begin P.OSes:=[nds]; P.CPUs:=[arm]; {$ifdef ALLPACKAGES} - P.Directory:='libndsfpc'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Library: libnds, dswifi, maxmod and gl2d from devkitARM; headers: Francesco Lombardi'; diff --git a/packages/libogcfpc/fpmake.pp b/packages/libogcfpc/fpmake.pp index ae1479a103..1dce6cab16 100644 --- a/packages/libogcfpc/fpmake.pp +++ b/packages/libogcfpc/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('libogcfpc'); {$ifdef ALLPACKAGES} - P.Directory:='libogcfpc'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/libpng/fpmake.pp b/packages/libpng/fpmake.pp index 7111ff3837..f80682bc25 100644 --- a/packages/libpng/fpmake.pp +++ b/packages/libpng/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('libpng'); {$ifdef ALLPACKAGES} - P.Directory:='libpng'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('zlib'); diff --git a/packages/librsvg/fpmake.pp b/packages/librsvg/fpmake.pp index 04b99005ca..27e80ee7d6 100644 --- a/packages/librsvg/fpmake.pp +++ b/packages/librsvg/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('rsvg'); {$ifdef ALLPACKAGES} - P.Directory:='librsvg'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.OSes := [beos,haiku,freebsd,netbsd,openbsd,linux,win32,aix]; // Do not build x11 on iPhone (=arm-darwin) diff --git a/packages/libsee/fpmake.pp b/packages/libsee/fpmake.pp index e3b052acdc..de9c230e01 100644 --- a/packages/libsee/fpmake.pp +++ b/packages/libsee/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('libsee'); {$ifdef ALLPACKAGES} - P.Directory:='libsee'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'David Leonard'; diff --git a/packages/libtar/fpmake.pp b/packages/libtar/fpmake.pp index f6556773ac..24252a7dec 100644 --- a/packages/libtar/fpmake.pp +++ b/packages/libtar/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('libtar'); {$ifdef ALLPACKAGES} - P.Directory:='libtar'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/libvlc/fpmake.pp b/packages/libvlc/fpmake.pp index 23cebac4be..37d112e57c 100644 --- a/packages/libvlc/fpmake.pp +++ b/packages/libvlc/fpmake.pp @@ -13,7 +13,7 @@ begin {$endif ALLPACKAGES} P:=AddPackage('libvlc'); {$ifdef ALLPACKAGES} - P.Directory:='libvlc'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.OSes := [win32, win64, linux, freebsd]; P.Dependencies.Add('fcl-base'); diff --git a/packages/libxml/fpmake.pp b/packages/libxml/fpmake.pp index 421b71102a..9b29d60406 100644 --- a/packages/libxml/fpmake.pp +++ b/packages/libxml/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('libxml2'); {$ifdef ALLPACKAGES} - P.Directory:='libxml'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [freebsd,linux,win32]; diff --git a/packages/lua/fpmake.pp b/packages/lua/fpmake.pp index 8c3a8d8dc7..16c915f9d8 100644 --- a/packages/lua/fpmake.pp +++ b/packages/lua/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('lua'); {$ifdef ALLPACKAGES} - P.Directory:='lua'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/mad/fpmake.pp b/packages/mad/fpmake.pp index 0ad8d4cbad..416c030025 100644 --- a/packages/mad/fpmake.pp +++ b/packages/mad/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('mad'); {$ifdef ALLPACKAGES} - P.Directory:='mad'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [linux,win32,win64]; diff --git a/packages/modplug/fpmake.pp b/packages/modplug/fpmake.pp index 7992bbce17..fe98d2310c 100644 --- a/packages/modplug/fpmake.pp +++ b/packages/modplug/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('modplug'); {$ifdef ALLPACKAGES} - P.Directory:='modplug'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [linux]; diff --git a/packages/mysql/fpmake.pp b/packages/mysql/fpmake.pp index 0e75b1105b..c1eb9f335d 100644 --- a/packages/mysql/fpmake.pp +++ b/packages/mysql/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('mysql'); {$ifdef ALLPACKAGES} - P.Directory:='mysql'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/ncurses/fpmake.pp b/packages/ncurses/fpmake.pp index 529802d7de..a981861926 100644 --- a/packages/ncurses/fpmake.pp +++ b/packages/ncurses/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('ncurses'); {$ifdef ALLPACKAGES} - P.Directory:='ncurses'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,aix]; diff --git a/packages/newt/fpmake.pp b/packages/newt/fpmake.pp index 533a7a7d18..eb9980f66f 100644 --- a/packages/newt/fpmake.pp +++ b/packages/newt/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('newt'); {$ifdef ALLPACKAGES} - P.Directory:='newt'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/numlib/fpmake.pp b/packages/numlib/fpmake.pp index b544312a15..8be1fb9a5e 100644 --- a/packages/numlib/fpmake.pp +++ b/packages/numlib/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('numlib'); {$ifdef ALLPACKAGES} - P.Directory:='numlib'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/nvapi/fpmake.pp b/packages/nvapi/fpmake.pp index f7624f5761..4d1bda1d6e 100644 --- a/packages/nvapi/fpmake.pp +++ b/packages/nvapi/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('nvapi'); {$ifdef ALLPACKAGES} - P.Directory:='nvapi'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'NVidia, Andreas Hausladen, Dmitry "skalogryz" Boyarintsev'; diff --git a/packages/objcrtl/fpmake.pp b/packages/objcrtl/fpmake.pp index 9754220d75..5cf056bd36 100644 --- a/packages/objcrtl/fpmake.pp +++ b/packages/objcrtl/fpmake.pp @@ -12,7 +12,7 @@ begin {$endif ALLPACKAGES} P:=AddPackage('objcrtl'); {$ifdef ALLPACKAGES} - P.Directory:='objcrtl'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=[darwin,iphonesim]; diff --git a/packages/odbc/fpmake.pp b/packages/odbc/fpmake.pp index 3831084013..1f6b9f1849 100644 --- a/packages/odbc/fpmake.pp +++ b/packages/odbc/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('odbc'); {$ifdef ALLPACKAGES} - P.Directory:='odbc'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := AllUnixOSes+AllWindowsOSes-[qnx]; diff --git a/packages/oggvorbis/fpmake.pp b/packages/oggvorbis/fpmake.pp index 9624265c52..3f3079a175 100644 --- a/packages/oggvorbis/fpmake.pp +++ b/packages/oggvorbis/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('oggvorbis'); {$ifdef ALLPACKAGES} - P.Directory:='oggvorbis'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/openal/fpmake.pp b/packages/openal/fpmake.pp index 37e4cce4d1..6600fdbfe1 100644 --- a/packages/openal/fpmake.pp +++ b/packages/openal/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('openal'); {$ifdef ALLPACKAGES} - P.Directory:='openal'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; if Defaults.CPU = i386 then diff --git a/packages/opencl/fpmake.pp b/packages/opencl/fpmake.pp index dd2c388382..c56f5f2984 100644 --- a/packages/opencl/fpmake.pp +++ b/packages/opencl/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('opencl'); {$ifdef ALLPACKAGES} - P.Directory:='opencl'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := ' Dmitry "skalogryz" Boyarintsev; Kronos group'; diff --git a/packages/opengl/fpmake.pp b/packages/opengl/fpmake.pp index cd44019ecf..95ab5515cb 100644 --- a/packages/opengl/fpmake.pp +++ b/packages/opengl/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('opengl'); {$ifdef ALLPACKAGES} - P.Directory:='opengl'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=AllUnixOSes+[Win32,Win64]-[Android]; diff --git a/packages/opengles/fpmake.pp b/packages/opengles/fpmake.pp index b6526a7214..a0fb19e3d5 100644 --- a/packages/opengles/fpmake.pp +++ b/packages/opengles/fpmake.pp @@ -15,7 +15,7 @@ begin P:=AddPackage('opengles'); {$ifdef ALLPACKAGES} - P.Directory:='opengles'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Free Pascal Development team'; diff --git a/packages/openssl/fpmake.pp b/packages/openssl/fpmake.pp index 3879574408..b6d8822302 100644 --- a/packages/openssl/fpmake.pp +++ b/packages/openssl/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('openssl'); {$ifdef ALLPACKAGES} - P.Directory:='openssl'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/oracle/fpmake.pp b/packages/oracle/fpmake.pp index 7d84176ce6..51ead0cac2 100644 --- a/packages/oracle/fpmake.pp +++ b/packages/oracle/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('oracle'); {$ifdef ALLPACKAGES} - P.Directory:='oracle'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/os2units/fpmake.pp b/packages/os2units/fpmake.pp index 5d0e7d11e0..18ef621b2b 100644 --- a/packages/os2units/fpmake.pp +++ b/packages/os2units/fpmake.pp @@ -13,7 +13,7 @@ begin P:=AddPackage('os2units'); {$ifdef ALLPACKAGES} - P.Directory:='os2units'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [OS2,emx]; diff --git a/packages/palmunits/fpmake.pp b/packages/palmunits/fpmake.pp index cbbb39f696..4237d9d586 100644 --- a/packages/palmunits/fpmake.pp +++ b/packages/palmunits/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('palmunits'); {$ifdef ALLPACKAGES} - P.Directory:='palmunits'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [palmos]; diff --git a/packages/pasjpeg/fpmake.pp b/packages/pasjpeg/fpmake.pp index 5b16a4ec7a..5a31b02d72 100644 --- a/packages/pasjpeg/fpmake.pp +++ b/packages/pasjpeg/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('pasjpeg'); {$ifdef ALLPACKAGES} - P.Directory:='pasjpeg'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=P.OSes-[embedded]; diff --git a/packages/paszlib/fpmake.pp b/packages/paszlib/fpmake.pp index 405b5508ae..587826d06e 100644 --- a/packages/paszlib/fpmake.pp +++ b/packages/paszlib/fpmake.pp @@ -15,7 +15,7 @@ begin P:=AddPackage('paszlib'); {$ifdef ALLPACKAGES} - P.Directory:='paszlib'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := P.OSes - [embedded,nativent]; diff --git a/packages/pcap/fpmake.pp b/packages/pcap/fpmake.pp index f79e7b8473..68e1837fd7 100644 --- a/packages/pcap/fpmake.pp +++ b/packages/pcap/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('pcap'); {$ifdef ALLPACKAGES} - P.Directory:='pcap'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/postgres/fpmake.pp b/packages/postgres/fpmake.pp index b98837ad1f..4d537006af 100644 --- a/packages/postgres/fpmake.pp +++ b/packages/postgres/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('postgres'); {$ifdef ALLPACKAGES} - P.Directory:='postgres'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/proj4/fpmake.pp b/packages/proj4/fpmake.pp index c408a496d1..131da702cd 100644 --- a/packages/proj4/fpmake.pp +++ b/packages/proj4/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('proj4'); {$ifdef ALLPACKAGES} - P.Directory:='proj4'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/ptc/fpmake.pp b/packages/ptc/fpmake.pp index a61acf9bd2..3ba90f4315 100644 --- a/packages/ptc/fpmake.pp +++ b/packages/ptc/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('ptc'); {$ifdef ALLPACKAGES} - P.Directory:='ptc'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/pthreads/fpmake.pp b/packages/pthreads/fpmake.pp index eb69e715fd..d1112b73c9 100644 --- a/packages/pthreads/fpmake.pp +++ b/packages/pthreads/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('pthreads'); {$ifdef ALLPACKAGES} - P.Directory:='pthreads'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,aix]; diff --git a/packages/pxlib/fpmake.pp b/packages/pxlib/fpmake.pp index 58cc265e7d..b92bbaf657 100644 --- a/packages/pxlib/fpmake.pp +++ b/packages/pxlib/fpmake.pp @@ -13,7 +13,7 @@ begin {$endif ALLPACKAGES} P:=AddPackage('pxlib'); {$ifdef ALLPACKAGES} - P.Directory:='pxlib'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.OSes:=[Linux,beos,haiku,win32,freebsd,openbsd,netbsd]; P.Version:='2.7.1'; diff --git a/packages/regexpr/fpmake.pp b/packages/regexpr/fpmake.pp index a1467a48e3..c525021370 100644 --- a/packages/regexpr/fpmake.pp +++ b/packages/regexpr/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('regexpr'); {$ifdef ALLPACKAGES} - P.Directory:='regexpr'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=P.OSes-[embedded]; diff --git a/packages/rexx/fpmake.pp b/packages/rexx/fpmake.pp index 67820c16b5..595e9b4c4b 100644 --- a/packages/rexx/fpmake.pp +++ b/packages/rexx/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('rexx'); {$ifdef ALLPACKAGES} - P.Directory:='rexx'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/sdl/fpmake.pp b/packages/sdl/fpmake.pp index 6423ca9f18..6edc1e8be7 100644 --- a/packages/sdl/fpmake.pp +++ b/packages/sdl/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('sdl'); {$ifdef ALLPACKAGES} - P.Directory:='sdl'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/sqlite/fpmake.pp b/packages/sqlite/fpmake.pp index 2557118af2..d699d6b4d0 100644 --- a/packages/sqlite/fpmake.pp +++ b/packages/sqlite/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('sqlite'); {$ifdef ALLPACKAGES} - P.Directory:='sqlite'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := AllUnixOSes+AllWindowsOSes-[qnx]; diff --git a/packages/svgalib/fpmake.pp b/packages/svgalib/fpmake.pp index 1a496ec6b9..abe034be55 100644 --- a/packages/svgalib/fpmake.pp +++ b/packages/svgalib/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('svgalib'); {$ifdef ALLPACKAGES} - P.Directory:='svgalib'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [beos,haiku,linux,freebsd,solaris,netbsd,openbsd]; diff --git a/packages/symbolic/fpmake.pp b/packages/symbolic/fpmake.pp index 58244715b4..b14cbb3e33 100644 --- a/packages/symbolic/fpmake.pp +++ b/packages/symbolic/fpmake.pp @@ -13,7 +13,7 @@ begin {$endif ALLPACKAGES} P:=AddPackage('symbolic'); {$ifdef ALLPACKAGES} - P.Directory:='symbolic'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Marco van de Voort'; diff --git a/packages/syslog/fpmake.pp b/packages/syslog/fpmake.pp index 68bec65a6b..7082ed9f00 100644 --- a/packages/syslog/fpmake.pp +++ b/packages/syslog/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('syslog'); {$ifdef ALLPACKAGES} - P.Directory:='syslog'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,aix]; diff --git a/packages/tcl/fpmake.pp b/packages/tcl/fpmake.pp index c48a7f8719..c5e32b8e1f 100644 --- a/packages/tcl/fpmake.pp +++ b/packages/tcl/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('tcl'); {$ifdef ALLPACKAGES} - P.Directory:='tcl'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/univint/fpmake.pp b/packages/univint/fpmake.pp index 804a5b8836..3421309df5 100644 --- a/packages/univint/fpmake.pp +++ b/packages/univint/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('univint'); {$ifdef ALLPACKAGES} - P.Directory:='univint'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/unixutil/fpmake.pp b/packages/unixutil/fpmake.pp index 89fd47ba09..b5e00adc28 100644 --- a/packages/unixutil/fpmake.pp +++ b/packages/unixutil/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('unixutil'); {$ifdef ALLPACKAGES} - P.Directory:='unixutil'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=[Linux]; diff --git a/packages/unzip/fpmake.pp b/packages/unzip/fpmake.pp index d7807d6744..72b542e799 100644 --- a/packages/unzip/fpmake.pp +++ b/packages/unzip/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('unzip'); {$ifdef ALLPACKAGES} - P.Directory:='unzip'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/users/fpmake.pp b/packages/users/fpmake.pp index 3f430fb7a8..fff92a848c 100644 --- a/packages/users/fpmake.pp +++ b/packages/users/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('users'); {$ifdef ALLPACKAGES} - P.Directory:='users'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Author := 'Michael van Canneyt, Marco van de Voort'; diff --git a/packages/utmp/fpmake.pp b/packages/utmp/fpmake.pp index ac254d91e5..f55a3a5a74 100644 --- a/packages/utmp/fpmake.pp +++ b/packages/utmp/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('utmp'); {$ifdef ALLPACKAGES} - P.Directory:='utmp'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/uuid/fpmake.pp b/packages/uuid/fpmake.pp index 4a76ee10f0..b417dc76d4 100644 --- a/packages/uuid/fpmake.pp +++ b/packages/uuid/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('uuid'); {$ifdef ALLPACKAGES} - P.Directory:='uuid'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/winceunits/fpmake.pp b/packages/winceunits/fpmake.pp index ea45fbfdbc..6950d5bb90 100644 --- a/packages/winceunits/fpmake.pp +++ b/packages/winceunits/fpmake.pp @@ -14,8 +14,9 @@ begin {$endif ALLPACKAGES} P:=AddPackage('winceunits'); + {$ifdef ALLPACKAGES} - P.Directory:='winceunits'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; diff --git a/packages/winunits-base/fpmake.pp b/packages/winunits-base/fpmake.pp index 86ee31b2ac..3c676ff700 100644 --- a/packages/winunits-base/fpmake.pp +++ b/packages/winunits-base/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('winunits-base'); {$ifdef ALLPACKAGES} - P.Directory:='winunits-base'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=[win32,win64]; diff --git a/packages/winunits-jedi/fpmake.pp b/packages/winunits-jedi/fpmake.pp index f21e7cf64f..e4bcb298d4 100644 --- a/packages/winunits-jedi/fpmake.pp +++ b/packages/winunits-jedi/fpmake.pp @@ -15,7 +15,7 @@ begin P:=AddPackage('winunits-jedi'); {$ifdef ALLPACKAGES} - P.Directory:='winunits-jedi'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=[win32,win64]; diff --git a/packages/x11/fpmake.pp b/packages/x11/fpmake.pp index bed7e70e24..7226d27876 100644 --- a/packages/x11/fpmake.pp +++ b/packages/x11/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('x11'); {$ifdef ALLPACKAGES} - P.Directory:='x11'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes:=[beos,haiku,freebsd,solaris,netbsd,openbsd,linux,os2,emx,aix]; diff --git a/packages/xforms/fpmake.pp b/packages/xforms/fpmake.pp index 52c980931e..de22e61be9 100644 --- a/packages/xforms/fpmake.pp +++ b/packages/xforms/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('xforms'); {$ifdef ALLPACKAGES} - P.Directory:='xforms'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); diff --git a/packages/zlib/fpmake.pp b/packages/zlib/fpmake.pp index dc94d7d501..53370a8228 100644 --- a/packages/zlib/fpmake.pp +++ b/packages/zlib/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('zlib'); {$ifdef ALLPACKAGES} - P.Directory:='zlib'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := AllUnixOSes+AllWindowsOSes+[os2,emx,netware,netwlibc]-[qnx]; diff --git a/packages/zorba/fpmake.pp b/packages/zorba/fpmake.pp index 2b6e16e477..1167275bb5 100644 --- a/packages/zorba/fpmake.pp +++ b/packages/zorba/fpmake.pp @@ -14,7 +14,7 @@ begin P:=AddPackage('zorba'); {$ifdef ALLPACKAGES} - P.Directory:='zorba'; + P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.OSes := [linux,win32]; diff --git a/utils/dxegen/fpmake.pp b/utils/dxegen/fpmake.pp index 2808823a89..2a152fb31e 100644 --- a/utils/dxegen/fpmake.pp +++ b/utils/dxegen/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_dxegen; +procedure add_dxegen(const ADirectory: string); Var P : TPackage; @@ -26,9 +26,7 @@ begin P.OSes:=[go32v2]; -{$ifdef ALLPACKAGES} - P.Directory:='fprcp'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; T:=P.Targets.AddProgram('dxegen.pas'); @@ -40,7 +38,7 @@ end; {$ifndef ALLPACKAGES} begin - add_dxegen; + add_dxegen(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/fpcm/fpmake.pp b/utils/fpcm/fpmake.pp index c0f97fdca9..b513f61fec 100644 --- a/utils/fpcm/fpmake.pp +++ b/utils/fpcm/fpmake.pp @@ -186,7 +186,7 @@ begin end; {$endif HAS_UNIT_PROCESS} -procedure add_fpcm; +procedure add_fpcm(const ADirectory: string); Var P : TPackage; @@ -233,7 +233,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fpcm; + add_fpcm(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/fpcm/revision.inc b/utils/fpcm/revision.inc index 34bb37229a..907c8b479c 100644 --- a/utils/fpcm/revision.inc +++ b/utils/fpcm/revision.inc @@ -1 +1 @@ -'2013-04-26 rev 24324' +'2013-05-26 rev 24621' diff --git a/utils/fpcmkcfg/fpmake.pp b/utils/fpcmkcfg/fpmake.pp index f027aebac0..a0a9265dc2 100644 --- a/utils/fpcmkcfg/fpmake.pp +++ b/utils/fpcmkcfg/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_fpcmkcfg; +procedure add_fpcmkcfg(const ADirectory: string); Var P : TPackage; @@ -24,9 +24,7 @@ begin P.Description := 'An utility to creaty the Free Pascal configuration files.'; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='fpcmkcfg'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); @@ -51,7 +49,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fpcmkcfg; + add_fpcmkcfg(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/fpcres/fpmake.pp b/utils/fpcres/fpmake.pp index a9e45c610d..94a48f61d3 100644 --- a/utils/fpcres/fpmake.pp +++ b/utils/fpcres/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_fpcres; +procedure add_fpcres(const ADirectory: string); Var P : TPackage; @@ -23,9 +23,7 @@ begin P.Description := 'Free Pascal Resource Converter.'; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='fpcres'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.OSes:=[win32,win64,wince,haiku,linux,freebsd,openbsd,netbsd,darwin,iphonesim,solaris,os2,emx,aix]; @@ -60,7 +58,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fpcres; + add_fpcres(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/fpcreslipo/fpmake.pp b/utils/fpcreslipo/fpmake.pp index 041aac6fec..19f498124f 100644 --- a/utils/fpcreslipo/fpmake.pp +++ b/utils/fpcreslipo/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_fpcreslipo; +procedure add_fpcreslipo(const ADirectory: string); Var P : TPackage; @@ -21,9 +21,7 @@ begin P.HomepageURL := 'www.freepascal.org'; P.Email := ''; -{$ifdef ALLPACKAGES} - P.Directory:='fpcreslipo'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Dependencies.Add('fcl-res'); @@ -40,7 +38,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fpcreslipo; + add_fpcreslipo(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/fpdoc/fpmake.pp b/utils/fpdoc/fpmake.pp index 77fa48a27b..fc4d7b9d81 100644 --- a/utils/fpdoc/fpmake.pp +++ b/utils/fpdoc/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit, sysutils; {$endif ALLPACKAGES} -procedure add_fpdoc; +procedure add_fpdoc(const ADirectory: string); Var P : TPackage; @@ -33,9 +33,7 @@ begin P.Dependencies.Add('univint',[darwin,iphonesim]); -{$ifdef ALLPACKAGES} - P.Directory:='fpdoc'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Options.Add('-S2h'); @@ -103,7 +101,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fpdoc; + add_fpdoc(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/fpmake.pp b/utils/fpmake.pp index 9644de43de..42fec8d5f4 100644 --- a/utils/fpmake.pp +++ b/utils/fpmake.pp @@ -1,5 +1,7 @@ -{$mode objfpc}{$H+} +{$ifndef ALLPACKAGES} {$define allpackages} +{$define no_parent} +{$mode objfpc}{$H+} program fpmake; {$IFDEF MORPHOS} @@ -26,13 +28,27 @@ uses {$ENDIF HAS_UNIT_PROCESS} sysutils; -procedure add_utils; +{$endif ALLPACKAGES} + +(* + +The include files are generated with the following commands: + +rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do cleanedname=`dirname $file | sed -e 's+-+_+g'` ; if ! `grep -i "^procedure add_$cleanedname" $file >/dev/null` ; then printf 'procedure add_%s(const ADirectory: string);\nbegin\n with Installer do\n{$include %s}\nend;\n\n' $cleanedname $file >> fpmake_proc.inc; else printf '{$include %s}\n\n' $file >> fpmake_proc.inc; fi; echo " add_$cleanedname(ADirectory+IncludeTrailingPathDelimiter('$cleanedname'));" >> fpmake_add.inc; done + +*) + +{$include fpmake_proc.inc} + +procedure add_utils(const ADirectory: string); Var P : TPackage; T : TTarget; begin +{$include fpmake_add.inc} + With Installer do begin P:=AddPackage('utils'); @@ -43,6 +59,9 @@ begin P.Email := ''; P.Description := 'Various Free Pascal utilities.'; P.NeedLibC:= false; +{$ifndef NO_PARENT} + P.Directory:=ADirectory; +{$endif ALLPACKAGES} P.Dependencies.Add('fcl-base'); P.Dependencies.Add('paszlib'); @@ -68,23 +87,13 @@ begin end; end; -(* - -The include files are generated with the following commands: - -rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do cleanedname=`dirname $file | sed -e 's+-+_+g'` ; if ! `grep -i "^procedure add_$cleanedname" $file >/dev/null` ; then printf 'procedure add_%s;\nbegin\n with Installer do\n{$include %s}\nend;\n\n' $cleanedname $file >> fpmake_proc.inc; else printf '{$include %s}\n\n' $file >> fpmake_proc.inc; fi; echo " add_$cleanedname;" >> fpmake_add.inc; done - -*) - -{$include fpmake_proc.inc} - +{$ifdef NO_PARENT} begin -{$include fpmake_add.inc} - add_utils; + add_utils(''); Installer.Run; end. - +{$endif NO_PARENT} diff --git a/utils/fpmake_add.inc b/utils/fpmake_add.inc index bcc93c5799..f3b674d56d 100644 --- a/utils/fpmake_add.inc +++ b/utils/fpmake_add.inc @@ -1,18 +1,18 @@ - add_dxegen; - add_fpcm; - add_fpcmkcfg; - add_fpcres; - add_fpcreslipo; - add_fpdoc; - add_fpmc; - add_fppkg_util; - add_fprcp; - add_h2pas; - add_importtl; - add_instantfpc; - add_pas2fpm; - add_pas2jni; - add_pas2ut; - add_rmwait; - add_tply; - add_unicode; + add_dxegen(ADirectory+IncludeTrailingPathDelimiter('dxegen')); + add_fpcm(ADirectory+IncludeTrailingPathDelimiter('fpcm')); + add_fpcmkcfg(ADirectory+IncludeTrailingPathDelimiter('fpcmkcfg')); + add_fpcres(ADirectory+IncludeTrailingPathDelimiter('fpcres')); + add_fpcreslipo(ADirectory+IncludeTrailingPathDelimiter('fpcreslipo')); + add_fpdoc(ADirectory+IncludeTrailingPathDelimiter('fpdoc')); + add_fpmc(ADirectory+IncludeTrailingPathDelimiter('fpmc')); + add_fppkg_util(ADirectory+IncludeTrailingPathDelimiter('fppkg')); + add_fprcp(ADirectory+IncludeTrailingPathDelimiter('fprcp')); + add_h2pas(ADirectory+IncludeTrailingPathDelimiter('h2pas')); + add_importtl(ADirectory+IncludeTrailingPathDelimiter('importtl')); + add_instantfpc(ADirectory+IncludeTrailingPathDelimiter('instantfpc')); + add_pas2fpm(ADirectory+IncludeTrailingPathDelimiter('pas2fpm')); + add_pas2jni(ADirectory+IncludeTrailingPathDelimiter('pas2jni')); + add_pas2ut(ADirectory+IncludeTrailingPathDelimiter('pas2ut')); + add_rmwait(ADirectory+IncludeTrailingPathDelimiter('rmwait')); + add_tply(ADirectory+IncludeTrailingPathDelimiter('tply')); + add_unicode(ADirectory+IncludeTrailingPathDelimiter('unicode')); diff --git a/utils/fpmc/fpmake.pp b/utils/fpmc/fpmake.pp index 81716594be..ad48f8a607 100644 --- a/utils/fpmc/fpmake.pp +++ b/utils/fpmc/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit, sysutils; {$endif ALLPACKAGES} -procedure add_fpmc; +procedure add_fpmc(const ADirectory: string); Var P : TPackage; @@ -25,9 +25,7 @@ begin P.Description := 'Free Pascal Message Compiler.'; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='fpmc'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.OSes := [win32, win64, os2, emx]; diff --git a/utils/fppkg/fpmake.pp b/utils/fppkg/fpmake.pp index eebdc47bf2..568e5cd2a6 100644 --- a/utils/fppkg/fpmake.pp +++ b/utils/fppkg/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_fppkg_util; +procedure add_fppkg_util(const ADirectory: string); const lnetOSes = [linux,beos,haiku,freebsd,netbsd,openbsd,darwin,iphonesim,solaris,win32,win64,wince,aix]; @@ -26,9 +26,7 @@ begin P.Description := 'Free Pascal package repository utility.'; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='fppkg'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.SourcePath.Add('lnet',lnetOSes); @@ -88,7 +86,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fppkg_util; + add_fppkg_util(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/fprcp/fpmake.pp b/utils/fprcp/fpmake.pp index 2f1ce29e54..eec968c89e 100644 --- a/utils/fprcp/fpmake.pp +++ b/utils/fprcp/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_fprcp; +procedure add_fprcp(const ADirectory: string); Var P : TPackage; @@ -25,9 +25,7 @@ begin 'in resource script.'; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='fprcp'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; T:=P.Targets.AddProgram('fprcp.pp'); @@ -43,7 +41,7 @@ end; {$ifndef ALLPACKAGES} begin - add_fprcp; + add_fprcp(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/h2pas/fpmake.pp b/utils/h2pas/fpmake.pp index e82d3a2952..31db2b38a9 100644 --- a/utils/h2pas/fpmake.pp +++ b/utils/h2pas/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_h2pas; +procedure add_h2pas(const ADirectory: string); Var P : TPackage; @@ -23,9 +23,7 @@ begin P.Description := 'An utility to create Pascal header files from c header files.'; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='h2pas'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Options.Add('-Sg'); @@ -56,7 +54,7 @@ end; {$ifndef ALLPACKAGES} begin - add_h2pas; + add_h2pas(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/importtl/fpmake.pp b/utils/importtl/fpmake.pp index 46ecc491dd..2172ce1de7 100644 --- a/utils/importtl/fpmake.pp +++ b/utils/importtl/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_importtl; +procedure add_importtl(const ADirectory: string); Var P : TPackage; @@ -26,9 +26,7 @@ begin P.Dependencies.Add('fcl-base'); P.Dependencies.Add('fcl-registry'); -{$ifdef ALLPACKAGES} - P.Directory:='importtl'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.OSes:=[win32,win64]; @@ -39,7 +37,7 @@ end; {$ifndef ALLPACKAGES} begin - add_rmwait; + add_importtl(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/instantfpc/fpmake.pp b/utils/instantfpc/fpmake.pp index 583813ef8d..f4fd7fb334 100644 --- a/utils/instantfpc/fpmake.pp +++ b/utils/instantfpc/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_instantfpc; +procedure add_instantfpc(const ADirectory: string); Var P : TPackage; @@ -23,9 +23,7 @@ begin P.Description := 'A tool to execute pascal programs as unix scripts.'; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='instantfpc'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Dependencies.Add('fcl-process'); @@ -42,7 +40,7 @@ end; {$ifndef ALLPACKAGES} begin - add_instantfpc; + add_instantfpc(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/pas2fpm/fpmake.pp b/utils/pas2fpm/fpmake.pp index a4720001ba..b9b82605dc 100644 --- a/utils/pas2fpm/fpmake.pp +++ b/utils/pas2fpm/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_pas2fpm; +procedure add_pas2fpm(const ADirectory: string); Var P : TPackage; @@ -23,9 +23,7 @@ begin P.Email := ''; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='pas2fpm'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); P.Dependencies.Add('fcl-passrc'); @@ -36,7 +34,7 @@ end; {$ifndef ALLPACKAGES} begin - add_pas2fpm; + add_pas2fpm(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/pas2jni/fpmake.pp b/utils/pas2jni/fpmake.pp index 06bf2716ed..fab14a32c1 100644 --- a/utils/pas2jni/fpmake.pp +++ b/utils/pas2jni/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_pas2jni; +procedure add_pas2jni(const ADirectory: string); Var P : TPackage; @@ -23,9 +23,7 @@ begin P.Email := ''; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='pas2jni'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); P.Dependencies.Add('fcl-process'); @@ -43,7 +41,7 @@ end; {$ifndef ALLPACKAGES} begin - add_pas2jni; + add_pas2jni(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/pas2ut/fpmake.pp b/utils/pas2ut/fpmake.pp index 7ca8b966b6..a98e0950da 100644 --- a/utils/pas2ut/fpmake.pp +++ b/utils/pas2ut/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_pas2ut; +procedure add_pas2ut(const ADirectory: string); Var P : TPackage; @@ -23,9 +23,7 @@ begin P.Email := ''; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='pas2ut'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Dependencies.Add('fcl-passrc'); @@ -35,7 +33,7 @@ end; {$ifndef ALLPACKAGES} begin - add_pas2ut; + add_pas2ut(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/rmwait/fpmake.pp b/utils/rmwait/fpmake.pp index 74254b8cfe..aa8e8fd706 100644 --- a/utils/rmwait/fpmake.pp +++ b/utils/rmwait/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_rmwait; +procedure add_rmwait(const ADirectory: string); Var P : TPackage; @@ -23,9 +23,7 @@ begin P.Description := 'Tool to remove (delete) file(s) with optional retries'; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='rmwait'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.OSes:=[win32,win64,wince,os2,emx,go32v2]; diff --git a/utils/tply/fpmake.pp b/utils/tply/fpmake.pp index dbc1999aea..539118dfa4 100644 --- a/utils/tply/fpmake.pp +++ b/utils/tply/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_tply; +procedure add_tply(const ADirectory: string); Var P : TPackage; @@ -24,9 +24,7 @@ begin P.Description := 'A compiler generator for Turbo Pascal and compatibles.'; P.NeedLibC:= false; -{$ifdef ALLPACKAGES} - P.Directory:='tply'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; P.Version:='2.7.1'; P.Options.Add('-Sg'); @@ -92,7 +90,7 @@ end; {$ifndef ALLPACKAGES} begin - add_tply; + add_tply(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/utils/unicode/fpmake.pp b/utils/unicode/fpmake.pp index 15caf51066..3fa0f81278 100644 --- a/utils/unicode/fpmake.pp +++ b/utils/unicode/fpmake.pp @@ -5,7 +5,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_unicode; +procedure add_unicode(const ADirectory: string); Var P : TPackage; @@ -61,7 +61,7 @@ end; {$ifndef ALLPACKAGES} begin - add_unicode; + add_unicode(''); Installer.Run; end. {$endif ALLPACKAGES}