mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-17 11:39:33 +02:00
95202dc8c4
1835 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
marco
|
95202dc8c4 |
# revisions: 42759,42769,42770,42771,42811,42818,42819,42824,42826,42827,42828,42830,42866,42869,42870,42874,42877,42878,42880,42881,42889,42890,42893,42894,42895,42896,42918,42948,42950,42951,42952,42953,42954,43020,43021,43031,43032,43049,43050,43051,43052,43053,43056,43057,43077,43078,43079,43084,43090,43099,43101,43145,43146,43147,43148,43149,43150,43151,43159,43160,43161,43164,43166,43168
git-svn-id: branches/fixes_3_2@43379 - |
||
|
marco
|
4e1f4bf7a1 |
# revisions: 42502,42503,42504,42505,42506,42517,42518,42523,42524,42529,42532,42534,42544,42576,42577,42578,42592,42598,42599,42602,42608,42623,42624,42640,42644,42663,42664,42669,42678,42680,42688,42689,42690,42702,42703,42704,42712,42714,42715,42716,42721,42735,42736,,42502,42503,42504,42505,42506,42517,42518,42523,42524,42529,42532,42534,42544
git-svn-id: branches/fixes_3_2@43378 - |
||
|
marco
|
46f3f08f6a |
# revisions: 41903,42177,42217,42218,42227,42251,42252,42258,42287,42288,42289,42290,42291,42292,42293,42310,42347,42348,42355,42445,42450,42451,42453,42454,42462,42465,42466,42468,42472,42473,42474,42475
git-svn-id: branches/fixes_3_2@43377 - |
||
|
marco
|
65ae9d2413 |
* merge revs
git-svn-id: branches/fixes_3_2@43196 - |
||
|
marco
|
df577ea8a7 |
--- Merging r42937 into '.':
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 - |
||
|
marco
|
5ab703bffd |
--- Merging r43026 into '.':
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 - |
||
|
marco
|
8349a39d6e |
--- Merging r43137 into '.':
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 - |
||
|
michael
|
5e6081f217 |
* Merging revisions 42789,42790,42791,42792,42793 from trunk:
------------------------------------------------------------------------
r42789 | michael | 2019-08-24 11:53:00 +0200 (Sat, 24 Aug 2019) | 1 line
* Write version option in help
------------------------------------------------------------------------
r42790 | michael | 2019-08-24 11:53:23 +0200 (Sat, 24 Aug 2019) | 1 line
* V2 is default
------------------------------------------------------------------------
r42791 | michael | 2019-08-24 11:53:43 +0200 (Sat, 24 Aug 2019) | 1 line
* Add src to path
------------------------------------------------------------------------
r42792 | michael | 2019-08-24 11:54:52 +0200 (Sat, 24 Aug 2019) | 1 line
* TSQLConnector GetNextValueSQL must call proxy implementation
------------------------------------------------------------------------
r42793 | michael | 2019-08-24 11:55:28 +0200 (Sat, 24 Aug 2019) | 1 line
* Dependencies no longer needed
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@42846 -
|
||
|
michael
|
63ac2d6b54 |
* Merging revisions 42783,42784,42785,42786,42787,42788 from trunk:
------------------------------------------------------------------------
r42783 | michael | 2019-08-24 11:34:41 +0200 (Sat, 24 Aug 2019) | 1 line
CreateJSON2ErrorResponse now clones ID parameter instead of consuming it (bug ID 35999)
------------------------------------------------------------------------
r42784 | michael | 2019-08-24 11:35:47 +0200 (Sat, 24 Aug 2019) | 1 line
* Safety for empty asJSON. Should not happen, but better safe than sorry
------------------------------------------------------------------------
r42785 | michael | 2019-08-24 11:50:07 +0200 (Sat, 24 Aug 2019) | 1 line
* Take into account skipped
------------------------------------------------------------------------
r42786 | michael | 2019-08-24 11:51:13 +0200 (Sat, 24 Aug 2019) | 1 line
* Add FPC define, check for unit for short description
------------------------------------------------------------------------
r42787 | michael | 2019-08-24 11:52:04 +0200 (Sat, 24 Aug 2019) | 1 line
* Allow aliases
------------------------------------------------------------------------
r42788 | michael | 2019-08-24 11:52:27 +0200 (Sat, 24 Aug 2019) | 1 line
* Allow aliases
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@42845 -
|
||
|
michael
|
075eedd75a |
* Merging revisions r42028,42062,42139 from trunk:
------------------------------------------------------------------------
r42028 | marco | 2019-05-10 17:11:48 +0200 (Fri, 10 May 2019) | 2 lines
* realgetwindowclass, mantis 035551
------------------------------------------------------------------------
r42062 | michael | 2019-05-14 10:36:52 +0200 (Tue, 14 May 2019) | 1 line
* Patch from Ondrej to remove unnecessary overload keywords
------------------------------------------------------------------------
r42139 | michael | 2019-05-30 18:24:20 +0200 (Thu, 30 May 2019) | 1 line
* Remove debug file writing
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@42427 -
|
||
|
marco
|
5daebe5544 |
--- Merging r42129 into '.':
G packages/chm/src/chmsitemap.pas --- Recording mergeinfo for merge of r42129 into '.': G . --- Merging r42137 into '.': G packages/chm/src/chmreader.pas --- Recording mergeinfo for merge of r42137 into '.': G . --- Merging r42138 into '.': G utils/fpdoc/dw_htmlchm.inc --- Recording mergeinfo for merge of r42138 into '.': G . --- Merging r42140 into '.': G utils/fpdoc/dw_htmlchm.inc --- Recording mergeinfo for merge of r42140 into '.': G . --- Merging r42141 into '.': G utils/fpdoc/dw_htmlchm.inc --- Recording mergeinfo for merge of r42141 into '.': G . --- Merging r42142 into '.': G packages/chm/src/chmfilewriter.pas G packages/chm/src/chmwriter.pas --- Recording mergeinfo for merge of r42142 into '.': G . --- Merging r42156 into '.': G packages/chm/src/chmfilewriter.pas U packages/chm/src/chmtypes.pas --- Recording mergeinfo for merge of r42156 into '.': G . # revisions: 42129,42137,42138,42140,42141,42142,42156 git-svn-id: branches/fixes_3_2@42306 - |
||
|
pierre
|
12c54a62e7 |
Update all Makefile's to enable x86_64-haiku target
git-svn-id: branches/fixes_3_2@42135 - |
||
|
pierre
|
438d62924c |
Update revision information in utils/fpcm/revision.inc file after previous commit
git-svn-id: branches/fixes_3_2@42134 - |
||
|
pierre
|
17d0f31119 |
+ Enabling of x86_64-hziku target in fixes_3_2 compiler branch by merging of commits #40753 and 40756.
------------------------------------------------------------------------ r40753 | karoly | 2019-01-04 02:16:24 +0000 (Fri, 04 Jan 2019) | 1 line haiku-x86_64: add target to the compiler and ppudump, enable it in fpmake and fpcmake ------------------------------------------------------------------------ --- Merging r40753 into '.': U compiler/options.pas U compiler/systems/i_haiku.pas U compiler/systems/t_haiku.pas U compiler/systems.inc U compiler/utils/ppuutils/ppudump.pp U compiler/x86/agx86att.pas U compiler/x86_64/cpuelf.pas U compiler/x86_64/cputarg.pas U utils/fpcm/fpcmmain.pp --- Recording mergeinfo for merge of r40753 into '.': U . ------------------------------------------------------------------------ r40756 | karoly | 2019-01-04 03:00:03 +0000 (Fri, 04 Jan 2019) | 1 line haiku: linker support code for internal sysinit and make the x86_64 port use it ------------------------------------------------------------------------ --- Merging r40756 into '.': G compiler/systems/t_haiku.pas U compiler/systems.pas --- Recording mergeinfo for merge of r40756 into '.': G . git-svn-id: branches/fixes_3_2@42133 - |
||
|
pierre
|
e1afc90ef4 |
Add missing change from commit 41150 to fix jvm-android compilation
git-svn-id: branches/fixes_3_2@42011 - |
||
|
marco
|
ae432bf0e6 |
# revisions: 40515,40687,40689,40690,40705,40711,40748,41197,41220,41226,41418,41742,41771,41848,41860,41946
git-svn-id: branches/fixes_3_2@42002 - |
||
|
marco
|
35109f800d |
# revisions: 40925
git-svn-id: branches/fixes_3_2@41999 - |
||
|
marco
|
7e85b53c0a |
# revisions: 41707,41713,41714,41715,41719,41720,41732,41786,41787,41788,41792,41805,41806,41808,41809,41823,41824,41825,41840,41850,41851,41856,41862,41863,41864,41872,41876,41897,41931
git-svn-id: branches/fixes_3_2@41998 - |
||
|
marco
|
0fa5c1b1e3 |
# revisions: 41456,41461,41465,41466,41467,41468,41473,41478,41479,41480,41482,41483,41494,41495,41496,41500,41501,41502,41503,41504,41505,41527,41528,41529,41530,41542,41557,41558,41561,41572,41573,41581,41582,41583,41585,41586,41587,41590,41593,41594,41598,41600,41603,41611,41617,41618,41619,41621,41622,41623,41624,41630,41631,41632,41633,41634,41657,41658,41661,41663,41664,41665,41666,41676,41680,41681,41684,41690,41691,41694
git-svn-id: branches/fixes_3_2@41997 - |
||
|
marco
|
3dc0752bf5 |
# revisions: 41022,41023,41024,41025,41026,41046,41058,41062,41063,41064,41066,41067,41075,41078,41082,41083,41084,41086,41087,41123,41124,41125,41132,41144,41145,41147,41148,41149,41151,41152,41154,41155,41156,41157,41162,41188,41189,41190,41192,41218,41221,41223,41224,41225,41234,41235,41238,41239,41244,41246,41251,41252,41255,41256,41257,41259,41270,41272,41273,41275,41276,41278,41279,41292,41293,41294,41295,41297,41298,41300,41301,41302,41303,41304,41312,41313,41319,41326,41327,41328,41329,41333,41338,41339,41340,41344,41346,41348,41350,41358,41359,41360,41361,41362,41364,41365,41378,41386,41387,41388,41389,41390,41392,41426,41427,41430,41431,41433,41434,41435,41436,41437,41438,41439,41440
git-svn-id: branches/fixes_3_2@41996 - |
||
|
marco
|
5611e2f10b |
# revisions: 40806,40807,40808,40809,40819,40846,40847,40859,40869,40870,40871,40872,40881,40882,40886
git-svn-id: branches/fixes_3_2@41994 - |
||
|
marco
|
586398ad41 |
# revisions: 40446,40447,40450,40451,40452,40455,40456,40457,40458,40459,40460,40461,40469,40470,40471,40473,40474,40475,40476,40477,40478,40479,40483,40484,40486,40487,40488,40489,40491,40493,40494,40495,40505,40506,40507,40508,40509,40514,40516,40517,40518,40522,40523,40530,40531,40533,40534,40549,40550,40551,40553,40554,40555,40558,40559,40562,40580,40582,40584,40591,40593,40594,40596,40597,40620,40638,40639,40650,40659,40671,40672,40674,40675,40685,40691,40708,40712,40714,40715,40722,40768,40795,40796,40797,40799
git-svn-id: branches/fixes_3_2@41993 - |
||
|
marco
|
498d95c761 |
# revisions: 41693
git-svn-id: branches/fixes_3_2@41986 - |
||
|
marco
|
a2c770effc |
* fpcm and revision.inc merges.
git-svn-id: branches/fixes_3_2@41936 - |
||
|
marco
|
499df41c28 |
--- Merging r40529 into '.':
U rtl/objpas/sysutils/sysstr.inc U rtl/objpas/sysutils/sysstrh.inc --- Recording mergeinfo for merge of r40529 into '.': U . --- Merging r40548 into '.': U rtl/unix/unix.pp --- Recording mergeinfo for merge of r40548 into '.': G . --- Merging r40803 into '.': U utils/ptopu.pp --- Recording mergeinfo for merge of r40803 into '.': G . --- Merging r40818 into '.': U packages/openssl/src/openssl.pas --- Recording mergeinfo for merge of r40818 into '.': G . --- Merging r40838 into '.': G packages/openssl/src/openssl.pas --- Recording mergeinfo for merge of r40838 into '.': G . --- Merging r40841 into '.': U packages/fcl-res/src/coffwriter.pp --- Recording mergeinfo for merge of r40841 into '.': G . --- Merging r40908 into '.': U rtl/inc/getopts.pp --- Recording mergeinfo for merge of r40908 into '.': G . --- Merging r41085 into '.': U rtl/objpas/sysutils/syswide.inc U rtl/objpas/sysutils/syswideh.inc --- Recording mergeinfo for merge of r41085 into '.': G . --- Merging r41263 into '.': U packages/rtl-objpas/src/inc/strutils.pp --- Recording mergeinfo for merge of r41263 into '.': G . --- Merging r41331 into '.': U rtl/objpas/classes/parser.inc --- Recording mergeinfo for merge of r41331 into '.': G . --- Merging r41332 into '.': U packages/fcl-xml/src/xmlconf.pp --- Recording mergeinfo for merge of r41332 into '.': G . # revisions: 40529,40548,40803,40818,40838,40841,40908,41085,41263,41331,41332 r40529 | michael | 2018-12-12 09:29:24 +0100 (Wed, 12 Dec 2018) | 1 line Changed paths: M /trunk/rtl/objpas/sysutils/sysstr.inc M /trunk/rtl/objpas/sysutils/sysstrh.inc Added overloads UintToStr for Delphi compatbibility (bug ID 0034690) r40548 | michael | 2018-12-14 11:00:44 +0100 (Fri, 14 Dec 2018) | 1 line Changed paths: M /trunk/rtl/unix/unix.pp * Fix bug #0034499 r40803 | michael | 2019-01-08 04:55:32 +0100 (Tue, 08 Jan 2019) | 1 line Changed paths: M /trunk/utils/ptopu.pp * Applied patch by Bart Broersma to fix bug ID #34277 r40818 | michael | 2019-01-09 16:04:04 +0100 (Wed, 09 Jan 2019) | 1 line Changed paths: M /trunk/packages/openssl/src/openssl.pas * Add PEM_write_bio_PKCS7, bug ID #0034842 r40838 | michael | 2019-01-10 23:11:33 +0100 (Thu, 10 Jan 2019) | 1 line Changed paths: M /trunk/packages/openssl/src/openssl.pas * Fix stack overflow r40841 | michael | 2019-01-11 11:53:45 +0100 (Fri, 11 Jan 2019) | 1 line Changed paths: M /trunk/packages/fcl-res/src/coffwriter.pp * Call inherited constructor r40908 | michael | 2019-01-19 17:35:30 +0100 (Sat, 19 Jan 2019) | 1 line Changed paths: M /trunk/rtl/inc/getopts.pp * Fix bug ID #19842 using patch from Bart Broersma r41085 | marco | 2019-01-27 15:52:52 +0100 (Sun, 27 Jan 2019) | 2 lines Changed paths: M /trunk/rtl/objpas/sysutils/syswide.inc M /trunk/rtl/objpas/sysutils/syswideh.inc * unicode version of isleadchar. utf8 still to follow, see #34754 r41263 | marco | 2019-02-09 13:31:15 +0100 (Sat, 09 Feb 2019) | 2 lines Changed paths: M /trunk/packages/rtl-objpas/src/inc/strutils.pp * Patch from Serge Anvarov with missing strutils aliases. Mantis #35047 r41331 | michael | 2019-02-16 09:39:40 +0100 (Sat, 16 Feb 2019) | 1 line Changed paths: M /trunk/rtl/objpas/classes/parser.inc Fix bug ID #35086: TParser should reset position (tentative) r41332 | michael | 2019-02-16 09:50:13 +0100 (Sat, 16 Feb 2019) | 1 line Changed paths: M /trunk/packages/fcl-xml/src/xmlconf.pp * Fix bug ID #34854 git-svn-id: branches/fixes_3_2@41923 - |
||
|
yury
|
cd3d2c2abc |
Merged revision(s) 41314, 41320, 41323, 41371, 41374, 41391, 41396 from trunk:
* pas2jni: Added GetMemoryAsArray() and SetMemoryFromArray() utility functions. ........ * pas2jni: Removed obsolete code. ........ * pas2jni: Accept partial names in inclusion/exclusion lists. Use wildcard * at the end of a partial name. ........ * pas2jni: Properly handle Java exceptions when calling a callback Java method. ........ * pas2jni: Return null if a method pointer is empty. ........ * pas2jni: Fixed handling of array variables. * pas2jni: Fixed Java warning for the PascalInterface class. ........ * pas2jni: Fixed exception handling. ........ git-svn-id: branches/fixes_3_2@41614 - |
||
|
Jonas Maebe
|
3ac703506c |
* rest of the previous accidental partial commit
git-svn-id: branches/fixes_3_2@41250 - |
||
|
pierre
|
9e0530caa8 |
Group merge of changes to fpmake.pp for pacakges and utils
with fpmkunit change.
------------------------------------------------------------------------
r40365 | pierre | 2018-11-24 15:14:57 +0000 (Sat, 24 Nov 2018) | 4 lines
+ Add Debug message when resource file is found, but not registered.
+ Add missing "T.ResourceStrings:=True;" for all source units
that generate the new debug message above.
------------------------------------------------------------------------
--- Merging r40365 into '.':
U packages/mysql/fpmake.pp
U packages/fcl-base/fpmake.pp
U packages/fcl-web/fpmake.pp
U packages/fcl-db/fpmake.pp
U packages/fcl-pdf/fpmake.pp
U packages/fcl-image/fpmake.pp
U packages/pastojs/fpmake.pp
U packages/fcl-passrc/fpmake.pp
U packages/rtl-objpas/fpmake.pp
U packages/openssl/fpmake.pp
U packages/winunits-base/fpmake.pp
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r40365 into '.':
U .
------------------------------------------------------------------------
r40391 | pierre | 2018-11-28 23:45:35 +0000 (Wed, 28 Nov 2018) | 1 line
Add several missing unit references in fpmake files
------------------------------------------------------------------------
--- Merging r40391 into '.':
U utils/pas2ut/fpmake.pp
U utils/fpdoc/fpmake.pp
U utils/pas2js/fpmake.pp
U utils/fppkg/fpmake.pp
U utils/fpcmkcfg/fpmake.pp
U utils/fpmake.pp
U utils/unicode/fpmake.pp
--- Recording mergeinfo for merge of r40391 into '.':
G .
------------------------------------------------------------------------
r40899 | pierre | 2019-01-19 10:26:51 +0000 (Sat, 19 Jan 2019) | 1 line
Activate fpc-web package for android OS, except for jvm compiler
------------------------------------------------------------------------
--- Merging r40899 into '.':
G packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r40899 into '.':
G .
------------------------------------------------------------------------
r41069 | pierre | 2019-01-25 12:58:21 +0000 (Fri, 25 Jan 2019) | 1 line
Disable targets that do not support fcl-base for utils packages that need fcl-base
------------------------------------------------------------------------
--- Merging r41069 into '.':
G utils/pas2ut/fpmake.pp
G utils/fpdoc/fpmake.pp
U utils/json2pas/fpmake.pp
U utils/fpcreslipo/fpmake.pp
G utils/fpcmkcfg/fpmake.pp
G utils/fpmake.pp
U utils/fpcres/fpmake.pp
U utils/fpcm/fpmake.pp
G utils/unicode/fpmake.pp
U utils/pas2fpm/fpmake.pp
U utils/instantfpc/fpmake.pp
U utils/importtl/fpmake.pp
--- Recording mergeinfo for merge of r41069 into '.':
G .
------------------------------------------------------------------------
r41070 | pierre | 2019-01-25 14:39:12 +0000 (Fri, 25 Jan 2019) | 1 line
Enable paszlib package and disable utils/fpcm and utils/fpcmkcfg for nativent OS
------------------------------------------------------------------------
--- Merging r41070 into '.':
U packages/paszlib/fpmake.pp
G utils/fpcmkcfg/fpmake.pp
G utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r41070 into '.':
G .
------------------------------------------------------------------------
r41076 | pierre | 2019-01-26 10:17:58 +0000 (Sat, 26 Jan 2019) | 1 line
Also use installed ppudump for ppu testing in utils directory
------------------------------------------------------------------------
--- Merging r41076 into '.':
U utils/Makefile.fpc
U utils/Makefile
--- Recording mergeinfo for merge of r41076 into '.':
G .
------------------------------------------------------------------------
r41104 | pierre | 2019-01-28 17:43:15 +0000 (Mon, 28 Jan 2019) | 1 line
-Xr is also supported for systems_android
------------------------------------------------------------------------
--- Merging r41104 into '.':
U compiler/options.pas
--- Recording mergeinfo for merge of r41104 into '.':
G .
------------------------------------------------------------------------
r41106 | pierre | 2019-01-29 09:01:42 +0000 (Tue, 29 Jan 2019) | 1 line
Disable jvm-android and jvm-java targets for fprcp, h2pas and tply packages because they use memory allocation or fpc_get_output
------------------------------------------------------------------------
--- Merging r41106 into '.':
U utils/fprcp/fpmake.pp
U utils/h2pas/fpmake.pp
U utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41106 into '.':
G .
------------------------------------------------------------------------
r41119 | pierre | 2019-01-29 13:46:43 +0000 (Tue, 29 Jan 2019) | 1 line
Disable palmos in fprcp, h2pas and tply packages
------------------------------------------------------------------------
--- Merging r41119 into '.':
G utils/fprcp/fpmake.pp
G utils/h2pas/fpmake.pp
G utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41119 into '.':
G .
------------------------------------------------------------------------
r41120 | pierre | 2019-01-29 14:08:03 +0000 (Tue, 29 Jan 2019) | 1 line
Disable fprcp, h2pas and tply pacakges for msdos and win16 because the programs are too big
------------------------------------------------------------------------
--- Merging r41120 into '.':
G utils/fprcp/fpmake.pp
G utils/h2pas/fpmake.pp
G utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41120 into '.':
G .
------------------------------------------------------------------------
r41121 | pierre | 2019-01-29 14:17:53 +0000 (Tue, 29 Jan 2019) | 1 line
Disable atari target for fpcm and fpcmkcfg because it depends on unsupported fpmkunit package
------------------------------------------------------------------------
--- Merging r41121 into '.':
G utils/fpcmkcfg/fpmake.pp
G utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r41121 into '.':
G .
------------------------------------------------------------------------
r41122 | pierre | 2019-01-29 14:32:28 +0000 (Tue, 29 Jan 2019) | 1 line
Disable some packages for avr-embedded and i8086-embedded targets
------------------------------------------------------------------------
--- Merging r41122 into '.':
G utils/fprcp/fpmake.pp
G utils/h2pas/fpmake.pp
G utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41122 into '.':
G .
------------------------------------------------------------------------
r41142 | pierre | 2019-01-30 12:55:04 +0000 (Wed, 30 Jan 2019) | 1 line
Disable jvm-android as fcl-json is not supported for this target
------------------------------------------------------------------------
--- Merging r41142 into '.':
G utils/pas2js/fpmake.pp
--- Recording mergeinfo for merge of r41142 into '.':
G .
------------------------------------------------------------------------
r41150 | pierre | 2019-01-31 11:20:34 +0000 (Thu, 31 Jan 2019) | 1 line
Disable pas2js for jvm compiler
------------------------------------------------------------------------
--- Merging r41150 into '.':
G utils/pas2js/fpmake.pp
--- Recording mergeinfo for merge of r41150 into '.':
G .
git-svn-id: branches/fixes_3_2@41193 -
|
||
|
michael
|
8f7e8163a5 |
* Merging revisions 40928,40929,40937,40945,40946 from trunk:
------------------------------------------------------------------------
r40928 | michael | 2019-01-20 12:15:07 +0100 (Sun, 20 Jan 2019) | 1 line
* Remove debug statement
------------------------------------------------------------------------
r40929 | michael | 2019-01-20 12:17:46 +0100 (Sun, 20 Jan 2019) | 1 line
* Remove debug statement
------------------------------------------------------------------------
r40937 | michael | 2019-01-20 14:47:25 +0100 (Sun, 20 Jan 2019) | 1 line
* Fix filename allocator for operators
------------------------------------------------------------------------
r40945 | michael | 2019-01-20 18:56:30 +0100 (Sun, 20 Jan 2019) | 1 line
* Correct options for parsing
------------------------------------------------------------------------
r40946 | michael | 2019-01-20 18:57:27 +0100 (Sun, 20 Jan 2019) | 1 line
* Do not save so much session info
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@40948 -
|
||
|
marco
|
e16529a374 |
--- Merging r40076 into '.':
U packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40076 into '.': U . --- Merging r40081 into '.': U packages/pastojs/tests/tcmodules.pas U packages/pastojs/src/fppas2js.pp U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r40081 into '.': G . --- Merging r40083 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40083 into '.': G . --- Merging r40084 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40084 into '.': G . --- Merging r40085 into '.': U packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40085 into '.': G . --- Merging r40101 into '.': U packages/pastojs/src/pas2jsfileutils.pp U packages/pastojs/src/pas2jsfileutilsnodejs.inc --- Recording mergeinfo for merge of r40101 into '.': G . --- Merging r40105 into '.': G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40105 into '.': G . --- Merging r40106 into '.': G packages/pastojs/src/pas2jsfileutils.pp --- Recording mergeinfo for merge of r40106 into '.': G . --- Merging r40107 into '.': U packages/pastojs/src/pas2jspparser.pp --- Recording mergeinfo for merge of r40107 into '.': G . --- Merging r40116 into '.': U utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40116 into '.': G . --- Merging r40126 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40126 into '.': G . --- Merging r40127 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40127 into '.': G . --- Merging r40133 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40133 into '.': G . --- Merging r40135 into '.': U packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r40135 into '.': G . --- Merging r40138 into '.': G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40138 into '.': G . --- Merging r40139 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40139 into '.': G . --- Merging r40140 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40140 into '.': G . --- Merging r40143 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40143 into '.': G . --- Merging r40146 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40146 into '.': G . --- Merging r40148 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40148 into '.': G . --- Merging r40151 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40151 into '.': G . --- Merging r40152 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40152 into '.': G . --- Merging r40164 into '.': U utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40164 into '.': G . --- Merging r40168 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40168 into '.': G . --- Merging r40175 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40175 into '.': G . --- Merging r40177 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas U packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40177 into '.': G . --- Merging r40192 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40192 into '.': G . --- Merging r40193 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40193 into '.': G . --- Merging r40194 into '.': U packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40194 into '.': G . --- Merging r40204 into '.': U packages/fcl-passrc/src/pasuseanalyzer.pas U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40204 into '.': G . --- Merging r40209 into '.': G packages/pastojs/src/pas2jslogger.pp --- Recording mergeinfo for merge of r40209 into '.': G . --- Merging r40210 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40210 into '.': G . --- Merging r40211 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40211 into '.': G . --- Merging r40241 into '.': U utils/pas2js/pas2js.lpi --- Recording mergeinfo for merge of r40241 into '.': G . --- Merging r40243 into '.': G utils/pas2js/pas2js.lpi --- Recording mergeinfo for merge of r40243 into '.': G . --- Merging r40245 into '.': U utils/pas2js/pas2js.cfg --- Recording mergeinfo for merge of r40245 into '.': G . --- Merging r40258 into '.': G utils/pas2js/pas2js.lpi --- Recording mergeinfo for merge of r40258 into '.': G . --- Merging r40259 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40259 into '.': G . --- Merging r40263 into '.': U packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40263 into '.': G . --- Merging r40279 into '.': U packages/pastojs/tests/tcfiler.pas G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/pas2jspparser.pp G packages/pastojs/src/fppas2js.pp U packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40279 into '.': G . --- Merging r40290 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40290 into '.': G . --- Merging r40302 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40302 into '.': G . --- Merging r40304 into '.': U packages/fcl-passrc/src/paswrite.pp --- Recording mergeinfo for merge of r40304 into '.': G . --- Merging r40305 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40305 into '.': G . --- Merging r40342 into '.': G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r40342 into '.': G . --- Merging r40343 into '.': U packages/pastojs/src/pas2jsfiler.pp G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40343 into '.': G . --- Merging r40351 into '.': U packages/fcl-js/src/jswriter.pp G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jsfileutilsunix.inc G packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/fppas2js.pp U packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40351 into '.': G . --- Merging r40352 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfileutilsnodejs.inc G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40352 into '.': G . --- Merging r40353 into '.': U utils/pas2js/pas2jslib.lpi --- Recording mergeinfo for merge of r40353 into '.': G . --- Merging r40354 into '.': U packages/pastojs/fpmake.pp --- Recording mergeinfo for merge of r40354 into '.': G . --- Merging r40355 into '.': G packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40355 into '.': G . --- Merging r40356 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfileutils.pp U utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40356 into '.': G . --- Merging r40372 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp G utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40372 into '.': G . --- Merging r40423 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40423 into '.': G . --- Merging r40424 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40424 into '.': G . --- Merging r40426 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40426 into '.': G . --- Merging r40427 into '.': G packages/pastojs/fpmake.pp G packages/pastojs/src/pas2jscompiler.pp A packages/pastojs/src/pas2jspcucompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40427 into '.': G . --- Merging r40428 into '.': U packages/pastojs/tests/tcunitsearch.pas U packages/pastojs/tests/testpas2js.lpi --- Recording mergeinfo for merge of r40428 into '.': G . --- Merging r40429 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40429 into '.': G . --- Merging r40430 into '.': G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jspcucompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40430 into '.': G . --- Merging r40439 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jspcucompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40439 into '.': G . --- Merging r40440 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40440 into '.': G . --- Merging r40441 into '.': G packages/pastojs/src/pas2jspcucompiler.pp --- Recording mergeinfo for merge of r40441 into '.': G . # revisions: 40076,40081,40083,40084,40085,40101,40105,40106,40107,40116,40126,40127,40133,40135,40138,40139,40140,40143,40146,40148,40151,40152,40164,40168,40175,40177,40192,40193,40194,40204,40209,40210,40211,40241,40243,40245,40258,40259,40263,40279,40290,40302,40304,40305,40342,40343,40351,40352,40353,40354,40355,40356,40372,40423,40424,40426,40427,40428,40429,40430,40439,40440,40441 git-svn-id: branches/fixes_3_2@40718 - |
||
|
marco
|
4d66a5b4ad |
--- Merging r39851 into '.':
G packages/fcl-passrc/tests/tcresolver.pas G packages/pastojs/tests/tcprecompile.pas G packages/pastojs/src/fppas2js.pp G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jsfiler.pp G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r39851 into '.': G . --- Merging r39853 into '.': U packages/fcl-js/src/jsbase.pp --- Recording mergeinfo for merge of r39853 into '.': G . --- Merging r39854 into '.': U packages/fcl-js/src/jswriter.pp U packages/pastojs/tests/tcsrcmap.pas G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r39854 into '.': G . --- Merging r39855 into '.': U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39855 into '.': G . --- Merging r39856 into '.': U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39856 into '.': G . --- Merging r39857 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39857 into '.': G . --- Merging r39898 into '.': G packages/fcl-js/src/jsbase.pp G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r39898 into '.': G . --- Merging r39899 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39899 into '.': G . --- Merging r39904 into '.': U packages/fcl-json/src/fpjson.pp --- Recording mergeinfo for merge of r39904 into '.': G . --- Merging r39906 into '.': G packages/pastojs/tests/tcmodules.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39906 into '.': G . --- Merging r39908 into '.': U packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r39908 into '.': G . --- Merging r39919 into '.': G packages/fcl-passrc/tests/tcresolver.pas U packages/fcl-passrc/tests/tcuseanalyzer.pas U packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r39919 into '.': G . --- Merging r39921 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r39921 into '.': G . --- Merging r39926 into '.': G packages/pastojs/tests/tcmodules.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39926 into '.': G . --- Merging r39928 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39928 into '.': G . --- Merging r39929 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39929 into '.': G . --- Merging r39932 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r39932 into '.': G . --- Merging r39937 into '.': G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r39937 into '.': G . --- Merging r39939 into '.': U packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r39939 into '.': G . --- Merging r39940 into '.': U packages/fcl-passrc/src/pasresolveeval.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pparser.pp U packages/pastojs/tests/tcfiler.pas G packages/pastojs/src/fppas2js.pp G packages/pastojs/src/pas2jsfiler.pp --- Recording mergeinfo for merge of r39940 into '.': G . --- Merging r39942 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39942 into '.': G . --- Merging r39944 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39944 into '.': G . --- Merging r39946 into '.': G packages/fcl-passrc/src/pasresolveeval.pas --- Recording mergeinfo for merge of r39946 into '.': G . --- Merging r39966 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r39966 into '.': G . --- Merging r39968 into '.': G packages/fcl-passrc/src/pasresolveeval.pas --- Recording mergeinfo for merge of r39968 into '.': G . --- Merging r39974 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39974 into '.': G . --- Merging r39975 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39975 into '.': G . --- Merging r39976 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39976 into '.': G . --- Merging r39977 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r39977 into '.': G . --- Merging r39979 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r39979 into '.': G . --- Merging r39985 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r39985 into '.': G . --- Merging r40013 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40013 into '.': G . --- Merging r40018 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolveeval.pas G packages/fcl-passrc/src/pasresolver.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40018 into '.': G . --- Merging r40029 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40029 into '.': G . --- Merging r40030 into '.': G packages/pastojs/src/fppas2js.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r40030 into '.': G . --- Merging r40032 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40032 into '.': G . --- Merging r40034 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40034 into '.': G . --- Merging r40036 into '.': G packages/pastojs/src/fppas2js.pp G packages/fcl-js/src/jsbase.pp --- Recording mergeinfo for merge of r40036 into '.': G . --- Merging r40037 into '.': A utils/pas2js/nodepas2js.pp A utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40037 into '.': G . --- Merging r40039 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40039 into '.': G . --- Merging r40040 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40040 into '.': G . --- Merging r40041 into '.': G packages/pastojs/src/pas2jslogger.pp U packages/pastojs/src/pas2jsfileutils.pp U packages/pastojs/src/pas2jsfilecache.pp U packages/pastojs/src/pas2js_defines.inc U packages/pastojs/src/pas2jsfileutilswin.inc G packages/pastojs/src/pas2jscompiler.pp A packages/pastojs/src/pas2jsfileutilsnodejs.inc U packages/pastojs/src/pas2jsfileutilsunix.inc --- Recording mergeinfo for merge of r40041 into '.': G . --- Merging r40042 into '.': U utils/pas2js/pas2js.pp U utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40042 into '.': G . --- Merging r40043 into '.': G packages/pastojs/src/pas2jsfileutils.pp --- Recording mergeinfo for merge of r40043 into '.': G . --- Merging r40044 into '.': U packages/pastojs/src/pas2jspparser.pp G packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40044 into '.': G . --- Merging r40045 into '.': G utils/pas2js/nodepas2js.pp U packages/fcl-json/src/jsonscanner.pp --- Recording mergeinfo for merge of r40045 into '.': G . --- Merging r40046 into '.': G packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40046 into '.': G . --- Merging r40047 into '.': G packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40047 into '.': G . --- Merging r40048 into '.': G packages/fcl-js/src/jssrcmap.pas G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40048 into '.': G . --- Merging r40049 into '.': G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jsfiler.pp G packages/pastojs/src/pas2jsfilecache.pp U packages/pastojs/src/fppjssrcmap.pp G packages/pastojs/src/pas2js_defines.inc G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40049 into '.': G . --- Merging r40051 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40051 into '.': G . --- Merging r40053 into '.': G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/fppjssrcmap.pp --- Recording mergeinfo for merge of r40053 into '.': G . --- Merging r40055 into '.': G packages/fcl-json/src/fpjson.pp U packages/fcl-json/tests/testjsondata.pp --- Recording mergeinfo for merge of r40055 into '.': G . --- Merging r40058 into '.': U packages/fcl-json/tests/testjsonparser.pp U packages/fcl-json/tests/testjson.pp U packages/fcl-json/tests/testjson.lpi G packages/fcl-json/tests/testjsondata.pp G packages/fcl-json/src/fpjson.pp G packages/fcl-json/src/jsonscanner.pp --- Recording mergeinfo for merge of r40058 into '.': G . --- Merging r40061 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40061 into '.': G . --- Merging r40062 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jspparser.pp G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/tests/tcmodules.pas G packages/pastojs/tests/tcfiler.pas G utils/pas2js/nodepas2js.pp U utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40062 into '.': G . --- Merging r40064 into '.': G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jsfileutilsnodejs.inc G packages/pastojs/src/pas2jsfileutils.pp G packages/fcl-json/src/fpjson.pp G utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40064 into '.': G . --- Merging r40067 into '.': G packages/pastojs/src/pas2jsfileutilsnodejs.inc G packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp --- Recording mergeinfo for merge of r40067 into '.': G . --- Merging r40072 into '.': G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/pas2jscompiler.pp G packages/fcl-json/src/fpjson.pp G packages/fcl-js/src/jswriter.pp G packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r40072 into '.': G . --- Merging r40075 into '.': G packages/fcl-json/src/fpjson.pp G packages/pastojs/src/pas2jscompiler.pp G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40075 into '.': G . --- Merging r40077 into '.': G packages/fcl-js/src/jssrcmap.pas G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40077 into '.': G . --- Merging r40080 into '.': G packages/fcl-js/src/jswriter.pp U packages/fcl-js/src/jsscanner.pp --- Recording mergeinfo for merge of r40080 into '.': G . --- Merging r40082 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasresolveeval.pas --- Recording mergeinfo for merge of r40082 into '.': G . --- Merging r40098 into '.': G utils/pas2js/nodepas2js.pp U utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40098 into '.': G . --- Merging r40099 into '.': G packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r40099 into '.': G . --- Merging r40100 into '.': G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40100 into '.': G . --- Merging r40108 into '.': G utils/pas2js/nodepas2js.lpi G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40108 into '.': G . --- Merging r40125 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40125 into '.': G . --- Merging r40129 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40129 into '.': G . --- Merging r40136 into '.': G packages/fcl-json/src/fpjson.pp --- Recording mergeinfo for merge of r40136 into '.': G . --- Merging r40137 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40137 into '.': G . --- Merging r40144 into '.': G packages/fcl-passrc/src/pasresolveeval.pas G utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40144 into '.': G . --- Merging r40150 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40150 into '.': G . --- Merging r40165 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40165 into '.': G . --- Merging r40166 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40166 into '.': G . --- Merging r40171 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40171 into '.': G . --- Merging r40173 into '.': G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/pas2jscompiler.pp G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40173 into '.': G . # revisions: 39851,39853,39854,39855,39856,39857,39898,39899,39904,39906,39908,39919,39921,39926,39928,39929,39932,39937,39939,39940,39942,39944,39946,39966,39968,39974,39975,39976,39977,39979,39985,40013,40018,40029,40030,40032,40034,40036,40037,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,40049,40051,40053,40055,40058,40061,40062,40064,40067,40072,40075,40077,40080,40082,40098,40099,40100,40108,40125,40129,40136,40137,40144,40150,40165,40166,40171,40173 git-svn-id: branches/fixes_3_2@40709 - |
||
|
pierre
|
7bcb8e911c |
------------------------------------------------------------------------
r40619 | pierre | 2018-12-23 16:17:49 +0000 (Sun, 23 Dec 2018) | 8 lines
* in lexbase and yaccbase units,
use DirectorySeparator instead of '\' in functions
path, root and addext.
* in plex and pyacc programs, for unix,
try to find installed yyparse.cod using
path of paramstr(0).
------------------------------------------------------------------------
--- Merging r40619 into '.':
U utils/tply/pyacc.pas
U utils/tply/plex.pas
U utils/tply/yaccbase.pas
U utils/tply/lexbase.pas
U utils/tply/pyacc.y
--- Recording mergeinfo for merge of r40619 into '.':
U .
git-svn-id: branches/fixes_3_2@40627 -
|
||
|
pierre
|
f0eedd5d71 |
Merge of revisions 39726 39732 39734 39735 39736 39801 39806 39807 40002 40014 40358 40363 40392 40397 40481 40537 from trunk to fixes_3_2
------------------------------------------------------------------------ r39726 | pierre | 2018-09-10 13:30:42 +0000 (Mon, 10 Sep 2018) | 1 line pass -D__I8086_SMARTLINK_SECTIONS__ to nasm if FPCOPT contains -dTEST_I8086_SMARTLINK_SECTIONS ------------------------------------------------------------------------ --- Merging r39726 into '.': U rtl/msdos/Makefile U rtl/msdos/Makefile.fpc --- Recording mergeinfo for merge of r39726 into '.': U . ------------------------------------------------------------------------ r39732 | pierre | 2018-09-11 08:02:48 +0000 (Tue, 11 Sep 2018) | 1 line Add FPC_SOFT_FPUX80 and FPC_SOFT_FPU128 define handling ------------------------------------------------------------------------ --- Merging r39732 into '.': U rtl/linux/system.pp --- Recording mergeinfo for merge of r39732 into '.': G . ------------------------------------------------------------------------ r39734 | pierre | 2018-09-11 13:08:51 +0000 (Tue, 11 Sep 2018) | 1 line Increase default trace size to 16 ------------------------------------------------------------------------ --- Merging r39734 into '.': U rtl/inc/heaptrc.pp --- Recording mergeinfo for merge of r39734 into '.': G . ------------------------------------------------------------------------ r39735 | pierre | 2018-09-11 13:10:59 +0000 (Tue, 11 Sep 2018) | 1 line Avoid wrap on 32-bit system for StackTop calculation ------------------------------------------------------------------------ --- Merging r39735 into '.': U rtl/inc/system.inc --- Recording mergeinfo for merge of r39735 into '.': G . ------------------------------------------------------------------------ r39736 | pierre | 2018-09-11 13:13:50 +0000 (Tue, 11 Sep 2018) | 5 lines * Add PAGESIZE local constant. + Set LAST_PAGE_GENERATES_SIGNAL macro for linux powerpc/powerpc64. + Use page_size for StackBottom computation. + Use LAST_PAGE_GENERATES_SIGNAL in StackBottom computation. ------------------------------------------------------------------------ --- Merging r39736 into '.': G rtl/linux/system.pp --- Recording mergeinfo for merge of r39736 into '.': G . ------------------------------------------------------------------------ r39801 | pierre | 2018-09-24 22:20:30 +0000 (Mon, 24 Sep 2018) | 1 line define iconv_is_in_libc by default for netbsd OS (can be disabled by adding -dDISABLE_ICONV_LIBC option ------------------------------------------------------------------------ --- Merging r39801 into '.': U rtl/unix/cwstring.pp --- Recording mergeinfo for merge of r39801 into '.': G . ------------------------------------------------------------------------ r39806 | pierre | 2018-09-26 09:25:54 +0000 (Wed, 26 Sep 2018) | 1 line Rename Result parameter to _Result to avoid compilation error for ppcjvm ------------------------------------------------------------------------ --- Merging r39806 into '.': U packages/jni/src/jni.pas --- Recording mergeinfo for merge of r39806 into '.': G . ------------------------------------------------------------------------ r39807 | pierre | 2018-09-26 09:27:33 +0000 (Wed, 26 Sep 2018) | 1 line Explicitly also disable java OS target ------------------------------------------------------------------------ --- Merging r39807 into '.': U packages/sdl/fpmake.pp --- Recording mergeinfo for merge of r39807 into '.': G . ------------------------------------------------------------------------ r40002 | pierre | 2018-10-20 22:30:20 +0000 (Sat, 20 Oct 2018) | 1 line Add explicit typecast to avoid range ccheck error ------------------------------------------------------------------------ --- Merging r40002 into '.': U rtl/linux/termiosproc.inc --- Recording mergeinfo for merge of r40002 into '.': G . ------------------------------------------------------------------------ r40014 | pierre | 2018-10-22 21:14:59 +0000 (Mon, 22 Oct 2018) | 1 line Add missing unicode related units to netware OS ------------------------------------------------------------------------ --- Merging r40014 into '.': U rtl/netware/Makefile U rtl/netware/Makefile.fpc --- Recording mergeinfo for merge of r40014 into '.': G . ------------------------------------------------------------------------ r40358 | pierre | 2018-11-20 22:02:59 +0000 (Tue, 20 Nov 2018) | 1 line Add classes unit ------------------------------------------------------------------------ --- Merging r40358 into '.': U rtl/watcom/Makefile U rtl/watcom/Makefile.fpc --- Recording mergeinfo for merge of r40358 into '.': G . ------------------------------------------------------------------------ r40363 | pierre | 2018-11-23 13:29:01 +0000 (Fri, 23 Nov 2018) | 1 line Also disable fpdoc and pas2jni utils packages for targets not supporting fcl-process package ------------------------------------------------------------------------ --- Merging r40363 into '.': U utils/pas2jni/fpmake.pp U utils/fpdoc/fpmake.pp --- Recording mergeinfo for merge of r40363 into '.': G . ------------------------------------------------------------------------ r40392 | pierre | 2018-11-29 14:23:44 +0000 (Thu, 29 Nov 2018) | 1 line Fix delete of gdbver.inc generated file after gdbint unit compilation when called from packages level ------------------------------------------------------------------------ --- Merging r40392 into '.': U packages/gdbint/fpmake.pp --- Recording mergeinfo for merge of r40392 into '.': G . ------------------------------------------------------------------------ r40397 | pierre | 2018-11-29 16:55:07 +0000 (Thu, 29 Nov 2018) | 1 line Fix cleaning of unicode utils package in fpmake ------------------------------------------------------------------------ --- Merging r40397 into '.': U utils/unicode/fpmake.pp --- Recording mergeinfo for merge of r40397 into '.': G . ------------------------------------------------------------------------ r40481 | pierre | 2018-12-06 17:06:45 +0000 (Thu, 06 Dec 2018) | 1 line Fix compilation of installer for win32 target ------------------------------------------------------------------------ --- Merging r40481 into '.': U installer/Makefile U installer/Makefile.fpc U packages/ide/Makefile.fpc U packages/ide/Makefile --- Recording mergeinfo for merge of r40481 into '.': G . ------------------------------------------------------------------------ r40537 | pierre | 2018-12-13 10:21:58 +0000 (Thu, 13 Dec 2018) | 1 line Always accept empty string as meaning zero is TryRomanToInt, fixes intermittent errors in tromantoint test ------------------------------------------------------------------------ --- Merging r40537 into '.': U packages/rtl-objpas/src/inc/strutils.pp U tests/test/units/strutils/tromantoint.pp --- Recording mergeinfo for merge of r40537 into '.': G . git-svn-id: branches/fixes_3_2@40618 - |
||
|
pierre
|
fa77ae20bc |
* Merge most of fpmkunit related commits from trunk to fixes branch
------------------------------------------------------------------------ r39713 | michael | 2018-09-08 10:15:57 +0000 (Sat, 08 Sep 2018) | 1 line * Fix bug #34241 using provided suggestion by Christo Crause ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39820 | pierre | 2018-09-27 06:37:37 +0000 (Thu, 27 Sep 2018) | 1 line Fix problem reported in bug report 34343 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39839 | florian | 2018-09-28 20:54:53 +0000 (Fri, 28 Sep 2018) | 1 line * enabled mipsel-embedded also in the fpmkunit, resolves #34345 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40362 | pierre | 2018-11-23 13:12:06 +0000 (Fri, 23 Nov 2018) | 1 line Fix go32v2 utils compilation by using the same OS limitation for utils-fppkg as in fcl-process package ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40371 | pierre | 2018-11-25 21:24:16 +0000 (Sun, 25 Nov 2018) | 6 lines + Add new string SWarnRemoveNonEmptyDirectory * Change SWarnUnregisteredResource into a debug string + Use ExcludeTrailingDelimiter to be sure to get the parent directory in Clean method. + Add call to CmdRemoveTrees if CmdRemmoveDirs fails in Clean method, but only if dir name if $FPCTARGET ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40380 | pierre | 2018-11-28 14:03:45 +0000 (Wed, 28 Nov 2018) | 1 line Add mising disclean help, rephrase help for Clean also ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40381 | pierre | 2018-11-28 16:47:43 +0000 (Wed, 28 Nov 2018) | 1 line Fix i386-aros in fpmkunit ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40388 | pierre | 2018-11-28 22:11:29 +0000 (Wed, 28 Nov 2018) | 7 lines * Change "Clean of package %S completed" level from vlWarning to vlInfo, to be at same level as "Cleaning pacakge %s" message. * Transform "Searching dir" writeln in SearchFiles into a vlDebug level log call. + Add manifest.xml to the list of files to remove. * Only do something in TBuildEngine.Clean method if AllTargets is true or if CPU-OS is supported for APackage parameter. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40389 | pierre | 2018-11-28 23:16:31 +0000 (Wed, 28 Nov 2018) | 1 line Add listing of unremoved files during clean with -d (vlDebug) option ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39713 | michael | 2018-09-08 10:15:57 +0000 (Sat, 08 Sep 2018) | 1 line * Fix bug #34241 using provided suggestion by Christo Crause ------------------------------------------------------------------------ --- Merging r39713 into '.': U packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39713 into '.': U . ------------------------------------------------------------------------ r39820 | pierre | 2018-09-27 06:37:37 +0000 (Thu, 27 Sep 2018) | 1 line Fix problem reported in bug report 34343 ------------------------------------------------------------------------ @@ # Don't edit, this file is generated by FPCMake Version 2.0.0 # default: all <<<<<<< MINE (select with 'mc') (5) MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux ||||||| ORIGINAL (5) MAKEFILETARGETS=x86_64-linux ======= MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded >>>>>>> THEIRS (select with 'tc') (5) BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari @@ endif endif override PACKAGE_NAME=fppkg <<<<<<< MINE (select with 'mc') (333) override PACKAGE_VERSION=3.2.0-beta ||||||| ORIGINAL (335) override PACKAGE_VERSION=3.1.1 ======= override PACKAGE_VERSION=3.3.1 >>>>>>> THEIRS (select with 'tc') (335) FPMAKE_BIN_CLEAN=$(wildcard ./fpmake$(SRCEXEEXT)) ifdef OS_TARGET FPC_TARGETOPT+=--os=$(OS_TARGET) @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif <<<<<<< MINE (select with 'mc') (1361,344) ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-iphonesim) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-win16) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),wasm-wasm) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ||||||| ORIGINAL (1018,0) ======= ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-iphonesim) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-win16) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),wasm-wasm) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv32-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv32-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif >>>>>>> THEIRS (select with 'tc') (1363,360) ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) ------------------------------------------------------------------------ r39713 | michael | 2018-09-08 10:15:57 +0000 (Sat, 08 Sep 2018) | 1 line * Fix bug #34241 using provided suggestion by Christo Crause ------------------------------------------------------------------------ --- Merging r39713 into '.': U packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39713 into '.': U . ------------------------------------------------------------------------ r39839 | florian | 2018-09-28 20:54:53 +0000 (Fri, 28 Sep 2018) | 1 line * enabled mipsel-embedded also in the fpmkunit, resolves #34345 ------------------------------------------------------------------------ @@ { This table is kept OS,Cpu because it is easier to maintain (PFV) } OSCPUSupported : array[TOS,TCpu] of boolean = ( <<<<<<< MINE (select with 'mc') (188,40) { os none i386 m68k ppc sparc x86_64 arm ppc64 avr armeb mips mipsel jvm i8086 aarch64 sparc64} { none } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { linux } ( false, true, true, true, true, true, true, true, false, true , true , true , false, false, true , true ), { go32v2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win32 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { os2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { freebsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false), { beos } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netbsd } ( false, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false), { amiga } ( false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false), { atari } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false), { solaris } ( false, true, false, false, true, true, false, false, false, false, false, false, false, false, false, false), { qnx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netware } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { openbsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false), { wdosx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { palmos } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false), { macos } ( false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { darwin } ( false, true, false, true, false, true, true, true, false, false, false, false, false, false, true , false), { emx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { watcom } ( false, true, false, false, false ,false, false, false, false, false, false, false, false, false, false, false), { morphos } ( false, false, false, true, false ,false, false, false, false, false, false, false, false, false, false, false), { netwlibc }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win64 } ( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { wince }( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { gba } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { nds } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { embedded }( false, true, true, true, true, true, true, true, true, true , false, false, false, true , false, false), { symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false), { android } ( false, true, false, false, false, true, true, false, false, false, false, true, true , false, true, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false), { aros } ( true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false) ||||||| ORIGINAL (188,40) { os none i386 m68k ppc sparc x86_64 arm ppc64 avr armeb mips mipsel jvm i8086 aarch64 sparc64 riscv32 riscv64} { none } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { linux } ( false, true, true, true, true, true, true, true, false, true , true , true , false, false, true , true , true , true ), { go32v2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win32 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { os2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { freebsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { beos } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netbsd } ( false, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false), { amiga } ( false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { atari } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { solaris } ( false, true, false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false), { qnx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netware } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { openbsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wdosx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { palmos } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { macos } ( false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { darwin } ( false, true, false, true, false, true, true, true, false, false, false, false, false, false, true , false, false, false), { emx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { watcom } ( false, true, false, false, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { morphos } ( false, false, false, true, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { netwlibc }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win64 } ( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wince }( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { gba } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { nds } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { embedded }( false, true, true, true, true, true, true, true, true, true , false, false, false, true , false, false, true , true ), { symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false, false), { android } ( false, true, false, false, false, false, true, false, false, false, false, true, true , false, false, false, false, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false, false, false), { aros } ( true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false) ======= { os none i386 m68k ppc sparc x86_64 arm ppc64 avr armeb mips mipsel jvm i8086 aarch64 sparc64 riscv32 riscv64} { none } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { linux } ( false, true, true, true, true, true, true, true, false, true , true , true , false, false, true , true , true , true ), { go32v2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win32 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { os2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { freebsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { beos } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netbsd } ( false, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false), { amiga } ( false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { atari } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { solaris } ( false, true, false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false), { qnx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netware } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { openbsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wdosx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { palmos } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { macos } ( false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { darwin } ( false, true, false, true, false, true, true, true, false, false, false, false, false, false, true , false, false, false), { emx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { watcom } ( false, true, false, false, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { morphos } ( false, false, false, true, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { netwlibc }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win64 } ( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wince }( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { gba } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { nds } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { embedded }( false, true, true, true, true, true, true, true, true, true , false, true, false, true , false, false, true , true ), { symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false, false), { android } ( false, true, false, false, false, false, true, false, false, false, false, true, true , false, false, false, false, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false, false, false), { aros } ( true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false) >>>>>>> THEIRS (select with 'tc') (188,40) ); // Useful --- Merging r39839 into '.': C packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39839 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40362 | pierre | 2018-11-23 13:12:06 +0000 (Fri, 23 Nov 2018) | 1 line Fix go32v2 utils compilation by using the same OS limitation for utils-fppkg as in fcl-process package ------------------------------------------------------------------------ --- Merging r40362 into '.': U utils/fppkg/fpmake.pp --- Recording mergeinfo for merge of r40362 into '.': G . ------------------------------------------------------------------------ r40371 | pierre | 2018-11-25 21:24:16 +0000 (Sun, 25 Nov 2018) | 6 lines + Add new string SWarnRemoveNonEmptyDirectory * Change SWarnUnregisteredResource into a debug string + Use ExcludeTrailingDelimiter to be sure to get the parent directory in Clean method. + Add call to CmdRemoveTrees if CmdRemmoveDirs fails in Clean method, but only if dir name if $FPCTARGET ------------------------------------------------------------------------ --- Merging r40371 into '.': C packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40371 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40380 | pierre | 2018-11-28 14:03:45 +0000 (Wed, 28 Nov 2018) | 1 line Add mising disclean help, rephrase help for Clean also ------------------------------------------------------------------------ --- Merging r40380 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40380 into '.': G . ------------------------------------------------------------------------ r40381 | pierre | 2018-11-28 16:47:43 +0000 (Wed, 28 Nov 2018) | 1 line Fix i386-aros in fpmkunit ------------------------------------------------------------------------ --- Merging r40381 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40381 into '.': G . ------------------------------------------------------------------------ r40388 | pierre | 2018-11-28 22:11:29 +0000 (Wed, 28 Nov 2018) | 7 lines * Change "Clean of package %S completed" level from vlWarning to vlInfo, to be at same level as "Cleaning pacakge %s" message. * Transform "Searching dir" writeln in SearchFiles into a vlDebug level log call. + Add manifest.xml to the list of files to remove. * Only do something in TBuildEngine.Clean method if AllTargets is true or if CPU-OS is supported for APackage parameter. ------------------------------------------------------------------------ --- Merging r40388 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40388 into '.': G . ------------------------------------------------------------------------ r40389 | pierre | 2018-11-28 23:16:31 +0000 (Wed, 28 Nov 2018) | 1 line Add listing of unremoved files during clean with -d (vlDebug) option ------------------------------------------------------------------------ --- Merging r40389 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40389 into '.': G . ------------------------------------------------------------------------ r40390 | pierre | 2018-11-28 23:24:33 +0000 (Wed, 28 Nov 2018) | 1 line Document -d --debug option, and change short version of --doc-folder to -df as -d is already used by debug option ------------------------------------------------------------------------ --- Merging r40390 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40390 into '.': G . ------------------------------------------------------------------------ r40520 | marco | 2018-12-10 22:42:52 +0000 (Mon, 10 Dec 2018) | 2 lines * add similar retries to sysdeletefile as for removedirs. because buildunits sometimes fail to erase. Seems to fix #21868 ------------------------------------------------------------------------ --- Merging r40520 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40520 into '.': G . ------------------------------------------------------------------------ r40614 | marco | 2018-12-22 15:55:44 +0000 (Sat, 22 Dec 2018) | 1 line * fixed formatting parameter in SWarnRetryDeleteFile ------------------------------------------------------------------------ --- Merging r40614 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40614 into '.': G . git-svn-id: branches/fixes_3_2@40617 - |
||
|
yury
|
302ee0d208 |
pas2jni fixes.
Merged revision(s) 40179, 40462 from trunk: * pas2jni: Added option: -N - Do not generate a Java code for auto-loading of the shared library. * pas2jni: Do not generate TClass helper code if no classes are used at all. ........ * pas2jni: TClass helper must be generated only for the system unit. ........ git-svn-id: branches/fixes_3_2@40544 - |
||
|
yury
|
2f08c63947 |
* Updated revision.inc.
git-svn-id: branches/fixes_3_2@40542 - |
||
|
yury
|
2d48bc8b9c |
* Regenerated makefiles.
git-svn-id: branches/fixes_3_2@40541 - |
||
|
yury
|
0654857ce1 |
Merged aarch64-android, x86_64-android targets and fixes for the Android target.
Revision(s) 39739, 39749, 39860, 39862, 39865, 39869, 39871, 39903, 39905, 39917, 39956, 39959-39960, 39969, 39971, 39980, 39987, 40198-40201, 40472, 40532, 40535-40536 from trunk: * Android: The list of supported syscalls has been auto-generated directly from android sources for each CPU. * Minor adjustments to make all compilable with the proper list of Android syscalls. ........ * Re-generated lists of android syscalls by a new script. The lists are more correct now. The script's location: https://svn.freepascal.org/svn/fpcbuild/scripts/android ........ * Fixed UnhookSignal when RTL_SIGDEFAULT is passed. The bug have caused crash on aarch64-android due to out of bounds read of the rtlsig2ossig[] array. ........ + Added support for the aarch64-android target. ........ * Set ICU data dir if it is not set by the system. It fixes issues on newer Android versions. * Added more predefined ICU versions. ........ * android: Use the current dir as temp. ........ * Corrected TUContext record for aarch64-linux and aarch64-android. It fixes obtaining of an address of the instruction where a signal has thrown. ........ * Enabled safecall support for aarch64 to be on par with other cpus. ........ * Android: Reworked the startup code to use no assembly instructions. Generic assembler startup files contains only section data and are compiled for each CPU. * Android: argc and argv are correct for shared libraries. ........ * Use syscall_nr_renameat for android. ........ + added support for x86_64-android target. ........ + Added the auto-generated list syscalls for mips64-android. It will be needed when mips64 is supported. ........ * x86_64-android requires sigreturn for proper signal handling. ........ * Register external gas assembler for aarch64-android and x86_64-android. ........ * Enabled compilation of the cpu unit for arm-android and x86_64-android. ........ * ucnv_open() must be called with some SSE exception masked on x86_64-android. * Call u_init() during initialization. ........ * Create the ".note.gnu.build-id" section for android. It fixes debugging of shared libs in Android Studio. ........ * android: Removed cwstring from the uses clause of the unix unit. Use cwstring indirectly. It allows to avoid using cwstring if needed. ........ * ICU v3.8 on Android 1.5-2.1 is buggy and can't be unloaded properly. ........ * Fixed locale detection on new Android versions. ........ * Fixed obtaining a time zone information for 64-bit android. ........ * Since Android 8 the net.dnsX properties can't be read. Use Google Public DNS servers. ........ * android: Use libc for sockets since the "accept" syscall is blocked by SECCOMP, but the "accept4" alternative is not available on old Android versions (2.3 and older). ........ * android: Regenerated syscalls. ........ * android: Disabled usage of the "pselect6" and "ppoll" syscalls for arm-android. These syscalls are not available on old Android versions (2.3 or older). ........ git-svn-id: branches/fixes_3_2@40540 - |
||
|
marco
|
1f921d4ac0 |
--- Merging r39866 into '.':
U rtl/unix/sysutils.pp --- Recording mergeinfo for merge of r39866 into '.': U . --- Merging r39870 into '.': U utils/bin2obj.pp --- Recording mergeinfo for merge of r39870 into '.': G . --- Merging r39973 into '.': U packages/fcl-image/src/fpimage.pp --- Recording mergeinfo for merge of r39973 into '.': G . --- Merging r39995 into '.': U packages/gmp/src/gmp.pas U rtl/objpas/math.pp --- Recording mergeinfo for merge of r39995 into '.': G . --- Merging r40215 into '.': U packages/paszlib/src/zipper.pp --- Recording mergeinfo for merge of r40215 into '.': G . # revisions: 39866,39870,39973,39995,40215, git-svn-id: branches/fixes_3_2@40528 - |
||
|
pierre
|
da2eca3b8e |
Merge of trunk rev 39765, update of utils/fpcm/revision.inc after merge 39766
git-svn-id: branches/fixes_3_2@39789 - |
||
|
pierre
|
9334eeaa7e |
--- Merging r39756 and r39757 into 'fixes_3_2' branch:
U packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39756 into '.': U . U utils/fpcm/fpcmake.inc U utils/fpcm/fpcmake.ini --- Recording mergeinfo for merge of r39757 into '.': G . ------------------------------------------------------------------------- r39756 | pierre | 2018-09-14 16:06:27 +0200 (Fri, 14 Sep 2018) | 1 line Add AIXSharedLibExt to avoid failure on pas2js shared library installation for AIX OS ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39757 | pierre | 2018-09-14 16:07:38 +0200 (Fri, 14 Sep 2018) | 1 line Add SHAREDLIBEXT=.a for AIX OS to fpcmake.ini ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@39766 - |
||
|
pierre
|
ecbaaac1b8 |
Commit updated revision.inc file
git-svn-id: branches/fixes_3_2@39737 - |
||
|
marco
|
340c62d2e7 |
more version updates
git-svn-id: branches/fixes_3_2@39634 - |
||
|
marco
|
bceb71bf9f |
* version to 3.2.0-beta
git-svn-id: branches/fixes_3_2@39633 - |
||
|
marco
|
57b73f7022 |
* don't include date/rev info of fpcmake. complicates merging.
git-svn-id: trunk@39631 - |
||
|
michael
|
722927bc4f |
* Add Pas2js
git-svn-id: trunk@39605 - |
||
|
Mattias Gaertner
|
2086bdbbc0 |
pastojs: check reserved global JS identifiers only for non prefixed identifiers
git-svn-id: trunk@39360 - |
||
|
Mattias Gaertner
|
7e64102b74 |
fcl-passrc: fixed scanner row, col in macro
git-svn-id: trunk@39344 - |
||
|
Mattias Gaertner
|
7a6fed75a0 |
fcl-passrc: $warn directive
git-svn-id: trunk@39315 - |
||
|
Mattias Gaertner
|
5228cada27 |
pas2js: set version 0.9.26
git-svn-id: trunk@39304 - |