C Makefile
C Makefile.fpc
--- Recording mergeinfo for merge of r49045 into '.':
U .
Summary of conflicts:
Text conflicts: 2
# revisions: 49045
r49045 | jonas | 2021-03-24 15:33:09 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/Makefile
M /trunk/Makefile.fpc
* support building with FPC 3.2.2
git-svn-id: branches/fixes_3_2@49384 -
------------------------------------------------------------------------
r48814 | pierre | 2021-02-26 17:15:30 +0000 (Fri, 26 Feb 2021) | 1 line
Do not add libgcc directory to library directories with -Fl option if -Xd option is used
------------------------------------------------------------------------
------------------------------------------------------------------------
r42843 | pierre | 2019-08-26 21:41:41 +0000 (Mon, 26 Aug 2019) | 1 line
Partial update for go32v2 and sources
------------------------------------------------------------------------
--- Merging r44112 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r44112 into '.':
G .
------------------------------------------------------------------------
r48836 | hajny | 2021-02-28 02:08:17 +0000 (Sun, 28 Feb 2021) | 1 line
* package tplylib added, corrections for more than 31 items on a tab
------------------------------------------------------------------------
--- Merging r48836 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r48836 into '.':
G .
------------------------------------------------------------------------
r49035 | pierre | 2021-03-22 23:26:26 +0000 (Mon, 22 Mar 2021) | 1 line
Try to fix short package name issues in install.dat and add missing go32v2 packages
------------------------------------------------------------------------
--- Merging r49035 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r49035 into '.':
G .
git-svn-id: branches/fixes_3_2@49041 -
U utils/fpcmkcfg/fpcmkcfg.pp
--- Recording mergeinfo for merge of r45794 into '.':
U .
# revisions: 45794
r45794 | florian | 2020-07-15 22:43:08 +0200 (Wed, 15 Jul 2020) | 1 line
Changed paths:
M /trunk/utils/fpcmkcfg/fpcmkcfg.pp
* set GCCLibPath for all architectures on linux as proposed in #37158, resolves#37158
git-svn-id: branches/fixes_3_2@47583 -
------------------------------------------------------------------------
r43103 | pierre | 2019-10-01 12:50:26 +0000 (Tue, 01 Oct 2019) | 1 line
Remove symbian from fppkg OS list
------------------------------------------------------------------------
--- Merging r43103 into '.':
C utils/fppkg/fpmake.pp
--- Recording mergeinfo for merge of r43103 into '.':
U .
Summary of conflicts:
Text conflicts: 1
git-svn-id: branches/fixes_3_2@46924 -
------------------------------------------------------------------------
r46442 | michael | 2020-08-15 09:26:44 +0200 (Sat, 15 Aug 2020) | 1 line
* unit alias possibility
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@46623 -
------------------------------------------------------------------------
r46311 | michael | 2020-08-08 09:48:48 +0200 (Sat, 08 Aug 2020) | 1 line
* Fix bug ID #0037516, only add extra uses to interface
------------------------------------------------------------------------
r46312 | michael | 2020-08-08 09:56:36 +0200 (Sat, 08 Aug 2020) | 1 line
* Add woNoAsm option
------------------------------------------------------------------------
r46313 | michael | 2020-08-08 10:00:15 +0200 (Sat, 08 Aug 2020) | 1 line
* Also use woNoAsm option for procedure body
------------------------------------------------------------------------
r46314 | michael | 2020-08-08 10:01:06 +0200 (Sat, 08 Aug 2020) | 1 line
* Fix bug #37519: no assembler
------------------------------------------------------------------------
r46315 | michael | 2020-08-08 10:35:54 +0200 (Sat, 08 Aug 2020) | 1 line
* Fix bug ID #37517; remove externa from record members
------------------------------------------------------------------------
r46316 | michael | 2020-08-08 10:55:14 +0200 (Sat, 08 Aug 2020) | 1 line
* Refactor disabling of hints and warnings. Add woSkipPrivateExternals
------------------------------------------------------------------------
r46317 | michael | 2020-08-08 10:55:36 +0200 (Sat, 08 Aug 2020) | 1 line
* Fix bug id #37515
------------------------------------------------------------------------
r46318 | michael | 2020-08-08 11:08:44 +0200 (Sat, 08 Aug 2020) | 1 line
* Add woAlwaysRecordHelper option
------------------------------------------------------------------------
r46319 | michael | 2020-08-08 11:09:18 +0200 (Sat, 08 Aug 2020) | 1 line
* Fix bug id #37514 : type helper not recognized
------------------------------------------------------------------------
r46320 | michael | 2020-08-08 11:12:37 +0200 (Sat, 08 Aug 2020) | 1 line
* Fix bug id #37513 : type helper declaration incomplete
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@46615 -
------------------------------------------------------------------------
r46230 | michael | 2020-08-04 15:56:43 +0200 (Tue, 04 Aug 2020) | 1 line
* Additional options for latest pas2js version features
------------------------------------------------------------------------
r46232 | michael | 2020-08-04 17:50:45 +0200 (Tue, 04 Aug 2020) | 1 line
* Set path to local version of fcl-passrc, not installed version
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@46603 -
------------------------------------------------------------------------
r45453 | michael | 2020-05-21 10:59:56 +0200 (Thu, 21 May 2020) | 1 line
* Fix use of defines
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@46600 -
------------------------------------------------------------------------
r45738 | pierre | 2020-07-07 12:52:24 +0000 (Tue, 07 Jul 2020) | 1 line
Avoid rewriting revision.inc if content is unchanged
------------------------------------------------------------------------
--- Merging r45738 into '.':
U utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r45738 into '.':
U .
git-svn-id: branches/fixes_3_2@45745 -
------------------------------------------------------------------------
r44311 | pierre | 2020-03-19 13:30:36 +0000 (Thu, 19 Mar 2020) | 1 line
Restore usage of revision.inc file, but do not print date and revision information into generated Makefile's
------------------------------------------------------------------------
--- Merging r44311 into '.':
U utils/fpcm/fpcmmain.pp
U utils/fpcm/fpcmwr.pp
--- Recording mergeinfo for merge of r44311 into '.':
U .
------------------------------------------------------------------------
r44314 | pierre | 2020-03-20 07:51:17 +0000 (Fri, 20 Mar 2020) | 1 line
Commit generated change to revision.inc file following commit #44311
------------------------------------------------------------------------
--- Merging r44314 into '.':
U utils/fpcm/revision.inc
--- Recording mergeinfo for merge of r44314 into '.':
G .
git-svn-id: branches/fixes_3_2@44315 -
U compiler/utils/samplecfg
U utils/fpcmkcfg/fppkg.cfg
U utils/fpcmkcfg/fppkg.inc
--- Recording mergeinfo for merge of r41184 into '.':
U .
git-svn-id: branches/fixes_3_2@44213 -
U rtl/linux/buildrtl.lpi
U rtl/linux/buildrtl.pp
--- Recording mergeinfo for merge of r43618 into '.':
U .
--- Merging r43669 into '.':
U utils/mkinsadd.pp
--- Recording mergeinfo for merge of r43669 into '.':
G .
# revisions: 43618,43669
git-svn-id: branches/fixes_3_2@43957 -
U packages/Makefile
U packages/Makefile.fpc
U utils/Makefile
U utils/Makefile.fpc
--- Recording mergeinfo for merge of r43892 into '.':
U .
git-svn-id: branches/fixes_3_2@43932 -
------------------------------------------------------------------------
r43562 | michael | 2019-11-23 09:03:12 +0100 (Sat, 23 Nov 2019) | 1 line
* Fix bug ID #0036335: console pops up when getting compiler info
------------------------------------------------------------------------
r43563 | michael | 2019-11-23 14:34:45 +0100 (Sat, 23 Nov 2019) | 1 line
* Report error with correct exit code
------------------------------------------------------------------------
r43564 | michael | 2019-11-23 14:40:49 +0100 (Sat, 23 Nov 2019) | 1 line
* Show --stop-on-parser-error in help
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43723 -
U compiler/systems/t_bsd.pas
U utils/fppkg/fpmake.pp
-- Aufzeichnung der Informationen für Zusammenführung von r43696 in ».«:
U .
git-svn-id: branches/fixes_3_2@43708 -
U .
--- Merging r43364 into '.':
U rtl/inc/exeinfo.pp
--- Recording mergeinfo for merge of r43364 into '.':
G .
--- Merging r43375 into '.':
U utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43375 into '.':
G .
--- Merging r43376 into '.':
U utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r43376 into '.':
G .
--- Merging r43381 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43381 into '.':
G .
--- Merging r43383 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43383 into '.':
G .
--- Merging r43386 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43386 into '.':
G .
# revisions: 41459,43364,43375,43376,43381,43383,43386
git-svn-id: branches/fixes_3_2@43446 -
U packages/fpmake_add.inc
U packages/fpmake_proc.inc
A packages/vcl-compat
A packages/vcl-compat/Makefile
A packages/vcl-compat/Makefile.fpc
A packages/vcl-compat/fpmake.pp
A packages/vcl-compat/src
A packages/vcl-compat/src/System.NetEncoding.pp
A packages/vcl-compat/tests
A packages/vcl-compat/tests/tcnetencoding.pp
A packages/vcl-compat/tests/testcompat.lpi
A packages/vcl-compat/tests/testcompat.lpr
--- Recording mergeinfo for merge of r42937 into '.':
U .
--- Merging r42939 into '.':
U packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r42939 into '.':
G .
--- Merging r42975 into '.':
U packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r42975 into '.':
G .
--- Merging r42976 into '.':
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42976 into '.':
G .
--- Merging r43058 into '.':
U utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r43058 into '.':
G .
--- Merging r43059 into '.':
U packages/graph/src/ptcgraph/ptcmouse.pp
U packages/ptc/docs/CHANGES.txt
U packages/ptc/src/ptcwrapper/ptcwrapper.pp
--- Recording mergeinfo for merge of r43059 into '.':
G .
--- Merging r43085 into '.':
G packages/vcl-compat/fpmake.pp
A packages/vcl-compat/src/system.netencoding.pp
D packages/vcl-compat/src/System.NetEncoding.pp
--- Recording mergeinfo for merge of r43085 into '.':
G .
--- Merging r43086 into '.':
G packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r43086 into '.':
G .
# revisions: 42937,42939,42975,42976,43058,43059,43085,43086
git-svn-id: branches/fixes_3_2@43173 -
U utils/instantfpc/instantfpc.pas
--- Recording mergeinfo for merge of r43026 into '.':
U .
--- Merging r43087 into '.':
U packages/hash/src/hmac.pp
--- Recording mergeinfo for merge of r43087 into '.':
G .
--- Merging r43091 into '.':
U packages/winunits-base/src/winhttp.pp
--- Recording mergeinfo for merge of r43091 into '.':
G .
--- Merging r43095 into '.':
G packages/winunits-base/src/winhttp.pp
--- Recording mergeinfo for merge of r43095 into '.':
G .
--- Merging r43097 into '.':
U rtl/unix/dl.pp
--- Recording mergeinfo for merge of r43097 into '.':
G .
--- Merging r43098 into '.':
G packages/winunits-base/src/winhttp.pp
--- Recording mergeinfo for merge of r43098 into '.':
G .
--- Merging r43117 into '.':
U packages/chm/src/chmwriter.pas
--- Recording mergeinfo for merge of r43117 into '.':
G .
# revisions: 43026,43087,43091,43095,43097,43098,43117
git-svn-id: branches/fixes_3_2@43172 -
U utils/ptopu.pp
--- Recording mergeinfo for merge of r43137 into '.':
U .
--- Merging r43141 into '.':
U packages/chm/src/htmlutil.pas
--- Recording mergeinfo for merge of r43141 into '.':
G .
--- Merging r43142 into '.':
U packages/libcurl/src/libcurl.pp
--- Recording mergeinfo for merge of r43142 into '.':
G .
--- Merging r43144 into '.':
U packages/rtl-objpas/fpmake.pp
A packages/rtl-objpas/src/inc/system.uitypes.pp
--- Recording mergeinfo for merge of r43144 into '.':
G .
# revisions: 43137,43141,43142,43144
git-svn-id: branches/fixes_3_2@43170 -
