Commit Graph

83 Commits

Author SHA1 Message Date
marco
acb7945449 * version updates to 3.0.5
git-svn-id: branches/fixes_3_0@37640 -
2017-12-01 14:53:04 +00:00
marco
2f882e4dd0 --- Merging r34401 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r34401 into '.':
 U   .
--- Merging r34403 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r34403 into '.':
 G   .
--- Merging r36529 into '.':
U    packages/fppkg/src/pkgdownload.pp
--- Recording mergeinfo for merge of r36529 into '.':
 G   .

# revisions: 34401,34403,36529

git-svn-id: branches/fixes_3_0@36562 -
2017-06-21 18:37:22 +00:00
marco
339cfc75fc --- Merging r33481 into '.':
U    packages/rtl-console/fpmake.pp
U    packages/rtl-extra/fpmake.pp
U    packages/fcl-net/fpmake.pp
U    packages/fcl-process/fpmake.pp
U    packages/fcl-web/fpmake.pp
U    packages/fppkg/fpmake.pp
U    packages/ami-extra/fpmake.pp
U    packages/googleapi/fpmake.pp
U    packages/fv/fpmake.pp
--- Recording mergeinfo for merge of r33481 into '.':
 U   .
--- Merging r33735 into '.':
U    packages/fcl-web/src/base/custhttpapp.pp
U    packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r33735 into '.':
 G   .
--- Merging r33791 into '.':
U    packages/fcl-web/src/base/fpoauth2.pp
--- Recording mergeinfo for merge of r33791 into '.':
 G   .
--- Merging r34061 into '.':
U    packages/fcl-web/src/base/restbase.pp
--- Recording mergeinfo for merge of r34061 into '.':
 G   .
--- Merging r34063 into '.':
U    packages/fcl-web/src/base/fphttpwebclient.pp
--- Recording mergeinfo for merge of r34063 into '.':
 G   .
--- Merging r34064 into '.':
U    packages/fcl-web/src/base/fpwebclient.pp
--- Recording mergeinfo for merge of r34064 into '.':
 G   .

# revisions: 33481,33735,33791,34061,34063,34064

git-svn-id: branches/fixes_3_0@35974 -
2017-04-27 16:22:34 +00:00
marco
4b965da921 * version updates
git-svn-id: branches/fixes_3_0@35434 -
2017-02-13 08:24:06 +00:00
joost
a1e6cab872 --- Merging r32274 into '.':
U    packages/fppkg/src/fpmkunitsrc.inc
--- Recording mergeinfo for merge of r32274 into '.':
 U   .

# revisions: 32274

git-svn-id: branches/fixes_3_0@32295 -
2015-11-12 18:12:54 +00:00
joost
3156da8c06 --- Merging r32224 into '.':
U    packages/fppkg/src/pkgmessages.pp
U    packages/fppkg/src/pkgcommands.pp
U    utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r32224 into '.':
 U   .

# revisions: 3222

git-svn-id: branches/fixes_3_0@32273 -
2015-11-08 17:17:50 +00:00
joost
fe336c38d4 --- Merging r32124 into '.':
U    packages/gdbint/fpmake.pp
--- Recording mergeinfo for merge of r32124 into '.':
 U   .
--- Merging r32126 into '.':
U    packages/gtk2/fpmake.pp
--- Recording mergeinfo for merge of r32126 into '.':
 G   .
--- Merging r32127 into '.':
U    packages/imagemagick/fpmake.pp
--- Recording mergeinfo for merge of r32127 into '.':
 G   .
--- Merging r32128 into '.':
U    packages/rtl-unicode/fpmake.pp
--- Recording mergeinfo for merge of r32128 into '.':
 G   .
--- Merging r32129 into '.':
U    packages/fcl-sdo/fpmake.pp
--- Recording mergeinfo for merge of r32129 into '.':
 G   .
--- Merging r32138 into '.':
U    packages/fppkg/fpmake.pp
--- Recording mergeinfo for merge of r32138 into '.':
 G   .
--- Merging r32139 into '.':
U    packages/libxml/fpmake.pp
--- Recording mergeinfo for merge of r32139 into '.':
 G   .

# revisions: 32124,32126,32127,32128,32129,32138,32139

git-svn-id: branches/fixes_3_0@32241 -
2015-11-04 21:11:04 +00:00
joost
bf757c0c15 --- Merging r32053 into '.':
U    packages/fppkg/src/pkgglobals.pp
--- Recording mergeinfo for merge of r32053 into '.':
 U   .

# revisions: 32053

git-svn-id: branches/fixes_3_0@32237 -
2015-11-04 20:50:20 +00:00
joost
6329336c32 * Re-generated Makefiles
git-svn-id: branches/fixes_3_0@31970 -
2015-10-06 22:09:00 +00:00
joost
2174581f6c --- Merging r31317 into '.':
C packages/googleapi
U    packages/nvapi/Makefile.fpc
U    packages/httpd13/Makefile.fpc
U    packages/proj4/Makefile.fpc
U    packages/odbc/Makefile.fpc
U    packages/openssl/Makefile.fpc
U    packages/rtl-unicode/Makefile.fpc
U    packages/fcl-sdo/Makefile.fpc
U    packages/libcurl/Makefile.fpc
U    packages/gtk1/Makefile.fpc
U    packages/libndsfpc/Makefile.fpc
U    packages/paszlib/Makefile.fpc
U    packages/cdrom/Makefile.fpc
U    packages/chm/Makefile.fpc
U    packages/fppkg/Makefile.fpc
U    packages/x11/Makefile.fpc
U    packages/regexpr/Makefile.fpc
U    packages/zorba/Makefile.fpc
U    packages/rtl-objpas/Makefile.fpc
U    packages/ldap/Makefile.fpc
U    packages/ncurses/Makefile.fpc
U    packages/hash/Makefile.fpc
U    packages/utmp/Makefile.fpc
U    packages/numlib/Makefile.fpc
U    packages/ami-extra/Makefile.fpc
U    packages/fcl-net/Makefile.fpc
U    packages/libogcfpc/Makefile.fpc
U    packages/fcl-res/Makefile.fpc
U    packages/imlib/Makefile.fpc
U    packages/dbus/Makefile.fpc
U    packages/imagemagick/Makefile.fpc
U    packages/graph/Makefile.fpc
U    packages/iosxlocale/Makefile.fpc
U    packages/unzip/Makefile.fpc
U    packages/postgres/Makefile.fpc
U    packages/fcl-fpcunit/Makefile.fpc
U    packages/fcl-process/Makefile.fpc
U    packages/fcl-image/Makefile.fpc
U    packages/os2units/Makefile.fpc
U    packages/libxml/Makefile.fpc
U    packages/fcl-stl/Makefile.fpc
   C packages/libenet
U    packages/libpng/Makefile.fpc
U    packages/gdbm/Makefile.fpc
U    packages/gtk2/Makefile.fpc
U    packages/fcl-web/Makefile.fpc
U    packages/pcap/Makefile.fpc
U    packages/httpd24/Makefile.fpc
U    packages/fuse/Makefile.fpc
U    packages/amunits/Makefile.fpc
U    packages/bzip2/Makefile.fpc
U    packages/bfd/Makefile.fpc
U    packages/libvlc/Makefile.fpc
U    packages/rtl-extra/Makefile.fpc
U    packages/rexx/Makefile.fpc
U    packages/mad/Makefile.fpc
U    packages/libgd/Makefile.fpc
U    packages/httpd22/Makefile.fpc
U    packages/oggvorbis/Makefile.fpc
U    packages/fcl-async/Makefile.fpc
U    packages/opengl/Makefile.fpc
U    packages/pasjpeg/Makefile.fpc
U    packages/morphunits/Makefile.fpc
U    packages/fcl-extra/Makefile.fpc
U    packages/objcrtl/Makefile.fpc
U    packages/syslog/Makefile.fpc
U    packages/httpd20/Makefile.fpc
U    packages/zlib/Makefile.fpc
U    packages/dblib/Makefile.fpc
U    packages/ibase/Makefile.fpc
U    packages/winunits-base/Makefile.fpc
U    packages/mysql/Makefile.fpc
U    packages/matroska/Makefile.fpc
U    packages/Makefile.fpc
U    packages/winunits-jedi/Makefile.fpc
U    packages/fpindexer/Makefile.fpc
U    packages/univint/Makefile.fpc
U    packages/libc/Makefile.fpc
U    packages/symbolic/Makefile.fpc
U    packages/gnome1/Makefile.fpc
U    packages/sqlite/Makefile.fpc
U    packages/jni/Makefile.fpc
U    packages/sdl/Makefile.fpc
U    packages/winceunits/Makefile.fpc
U    packages/libtar/Makefile.fpc
U    packages/opengles/Makefile.fpc
U    packages/fcl-base/Makefile.fpc
U    packages/fcl-xml/Makefile.fpc
U    packages/aspell/Makefile.fpc
U    packages/a52/Makefile.fpc
U    packages/fftw/Makefile.fpc
U    packages/fcl-json/Makefile.fpc
U    packages/ptc/Makefile.fpc
U    packages/rtl-console/Makefile.fpc
U    packages/ggi/Makefile.fpc
U    packages/fv/Makefile.fpc
U    packages/opencl/Makefile.fpc
U    packages/fastcgi/Makefile.fpc
U    packages/gmp/Makefile.fpc
U    packages/uuid/Makefile.fpc
U    packages/pthreads/Makefile.fpc
U    packages/unixutil/Makefile.fpc
U    packages/fcl-passrc/Makefile.fpc
U    packages/iconvenc/Makefile.fpc
U    packages/fcl-registry/Makefile.fpc
U    packages/newt/Makefile.fpc
U    packages/sndfile/Makefile.fpc
U    packages/openal/Makefile.fpc
U    packages/pastojs/Makefile.fpc
U    packages/oracle/Makefile.fpc
U    packages/libgbafpc/Makefile.fpc
U    packages/pxlib/Makefile.fpc
U    packages/dts/Makefile.fpc
U    packages/libsee/Makefile.fpc
U    packages/librsvg/Makefile.fpc
U    packages/palmunits/Makefile.fpc
U    packages/hermes/Makefile.fpc
U    packages/xforms/Makefile.fpc
U    packages/tcl/Makefile.fpc
U    packages/cocoaint/Makefile.fpc
U    packages/modplug/Makefile.fpc
U    packages/fcl-js/Makefile.fpc
U    packages/arosunits/Makefile.fpc
U    packages/users/Makefile.fpc
U    packages/gdbint/Makefile.fpc
U    packages/fpgtk/Makefile.fpc
U    packages/lua/Makefile.fpc
U    packages/fcl-db/Makefile.fpc
U    packages/cairo/Makefile.fpc
U    packages/fcl-sound/Makefile.fpc
U    packages/svgalib/Makefile.fpc
U    utils/fpcmkcfg/Makefile.fpc
U    utils/fpcm/Makefile.fpc
U    utils/tply/Makefile.fpc
U    utils/fppkg/Makefile.fpc
U    utils/h2pas/Makefile.fpc
U    utils/fpcreslipo/Makefile.fpc
U    ide/Makefile.fpc
U    utils/fpcres/Makefile.fpc
U    utils/Makefile.fpc
U    utils/fpmc/Makefile.fpc
U    utils/rmwait/Makefile.fpc
U    utils/importtl/Makefile.fpc
U    utils/pas2js/Makefile.fpc
U    utils/dxegen/Makefile.fpc
U    utils/debugsvr/Makefile.fpc
U    utils/fpcm/Makefile.fpmake.bs.template
U    utils/fpdoc/Makefile.fpc
U    utils/fprcp/Makefile.fpc
U    utils/unicode/Makefile.fpc
U    utils/pas2fpm/Makefile.fpc
U    utils/fpcm/Makefile.fpmake.template
U    utils/mksymbian/Makefile.fpc
U    utils/instantfpc/Makefile.fpc
U    utils/pas2ut/Makefile.fpc
U    utils/pas2jni/Makefile.fpc
--- Recording mergeinfo for merge of r31317 into '.':
 U   .
Summary of conflicts:
  Tree conflicts: 2
Resolved conflicted state of 'packages/googleapi'
Resolved conflicted state of 'packages/libenet'
Summary of conflicts:
  Tree conflicts: 0 remaining (and 2 already resolved)

# revisions: 31317

git-svn-id: branches/fixes_3_0@31969 -
2015-10-06 21:20:59 +00:00
joost
697695e421 * Re-generated makefiles, including examples
git-svn-id: branches/fixes_3_0@31297 -
2015-08-06 20:26:00 +00:00
marco
826f66757a --- Merging r29422 through r29424 into '.':
U    rtl/android/dlandroid.inc
U    rtl/win64/signals.pp
U    rtl/win64/system.pp
A    rtl/win64/buildrtl.lpi
U    rtl/x86_64/cpu.pp
--- Recording mergeinfo for merge of r29422 through r29424 into '.':
 U   .
--- Merging r29438 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r29438 into '.':
 G   .
--- Merging r29439 into '.':
U    packages/fppkg/src/pkgfpmake.pp
U    packages/fppkg/src/pkgcommands.pp
U    utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r29439 into '.':
 G   .
--- Merging r29603 into '.':
U    rtl/atari/Makefile.fpc
U    rtl/atari/Makefile
--- Recording mergeinfo for merge of r29603 into '.':
 G   .
--- Merging r29604 into '.':
U    rtl/Makefile.fpc
U    rtl/Makefile
--- Recording mergeinfo for merge of r29604 into '.':
 G   .
--- Merging r29808 into '.':
U    rtl/win/sysos.inc
--- Recording mergeinfo for merge of r29808 into '.':
 G   .

# revisions: 29422-29424,29438,29439,29603,29604,29808

git-svn-id: branches/fixes_3_0@31103 -
2015-06-17 19:26:25 +00:00
marco
9a0f43104c * makefile regen and version updates.
git-svn-id: branches/fixes_3_0@29416 -
2015-01-05 15:04:54 +00:00
marco
f65f2d23d3 --- Merging r29410 into '.':
U    packages/fppkg/src/fpmkunitsrc.inc
--- Merging r29411 into '.':
U    utils/fpcmkcfg/fpmake.pp
U    utils/fpdoc/fpmake.pp

# revisions: 29410,29411

git-svn-id: branches/fixes_3_0@29415 -
2015-01-05 13:52:40 +00:00
marco
e831fde4b6 --- Merging r29409 into '.':
U    packages/zorba/Makefile
U    packages/zorba/Makefile.fpc
U    packages/rtl-extra/Makefile.fpc
U    packages/rtl-extra/Makefile
U    packages/opengl/Makefile
U    packages/opengl/Makefile.fpc
U    packages/fcl-extra/Makefile
U    packages/fcl-extra/Makefile.fpc
U    packages/os2units/Makefile
U    packages/os2units/Makefile.fpc
U    packages/gnome1/Makefile.fpc
U    packages/gnome1/Makefile
U    packages/imlib/Makefile
U    packages/imlib/Makefile.fpc
U    packages/sqlite/Makefile.fpc
U    packages/sqlite/Makefile
U    packages/graph/Makefile
U    packages/graph/Makefile.fpc
U    packages/unzip/Makefile.fpc
U    packages/unzip/Makefile
U    packages/uuid/Makefile
U    packages/uuid/Makefile.fpc
U    packages/fftw/Makefile
U    packages/fftw/Makefile.fpc
U    packages/librsvg/Makefile
U    packages/librsvg/Makefile.fpc
U    packages/libvlc/Makefile.fpc
U    packages/libvlc/Makefile
U    packages/rtl-objpas/Makefile
U    packages/rtl-objpas/Makefile.fpc
U    packages/nvapi/Makefile.fpc
U    packages/nvapi/Makefile
U    packages/sndfile/Makefile.fpc
U    packages/sndfile/Makefile
U    packages/svgalib/Makefile
U    packages/svgalib/Makefile.fpc
U    packages/bfd/Makefile.fpc
U    packages/bfd/Makefile
U    packages/proj4/Makefile.fpc
U    packages/proj4/Makefile
U    packages/iosxlocale/Makefile
U    packages/iosxlocale/Makefile.fpc
U    packages/paszlib/Makefile.fpc
U    packages/paszlib/Makefile
U    packages/libgbafpc/Makefile
U    packages/libgbafpc/Makefile.fpc
U    packages/fcl-registry/Makefile
U    packages/fcl-registry/Makefile.fpc
U    packages/regexpr/Makefile
U    packages/regexpr/Makefile.fpc
U    packages/libtar/Makefile.fpc
U    packages/libtar/Makefile
U    packages/newt/Makefile
U    packages/newt/Makefile.fpc
U    packages/xforms/Makefile.fpc
U    packages/xforms/Makefile
U    packages/openal/Makefile
U    packages/openal/Makefile.fpc
U    packages/aspell/Makefile
U    packages/aspell/Makefile.fpc
U    packages/jni/Makefile.fpc
U    packages/jni/Makefile
U    packages/libgd/Makefile
U    packages/libgd/Makefile.fpc
U    packages/symbolic/Makefile.fpc
U    packages/symbolic/Makefile
U    packages/ncurses/Makefile
U    packages/ncurses/Makefile.fpc
U    packages/sdl/Makefile
U    packages/sdl/Makefile.fpc
U    packages/arosunits/Makefile.fpc
U    packages/arosunits/Makefile
U    packages/fcl-net/Makefile
U    packages/fcl-net/Makefile.fpc
U    packages/fcl-res/Makefile
U    packages/fcl-res/Makefile.fpc
U    packages/mad/Makefile
U    packages/mad/Makefile.fpc
U    packages/oracle/Makefile
U    packages/oracle/Makefile.fpc
U    packages/dblib/Makefile
U    packages/dblib/Makefile.fpc
U    packages/palmunits/Makefile.fpc
U    packages/palmunits/Makefile
U    packages/fcl-js/Makefile.fpc
U    packages/fcl-js/Makefile
U    packages/ldap/Makefile
U    packages/ldap/Makefile.fpc
U    packages/matroska/Makefile
U    packages/matroska/Makefile.fpc
U    packages/tcl/Makefile.fpc
U    packages/tcl/Makefile
U    packages/ibase/Makefile
U    packages/ibase/Makefile.fpc
U    packages/hash/Makefile
U    packages/hash/Makefile.fpc
U    packages/gmp/Makefile.fpc
U    packages/gmp/Makefile
U    packages/openssl/Makefile
U    packages/openssl/Makefile.fpc
U    packages/utmp/Makefile.fpc
U    packages/utmp/Makefile
C    packages/bzip2/Makefile
U    packages/bzip2/Makefile.fpc
U    packages/httpd13/Makefile
U    packages/httpd13/Makefile.fpc
U    packages/a52/Makefile.fpc
U    packages/a52/Makefile
U    packages/fcl-sdo/Makefile.fpc
U    packages/fcl-sdo/Makefile
U    packages/winunits-base/Makefile
U    packages/winunits-base/Makefile.fpc
U    packages/fcl-sound/Makefile.fpc
U    packages/fcl-sound/Makefile
U    packages/libcurl/Makefile
U    packages/libcurl/Makefile.fpc
U    packages/dbus/Makefile
U    packages/dbus/Makefile.fpc
U    packages/libsee/Makefile
U    packages/libsee/Makefile.fpc
U    packages/fcl-stl/Makefile.fpc
U    packages/fcl-stl/Makefile
U    packages/libndsfpc/Makefile.fpc
U    packages/libndsfpc/Makefile
U    packages/mysql/Makefile.fpc
U    packages/mysql/Makefile
U    packages/gdbint/Makefile
U    packages/gdbint/Makefile.fpc
U    packages/fcl-base/Makefile.fpc
U    packages/fcl-base/Makefile
U    packages/opengles/Makefile.fpc
U    packages/opengles/Makefile
U    packages/fcl-web/Makefile
U    packages/fcl-web/Makefile.fpc
U    packages/opencl/Makefile
U    packages/opencl/Makefile.fpc
U    packages/hermes/Makefile
U    packages/hermes/Makefile.fpc
U    packages/httpd20/Makefile.fpc
U    packages/httpd20/Makefile
U    packages/ptc/Makefile
U    packages/ptc/Makefile.fpc
U    packages/httpd22/Makefile.fpc
U    packages/httpd22/Makefile
U    packages/ami-extra/Makefile
U    packages/ami-extra/Makefile.fpc
U    packages/fcl-db/Makefile
U    packages/fcl-db/Makefile.fpc
U    packages/libogcfpc/Makefile
U    packages/libogcfpc/Makefile.fpc
U    packages/winunits-jedi/Makefile.fpc
U    packages/winunits-jedi/Makefile
U    packages/httpd24/Makefile.fpc
U    packages/httpd24/Makefile
U    packages/dts/Makefile.fpc
U    packages/dts/Makefile
U    packages/univint/Makefile
U    packages/univint/Makefile.fpc
U    packages/cocoaint/Makefile
U    packages/cocoaint/Makefile.fpc
U    packages/rtl-console/Makefile
U    packages/rtl-console/Makefile.fpc
U    packages/gtk1/Makefile.fpc
U    packages/gtk1/Makefile
U    packages/ggi/Makefile.fpc
U    packages/ggi/Makefile
U    packages/gtk2/Makefile
U    packages/gtk2/Makefile.fpc
U    packages/odbc/Makefile
U    packages/odbc/Makefile.fpc
U    packages/morphunits/Makefile
U    packages/morphunits/Makefile.fpc
U    packages/gdbm/Makefile
U    packages/gdbm/Makefile.fpc
U    packages/pthreads/Makefile
U    packages/pthreads/Makefile.fpc
U    packages/fcl-json/Makefile
U    packages/fcl-json/Makefile.fpc
U    packages/amunits/Makefile.fpc
U    packages/amunits/Makefile
U    packages/unixutil/Makefile
U    packages/unixutil/Makefile.fpc
U    packages/lua/Makefile.fpc
U    packages/lua/Makefile
U    packages/pcap/Makefile.fpc
U    packages/pcap/Makefile
U    packages/fcl-image/Makefile.fpc
U    packages/fcl-image/Makefile
U    packages/numlib/Makefile
U    packages/numlib/Makefile.fpc
U    packages/winceunits/Makefile.fpc
U    packages/winceunits/Makefile
U    packages/pasjpeg/Makefile
U    packages/pasjpeg/Makefile.fpc
U    packages/zlib/Makefile.fpc
U    packages/zlib/Makefile
U    packages/fuse/Makefile
U    packages/fuse/Makefile.fpc
U    packages/iconvenc/Makefile
U    packages/iconvenc/Makefile.fpc
U    packages/chm/Makefile.fpc
U    packages/chm/Makefile
U    packages/libc/Makefile
U    packages/libc/Makefile.fpc
U    packages/x11/Makefile
U    packages/x11/Makefile.fpc
U    packages/pxlib/Makefile
U    packages/pxlib/Makefile.fpc
U    packages/fpindexer/Makefile
U    packages/fpindexer/Makefile.fpc
U    packages/libxml/Makefile.fpc
U    packages/libxml/Makefile
U    packages/imagemagick/Makefile
U    packages/imagemagick/Makefile.fpc
U    packages/objcrtl/Makefile
U    packages/objcrtl/Makefile.fpc
U    packages/oggvorbis/Makefile.fpc
U    packages/oggvorbis/Makefile
U    packages/users/Makefile.fpc
U    packages/users/Makefile
U    packages/fcl-xml/Makefile
U    packages/fcl-xml/Makefile.fpc
U    packages/fcl-fpcunit/Makefile.fpc
U    packages/fcl-fpcunit/Makefile
U    packages/fpgtk/Makefile.fpc
U    packages/fpgtk/Makefile
U    packages/libpng/Makefile
U    packages/libpng/Makefile.fpc
U    packages/fcl-async/Makefile
U    packages/fcl-async/Makefile.fpc
U    packages/fastcgi/Makefile.fpc
U    packages/fastcgi/Makefile
U    packages/fcl-process/Makefile
U    packages/fcl-process/Makefile.fpc
U    packages/syslog/Makefile.fpc
U    packages/syslog/Makefile
C    packages/pastojs/Makefile
U    packages/pastojs/Makefile.fpc
U    packages/rtl-unicode/Makefile
U    packages/rtl-unicode/Makefile.fpc
U    packages/rexx/Makefile.fpc
U    packages/rexx/Makefile
U    packages/fcl-passrc/Makefile.fpc
U    packages/fcl-passrc/Makefile
U    packages/cairo/Makefile
U    packages/cairo/Makefile.fpc
U    packages/cdrom/Makefile
U    packages/cdrom/Makefile.fpc
U    packages/postgres/Makefile
U    packages/postgres/Makefile.fpc
U    packages/modplug/Makefile.fpc
U    packages/modplug/Makefile
U    packages/fppkg/Makefile.fpc
U    packages/fppkg/Makefile
U    packages/fv/Makefile.fpc
U    packages/fv/Makefile
Summary of conflicts:
  Text conflicts: 2

# revisions: 29409

git-svn-id: branches/fixes_3_0@29414 -
2015-01-05 13:51:02 +00:00
joost
7c2295b83b * Avoid an unlimited loop when only one package is being installed
git-svn-id: trunk@29351 -
2014-12-28 15:42:05 +00:00
joost
164d5a4f38 * Added ability to build fpmakes with multiple packages
git-svn-id: trunk@29349 -
2014-12-28 13:28:46 +00:00
joost
6c29775e09 * Use separate repositories for each compiler
version by adding the version-number to the repository url

git-svn-id: trunk@29244 -
2014-12-10 09:50:12 +00:00
marco
6bcb46eb30 * adding dragonfly to packages, mantis #27091
git-svn-id: trunk@29215 -
2014-12-07 20:38:45 +00:00
joost
7b8aa4ef65 * Use .fpm files to search for installed packages
git-svn-id: trunk@29203 -
2014-12-04 20:14:27 +00:00
joost
6f5637888b * Read package-information from .fpm file, if available
git-svn-id: trunk@29202 -
2014-12-04 19:45:35 +00:00
joost
c1e89d0a83 * Not all compile-options are stored inside the unitconfigfile
anymore. So they have to be added.

git-svn-id: trunk@29175 -
2014-11-28 21:52:37 +00:00
joost
0574714317 * Use short 8.3 names for archives on limit83fs-hosts
git-svn-id: trunk@29174 -
2014-11-28 21:35:46 +00:00
joost
5fcb93234b * The fpunits.cfg files are replaced by files called <packagename>.fpm. They
are not installed into the unit-directory anymore, to avoid confusion for
   packages that do not have any units. They are installed in 
   <baseinstalldir>/fpmkinst/<target> instead.

git-svn-id: trunk@29119 -
2014-11-23 13:21:12 +00:00
Károly Balogh
da7efb8607 AROS: regenerated Makefiles to support i386-aros
git-svn-id: trunk@28438 -
2014-08-17 23:16:47 +00:00
michael
ff985ba97d * Fix use of exeext from wrong unit
git-svn-id: trunk@26750 -
2014-02-11 14:43:35 +00:00
yury
73c26bd6be * mipsel-android: Regenerated makefiles. From now the mipsel-android target can be built and used.
git-svn-id: trunk@26705 -
2014-02-07 12:37:17 +00:00
yury
f3b8fabf1b * Fixed const name.
git-svn-id: trunk@26704 -
2014-02-07 12:29:40 +00:00
yury
0aab9a8c21 * mipsel-android: Support in fpmkunit.
git-svn-id: trunk@26702 -
2014-02-07 12:22:59 +00:00
Tomas Hajny
77967432ef * always use forward slashes in path to fpmake similarly to paths to other tools in Makefiles
git-svn-id: trunk@26641 -
2014-02-01 00:11:09 +00:00
Tomas Hajny
e79246d6e6 * fix missing dependency of fppkg on fpmkunit (unnoticed on some targets due to dependency import via fcl-web)
git-svn-id: trunk@25613 -
2013-10-02 00:18:53 +00:00
florian
6377c180bf * disable packages which do not build on msdos
git-svn-id: trunk@25236 -
2013-08-11 16:12:34 +00:00
joost
df4191acb3 * 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 -
2013-06-02 17:55:23 +00:00
joost
6230494c20 * Let fppkg handle the dependency of fpkmunit on the libtar package
git-svn-id: trunk@24539 -
2013-05-20 19:52:28 +00:00
pierre
884918a4c4 Regenerate all Makefiles with an up-to-date fpcmake binary
git-svn-id: trunk@24365 -
2013-04-29 12:27:42 +00:00
joost
527c407b62 * Re-generated Makefiles for the changes in the Makefile.fpcs in r24349
git-svn-id: trunk@24350 -
2013-04-27 20:48:14 +00:00
joost
20a3809e58 * Now zipinstall is passed to fpmake by all Makefile.fpc's
git-svn-id: trunk@24349 -
2013-04-27 20:34:00 +00:00
svenbarth
9a26fc6994 For now revert the FixPath usage from "is a directory" to "is a path" as at least on Windows it doesn't work as intended. I'll need time to check this correctly (which I don't have today and tomorrow).
packages/fpmkunit/src/fpmkunit.pp:
  * change all FixPath(..., True) to FixPath(..., False) except those that replaced IncludeTrailingPathDelimiter
packages/fppkg/src/fpmkunitsrc.inc:
  * regenerate

git-svn-id: trunk@23804 -
2013-03-12 14:15:12 +00:00
svenbarth
5399fd6664 Regenerated fpmkunitsrc.inc after r23793
git-svn-id: trunk@23794 -
2013-03-11 20:48:23 +00:00
svenbarth
c6d9b56dbb Fix a problem with fppkg: the function FixPath is declared in fpmkunit and pkgglobals with different semantics. Now recently the fpmkunit was added to one of the fppkg units which resulted in the unit using fpmkunit's implementation instead of the one from pkgglobals. Because of list fppkg no longer worked correctly if paths without trailing path delimiter were used in the configuration files. To prevent further problems a new overloaded version was added with combined semantics of both original functions and these were deprecated.
fpmkunit/src/fpmkunit.pp:
	+ add FixPath overload with an AIsDir argument that appends a trailing path delimiter if missing (basically the behavior of pkgglobals.FixPath)
	* deprecate FixPath with only one parameter, but let it call the new overload
	* adjust all calls to FixPath depending on the context (most calls are directories, so the new behavior is a nice addition)
fppkg/src/pkgglobals.pp:
	* deprecate FixPath and let it call the FixPath variant from pkgglobals
fppkg/src/pkgoptions.pp:
	* adjust all calls to FixPath according to context

git-svn-id: trunk@23793 -
2013-03-11 20:44:46 +00:00
yury
23b95a4d70 * Regenerated all makefiles.
git-svn-id: branches/targetandroid@23422 -
2013-01-17 11:36:12 +00:00
yury
d26f0552a0 * Sync with trunk r23404.
* Regenerated makefiles.

git-svn-id: branches/targetandroid@23405 -
2013-01-16 13:21:51 +00:00
florian
eb7882037a * disable uncompilable targets for embedded targets
git-svn-id: trunk@23257 -
2012-12-31 15:51:04 +00:00
joost
b61960a0fb * Implemented BuildCPU, BuildOS en BuildString properties
git-svn-id: trunk@23007 -
2012-11-17 21:38:15 +00:00
joost
316717a710 * Re-generated all the Makefile.fpcs from the packages. So they are almost all the same now.
git-svn-id: trunk@23001 -
2012-11-17 00:18:50 +00:00
tom_at_work
9428c78d63 Pass OPT to compilation of fpmake.
Solves issues with systems that e.g. require special options for compilation of programs (e.g. libc programs to find libc startup code) or the actual build has been compiled with options that are incompatible with default ones.

Tested changes by building an i386-linux local build and i386-linux->arm-linux cross-builds

git-svn-id: trunk@22397 -
2012-09-15 23:41:44 +00:00
tom_at_work
7c56a9f34d Revert r22080 because it prevents crosscompilation.
git-svn-id: trunk@22101 -
2012-08-16 21:24:47 +00:00
tom_at_work
7b6bcd315f Pass FPCOPT to fpmkunit and fpmake compilation. This prevents build errors of these programs if the given FPCOPT options of the previously compiled RTL are incompatible to default options. Regenerated associated makefiles.
git-svn-id: trunk@22080 -
2012-08-14 19:09:17 +00:00
tom_at_work
810adb2f65 Merge with trunk r22040. Regenerated makefiles.
git-svn-id: branches/targetandroid@22046 -
2012-08-09 08:12:34 +00:00
joost
dde026f5d1 * Reverted file accidentally committed in r21957
git-svn-id: trunk@21960 -
2012-07-23 21:13:09 +00:00