Commit Graph

54590 Commits

Author SHA1 Message Date
pierre
d79fe2a393 Try to solve compilation failure for several system by
merge of revisions 43773, 43774 and 43775 from trunk to fixes_3_2
------------------------------------------------------------------------
r43773 | svenbarth | 2019-12-24 21:29:51 +0000 (Tue, 24 Dec 2019) | 1 line

* as long as the Comp type is declared, declare PComp as well
------------------------------------------------------------------------
--- Merging r43773 into '.':
U    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43773 into '.':
 U   .
------------------------------------------------------------------------
r43774 | svenbarth | 2019-12-24 21:29:53 +0000 (Tue, 24 Dec 2019) | 1 line

* if a CPU platform doesn't explicitely provide the Comp type we declare it as an alias to Int64
------------------------------------------------------------------------
--- Merging r43774 into '.':
G    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43774 into '.':
 G   .
------------------------------------------------------------------------
r43775 | svenbarth | 2019-12-24 21:29:57 +0000 (Tue, 24 Dec 2019) | 1 line

* Delphi allows overloading based on Comp, so declare it as a type rename instead of a mere alias
------------------------------------------------------------------------
--- Merging r43775 into '.':
G    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43775 into '.':
 G   .

git-svn-id: branches/fixes_3_2@43958 -
2020-01-16 15:37:19 +00:00
marco
b4f641ba85 --- Merging r43618 into '.':
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 -
2020-01-16 13:36:11 +00:00
marco
114fad8b83 --- Merging r43572 into '.':
A    .gitignore
--- Recording mergeinfo for merge of r43572 into '.':
 U   .
--- Merging r43581 into '.':
U    .gitignore
--- Recording mergeinfo for merge of r43581 into '.':
 G   .
--- Merging r43582 into '.':
G    .gitignore
--- Recording mergeinfo for merge of r43582 into '.':
 G   .
--- Merging r43916 into '.':
A    packages/ide/fpx64.lpi
--- Recording mergeinfo for merge of r43916 into '.':
 G   .

# revisions: 43572,43581,43582,43916

git-svn-id: branches/fixes_3_2@43956 -
2020-01-16 13:33:43 +00:00
marco
ab533f43aa # revisions: 43409,43473,43474,43482
git-svn-id: branches/fixes_3_2@43944 -
2020-01-14 13:28:25 +00:00
marco
1ead3be620 # revisions: 43009,43591,43772,43777,43778,43779,43780,43791,43792
git-svn-id: branches/fixes_3_2@43943 -
2020-01-14 10:51:13 +00:00
marco
fdb477df1e # revisions: 43566,43567,43568,43586,43629,43823
git-svn-id: branches/fixes_3_2@43941 -
2020-01-14 10:41:39 +00:00
marco
73d3bed3d1 # revisions: 43901
git-svn-id: branches/fixes_3_2@43940 -
2020-01-14 10:36:43 +00:00
joost
b068f8fe00 --- Merging r43892 into '.':
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 -
2020-01-13 21:38:28 +00:00
marco
700c4453df # revisions: 43361
git-svn-id: branches/fixes_3_2@43929 -
2020-01-13 19:53:00 +00:00
marco
09e568fb0f --- Merging r43324 into '.':
U    rtl/unix/genfdset.inc
--- Recording mergeinfo for merge of r43324 into '.':
 U   .
--- Merging r43389 into '.':
U    packages/ncurses/src/ncurses.pp
--- Recording mergeinfo for merge of r43389 into '.':
 G   .

# revisions: 43324,43389

git-svn-id: branches/fixes_3_2@43927 -
2020-01-13 11:20:22 +00:00
marco
0d0b4ebb4b --- Merging r43608 into '.':
U    packages/winunits-jedi/src/jediapilib.inc
--- Recording mergeinfo for merge of r43608 into '.':
 U   .

# revisions: 43608

git-svn-id: branches/fixes_3_2@43926 -
2020-01-13 11:18:39 +00:00
marco
21cdd55d9c --- Merging r43826 into '.':
U    rtl/objpas/sysutils/sysutilh.inc
U    rtl/objpas/sysutils/sysutils.inc
--- Recording mergeinfo for merge of r43826 into '.':
 U   .

# revisions: 43826

git-svn-id: branches/fixes_3_2@43925 -
2020-01-13 11:17:43 +00:00
marco
baf51cbab3 --- Merging r43857 into '.':
U    packages/fcl-image/src/fppixlcanv.pp
--- Recording mergeinfo for merge of r43857 into '.':
 U   .

# revisions: 43857

git-svn-id: branches/fixes_3_2@43924 -
2020-01-13 11:16:39 +00:00
marco
cb589a9201 --- Merging r43859 into '.':
U    packages/libtar/src/libtar.pp
--- Recording mergeinfo for merge of r43859 into '.':
 U   .

# revisions: 43859

git-svn-id: branches/fixes_3_2@43923 -
2020-01-13 11:14:03 +00:00
marco
46c900fbc7 --- Merging r42610 into '.':
U    rtl/netbsd/Makefile
U    rtl/netbsd/Makefile.fpc
--- Recording mergeinfo for merge of r42610 into '.':
 U   .

# revisions: 42610

git-svn-id: branches/fixes_3_2@43922 -
2020-01-13 11:13:25 +00:00
joost
2326437903 --- Merging r41797 into '.':
U    packages/fcl-registry/src/registry.pp
--- Recording mergeinfo for merge of r41797 into '.':
 U   .

git-svn-id: branches/fixes_3_2@43914 -
2020-01-11 21:20:26 +00:00
joost
f6a3ade0cb --- Merging r41325 into '.':
U    packages/fcl-registry/src/winreg.inc
A    tests/test/packages/fcl-registry/tw35060a.pp
A    tests/test/packages/fcl-registry/tw35060b.pp
--- Recording mergeinfo for merge of r41325 into '.':
 U   .
--- Merging r41352 into '.':
G    packages/fcl-registry/src/winreg.inc
--- Recording mergeinfo for merge of r41352 into '.':
 G   .
--- Merging r41415 into '.':
U    packages/fcl-registry/src/registry.pp
U    tests/test/packages/fcl-registry/tw35060a.pp
U    tests/test/packages/fcl-registry/tw35060b.pp
A    tests/test/packages/fcl-registry/tw35060c.pp
--- Recording mergeinfo for merge of r41415 into '.':
 G   .
--- Merging r41784 into '.':
U    packages/fcl-registry/src/regdef.inc
G    packages/fcl-registry/src/registry.pp
G    packages/fcl-registry/src/winreg.inc
U    packages/fcl-registry/src/xmlreg.pp
U    packages/fcl-registry/src/xregreg.inc
--- Recording mergeinfo for merge of r41784 into '.':
 G   .
--- Merging r41785 into '.':
A    packages/fcl-registry/examples/testunicode2.pp
--- Recording mergeinfo for merge of r41785 into '.':
 G   .

git-svn-id: branches/fixes_3_2@43903 -
2020-01-10 18:52:38 +00:00
joost
c833d621b7 --- Merging r41267 into '.':
U    packages/fcl-registry/src/registry.pp
U    packages/fcl-registry/src/winreg.inc
--- Recording mergeinfo for merge of r41267 into '.':
 U   .

git-svn-id: branches/fixes_3_2@43902 -
2020-01-10 18:46:12 +00:00
michael
75a8525c7f * Merging revisions 43802 from trunk:
------------------------------------------------------------------------
    r43802 | michael | 2019-12-28 15:10:59 +0100 (Sat, 28 Dec 2019) | 1 line
    
    * Fix bug ID #36486, add parameter to force use of largeint for sqlite
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43803 -
2019-12-28 16:19:14 +00:00
michael
a00ee7af19 * Merging revisions r43038 from trunk:
------------------------------------------------------------------------
    r43038 | michael | 2019-09-19 10:39:35 +0200 (Thu, 19 Sep 2019) | 1 line
    
    Call CurrentIndexBuf only once
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43763 -
2019-12-23 14:20:21 +00:00
michael
40d9899d65 * Merging revisions r43558 from trunk:
------------------------------------------------------------------------
    r43558 | michael | 2019-11-22 16:15:15 +0100 (Fri, 22 Nov 2019) | 1 line
    
    * Add column separator
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43762 -
2019-12-23 14:16:30 +00:00
michael
20b8a0c49b * Merged r43556,r43557
git-svn-id: branches/fixes_3_2@43761 -
2019-12-23 14:12:57 +00:00
michael
212399e2bb * Merging revisions r43557 from trunk:
------------------------------------------------------------------------
    r43557 | michael | 2019-11-22 15:44:14 +0100 (Fri, 22 Nov 2019) | 1 line
    
    * Add header row
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43760 -
2019-12-23 14:09:26 +00:00
michael
4875100e8a * Merging revisions r43556 from trunk:
------------------------------------------------------------------------
    r43556 | michael | 2019-11-22 15:25:35 +0100 (Fri, 22 Nov 2019) | 1 line
    
    * Add boolean field length correction
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43759 -
2019-12-23 14:06:48 +00:00
michael
bafc953874 * Merging revisions r43713 from trunk:
------------------------------------------------------------------------
    r43713 | michael | 2019-12-23 14:05:59 +0100 (Mon, 23 Dec 2019) | 1 line
    
    * Fix writing of special chars (bug ID 0036470)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43758 -
2019-12-23 14:05:27 +00:00
michael
030c65ec38 * Fixed merge conflicts
git-svn-id: branches/fixes_3_2@43757 -
2019-12-23 14:04:40 +00:00
michael
f55addba35 * Fixed merge conflicts
git-svn-id: branches/fixes_3_2@43756 -
2019-12-23 14:04:31 +00:00
michael
b8a22b8e6d * Merging revisions r43507 from trunk:
------------------------------------------------------------------------
    r43507 | michael | 2019-11-17 10:33:03 +0100 (Sun, 17 Nov 2019) | 1 line
    
    * Accidentally  made all published properties protected
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43755 -
2019-12-23 13:59:58 +00:00
michael
b355df88ad * Merging revisions r43513 from trunk:
------------------------------------------------------------------------
    r43513 | michael | 2019-11-18 17:00:03 +0100 (Mon, 18 Nov 2019) | 1 line
    
    * Treat 3.2 as 3.0.4
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43754 -
2019-12-23 13:49:57 +00:00
michael
5594fb1cc3 * Merging revisions r43714 from trunk:
------------------------------------------------------------------------
    r43714 | michael | 2019-12-23 14:15:19 +0100 (Mon, 23 Dec 2019) | 1 line
    
    * Fix bug ID #34303, readability opimizations
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43753 -
2019-12-23 13:45:48 +00:00
michael
bc1966c1dc * Merging revisions r43482 from trunk:
------------------------------------------------------------------------
    r43482 | michael | 2019-11-15 17:57:13 +0100 (Fri, 15 Nov 2019) | 1 line
    
    * Fix compilation with 3.0.4
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43752 -
2019-12-23 13:44:40 +00:00
michael
582fd28d5c * Merging revisions r43477,r43483 from trunk:
------------------------------------------------------------------------
    r43477 | michael | 2019-11-15 15:40:48 +0100 (Fri, 15 Nov 2019) | 1 line
    
    * Fix bug ID #0027891, newer version compaible with 1.3.14
    ------------------------------------------------------------------------
    r43483 | michael | 2019-11-15 18:40:58 +0100 (Fri, 15 Nov 2019) | 1 line
    
    * Forgot to commit
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43751 -
2019-12-23 13:44:29 +00:00
michael
9e36aec7b1 * Merging revisions r43474 from trunk:
------------------------------------------------------------------------
    r43474 | michael | 2019-11-15 15:26:12 +0100 (Fri, 15 Nov 2019) | 1 line
    
    * avoid warning about visibility of ItemIsmanaged
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43750 -
2019-12-23 13:43:54 +00:00
michael
a51130badd * Merging revisions r43473 from trunk:
------------------------------------------------------------------------
    r43473 | michael | 2019-11-15 15:12:11 +0100 (Fri, 15 Nov 2019) | 1 line
    
    * Fix bug #0036270: optimize TFPSList.AddList and .Assign
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43749 -
2019-12-23 13:43:40 +00:00
michael
dccde4e0df * Merging revisions r43468 from trunk:
------------------------------------------------------------------------
    r43468 | michael | 2019-11-15 12:33:19 +0100 (Fri, 15 Nov 2019) | 1 line
    
    * Fix bug ID #36303, change russian comment with english
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43748 -
2019-12-23 13:42:33 +00:00
michael
385d0ab62f * Merging revisions r43454 from trunk:
------------------------------------------------------------------------
    r43454 | michael | 2019-11-12 14:04:07 +0100 (Tue, 12 Nov 2019) | 1 line
    
    * Fix bug #36284: small refactoring
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43747 -
2019-12-23 13:42:07 +00:00
michael
cbaf231b47 * Merging revisions r43435 from trunk:
------------------------------------------------------------------------
    r43435 | michael | 2019-11-10 11:12:05 +0100 (Sun, 10 Nov 2019) | 1 line
    
    * Fix compilation for windows
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43746 -
2019-12-23 13:41:42 +00:00
michael
4c6149e1fd * Merging revisions r43417 from trunk:
------------------------------------------------------------------------
    r43417 | michael | 2019-11-08 12:43:10 +0100 (Fri, 08 Nov 2019) | 1 line
    
    * Bit helpers for ordinal functions, adapted from batch by Thaddy De Koning (bug ID 0036146)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43745 -
2019-12-23 13:38:27 +00:00
michael
18e1a2db97 * Merging revisions r43416 from trunk:
------------------------------------------------------------------------
    r43416 | michael | 2019-11-08 10:31:45 +0100 (Fri, 08 Nov 2019) | 1 line
    
    * Observe doclear
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43744 -
2019-12-23 13:38:07 +00:00
michael
a7c884aea0 * Merging revisions r43415 from trunk:
------------------------------------------------------------------------
    r43415 | michael | 2019-11-08 10:21:08 +0100 (Fri, 08 Nov 2019) | 1 line
    
    * Refactor AddDelimitedText/SetDelimitedText
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43743 -
2019-12-23 13:37:58 +00:00
michael
32b9d91358 * Merging revisions r43414 from trunk:
------------------------------------------------------------------------
    r43414 | michael | 2019-11-08 09:36:31 +0100 (Fri, 08 Nov 2019) | 1 line
    
    * Reduce use of Length(aValue) in setdelimitedtext
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43742 -
2019-12-23 13:37:46 +00:00
michael
c99c6a45c2 * Merging revisions r43405 from trunk:
------------------------------------------------------------------------
    r43405 | michael | 2019-11-06 11:51:34 +0100 (Wed, 06 Nov 2019) | 1 line
    
    * Add AddDelimitedText,AddCommatext by Werner Pamler (bug ID 36249)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43741 -
2019-12-23 13:37:31 +00:00
michael
469350538a * Merging revisions r43404 from trunk:
------------------------------------------------------------------------
    r43404 | michael | 2019-11-06 11:42:11 +0100 (Wed, 06 Nov 2019) | 1 line
    
    * Fix bug ID #0036268, more descriptive comment
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43740 -
2019-12-23 13:36:48 +00:00
michael
0678bdf90b * Merging revisions r43365 from trunk:
------------------------------------------------------------------------
    r43365 | michael | 2019-11-02 16:08:27 +0100 (Sat, 02 Nov 2019) | 1 line
    
    * Add some functional methods to TStrings
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43739 -
2019-12-23 13:34:43 +00:00
michael
7c51d49c61 * Merging revisions r43363 from trunk:
------------------------------------------------------------------------
    r43363 | michael | 2019-11-02 15:35:18 +0100 (Sat, 02 Nov 2019) | 1 line
    
    * Fix bug ID #36248
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43738 -
2019-12-23 13:34:27 +00:00
michael
29550e5633 * Merging revisions r43362 from trunk:
------------------------------------------------------------------------
    r43362 | michael | 2019-11-02 15:33:19 +0100 (Sat, 02 Nov 2019) | 1 line
    
    * Forgot to commit
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43737 -
2019-12-23 13:34:17 +00:00
michael
13a835b99f * Merging revisions r43360 from trunk:
------------------------------------------------------------------------
    r43360 | michael | 2019-11-02 14:07:34 +0100 (Sat, 02 Nov 2019) | 1 line
    
    * Fix bug #36244
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43736 -
2019-12-23 13:34:04 +00:00
michael
0e58449360 * Merging revisions r43357 from trunk:
------------------------------------------------------------------------
    r43357 | michael | 2019-11-02 12:51:28 +0100 (Sat, 02 Nov 2019) | 1 line
    
    * Fix bug ID #36234: unicodedatastering must be of type unicodestring
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43735 -
2019-12-23 13:33:47 +00:00
michael
04f887dbaf * Merging revisions r43356 from trunk:
------------------------------------------------------------------------
    r43356 | michael | 2019-11-02 12:42:32 +0100 (Sat, 02 Nov 2019) | 1 line
    
    * Explicitly use UTF8, fix bug ID #36231: RTF export must write unicode chars escaped
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43734 -
2019-12-23 13:33:34 +00:00
michael
357d54b94d * Merging revisions r43355 from trunk:
------------------------------------------------------------------------
    r43355 | michael | 2019-11-02 12:17:37 +0100 (Sat, 02 Nov 2019) | 1 line
    
    * Fix case where table streams are nil
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43733 -
2019-12-23 13:33:18 +00:00