Commit Graph

44821 Commits

Author SHA1 Message Date
yury
80e88fdc34 Merged revision(s) 33859, 34275, 34309, 34327, 34367, 34369, 34634 from trunk:
* pas2jni: Explicitly release JNI local refs while executing method pointers.
........
* pas2jni: Fixed string constant handling after recent changes in FPC.
........
* pas2jni: Fixed invoking of Java event handlers from non-main threads.
........
* pas2jni: Fixed handling of identical names of classes, proctypes when they are defined in different units.
........
* pas2jni: Removed option to create event handler by passing Java method method name as a string. It is not safe, since the target method is treated as unused by Java and the method may be removed from the resulting application.
........
* pas2jni: Reverted r34367 and mark undesired event handler creation "deprecated".
........

git-svn-id: branches/fixes_3_0@34774 -
2016-11-01 10:16:54 +00:00
Jonas Maebe
93d5be005e --- Merging r34600 into '.':
U    packages/univint/src/CFBase.pas

git-svn-id: branches/fixes_3_0@34630 -
2016-10-05 19:39:09 +00:00
marco
6171eae96b --- Merging r34571 into '.':
U    rtl/win/wininc/unidef.inc
U    rtl/win/wininc/ascdef.inc
--- Recording mergeinfo for merge of r34571 into '.':
 U   .

# revisions: 34571

git-svn-id: branches/fixes_3_0@34572 -
2016-09-28 14:25:35 +00:00
marco
7c679050de --- Merging r34200 into '.':
D    rtl/haiku/sysheap.inc
--- Recording mergeinfo for merge of r34200 into '.':
 U   .

# revisions: 34200

git-svn-id: branches/fixes_3_0@34274 -
2016-08-11 10:37:26 +00:00
Jonas Maebe
c58755d18d * added missing alignment in dynamic array RTTI for platforms that
require strict alignment (fixes bootstrapping trunk with a fixes
    compiler on such platforms)

git-svn-id: branches/fixes_3_0@34181 -
2016-07-22 14:36:58 +00:00
michael
e78ae08bfb * Patch from Mattias Gaertner to clean up unused resource strings
git-svn-id: branches/fixes_3_0@34112 -
2016-07-14 06:49:27 +00:00
marco
0a24fb2c59 --- Merging r34062 into '.':
U    packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r34062 into '.':
 U   .

# revisions: 34062

git-svn-id: branches/fixes_3_0@34108 -
2016-07-13 15:47:23 +00:00
marco
f564fd7114 --- Merging r33846 into '.':
U    packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r33846 into '.':
 U   .

# revisions: 33846

git-svn-id: branches/fixes_3_0@34107 -
2016-07-13 15:44:54 +00:00
marco
058dbcafe6 --- Merging r34091 into '.':
U    rtl/openbsd/ptypes.inc
--- Recording mergeinfo for merge of r34091 into '.':
 U   .

# revisions: 34091

git-svn-id: branches/fixes_3_0@34106 -
2016-07-13 15:44:16 +00:00
marco
491d163202 --- Merging r34059 into '.':
U    rtl/i386/int64p.inc
A    tests/webtbs/tw30240.pp
--- Recording mergeinfo for merge of r34059 into '.':
 U   .
--- Merging r34088 into '.':
A    tests/webtbs/tw30357.pp
U    compiler/symtable.pas
--- Recording mergeinfo for merge of r34088 into '.':
 G   .

# revisions: 34059,34088

git-svn-id: branches/fixes_3_0@34103 -
2016-07-13 15:12:46 +00:00
Jonas Maebe
3da9f31fa2 --- Merging r34035 into '.':
U    compiler/nadd.pas
A    tests/tbs/tb0621.pp
--- Recording mergeinfo for merge of r34035 into '.':

git-svn-id: branches/fixes_3_0@34068 -
2016-07-05 16:30:43 +00:00
Jonas Maebe
2d99a173eb --- Merging r32613 into '.':
U    tests/webtbs/tw28713b.pp
--- Recording mergeinfo for merge of r32613 into '.':

git-svn-id: branches/fixes_3_0@34066 -
2016-07-04 20:56:36 +00:00
Jonas Maebe
c86b538a25 --- Merging r32602 into '.':
A    tests/webtbs/tw28713b.pp
A    tests/webtbs/tw28713.pp
U    compiler/nmem.pas
--- Recording mergeinfo for merge of r32602 into '.':
 U   .
 --- Merging r33195 into '.':
 G    compiler/nmem.pas
 --- Recording mergeinfo for merge of r33195 into '.':

git-svn-id: branches/fixes_3_0@34054 -
2016-07-03 15:31:29 +00:00
Jonas Maebe
25695174d0 --- Merging r32602 into '.':
A    tests/webtbs/tw28713b.pp
A    tests/webtbs/tw28713.pp
U    compiler/nmem.pas
--- Recording mergeinfo for merge of r32602 into '.':
 U   .
--- Merging r33195 into '.':
G    compiler/nmem.pas
--- Recording mergeinfo for merge of r33195 into '.':

git-svn-id: branches/fixes_3_0@34053 -
2016-07-03 15:31:07 +00:00
marco
3478131437 --- Merging r34041 into '.':
U    rtl/linux/ostypes.inc
--- Recording mergeinfo for merge of r34041 into '.':
 U   .

# revisions: 34041

git-svn-id: branches/fixes_3_0@34042 -
2016-06-30 18:51:56 +00:00
marco
e5961616b5 --- Merging r34039 into '.':
U    rtl/linux/ossysc.inc
--- Recording mergeinfo for merge of r34039 into '.':
 U   .

# revisions: 34039

git-svn-id: branches/fixes_3_0@34040 -
2016-06-30 18:46:03 +00:00
marco
e628e858b5 --- Merging r31356 into '.':
U    packages/rtl-objpas/src/inc/dateutil.inc
--- Recording mergeinfo for merge of r31356 into '.':
 U   .

# revisions: 31356

git-svn-id: branches/fixes_3_0@34023 -
2016-06-29 19:32:08 +00:00
marco
28d241062f --- Merging r32125 into '.':
U    compiler/symtable.pas
--- Recording mergeinfo for merge of r32125 into '.':
 U   .

# revisions: 32125

git-svn-id: branches/fixes_3_0@33933 -
2016-06-07 19:34:32 +00:00
marco
c02fa41b46 --- Merging r32328 into '.':
U    rtl/android/cwstring.pp
--- Recording mergeinfo for merge of r32328 into '.':
 U   .
--- Merging r32345 into '.':
G    rtl/android/cwstring.pp
--- Recording mergeinfo for merge of r32345 into '.':
 G   .
--- Merging r32538 into '.':
G    rtl/android/cwstring.pp
--- Recording mergeinfo for merge of r32538 into '.':
 G   .

# revisions: 32328,32345,32538

git-svn-id: branches/fixes_3_0@33921 -
2016-06-05 19:50:07 +00:00
marco
029a0fc7f3 --- Merging r33917 into '.':
U    packages/fcl-pdf/fpmake.pp
--- Recording mergeinfo for merge of r33917 into '.':
 U   .
--- Merging r33918 into '.':
U    installer/install.dat
--- Recording mergeinfo for merge of r33918 into '.':
 G   .

# revisions: 33917,33918

git-svn-id: branches/fixes_3_0@33920 -
2016-06-05 18:51:14 +00:00
Jonas Maebe
c1b7738d2b + added test file missing from merge in r31984
git-svn-id: branches/fixes_3_0@33915 -
2016-06-05 12:18:34 +00:00
Jonas Maebe
1570437996 - reverted merge of r32824: that commit contained new functionality,
was buggy and broke JVM building

git-svn-id: branches/fixes_3_0@33914 -
2016-06-05 12:18:06 +00:00
marco
04dc706dbe --- Merging r33894 into '.':
U    rtl/go32v2/dos.pp
U    rtl/msdos/dos.pp
U    rtl/os2/sysutils.pp
U    rtl/os2/dos.pas
U    rtl/watcom/dos.pp
--- Recording mergeinfo for merge of r33894 into '.':
 U   .

# revisions: 33894

git-svn-id: branches/fixes_3_0@33907 -
2016-06-04 17:17:44 +00:00
marco
996809edc7 --- Merging r33898 into '.':
U    packages/libmicrohttpd/fpmake.pp
--- Recording mergeinfo for merge of r33898 into '.':
 U   .

# revisions: 33898

git-svn-id: branches/fixes_3_0@33903 -
2016-06-04 10:18:09 +00:00
marco
95bab9691d * disable fcl-pdf for nativeNT manually.
git-svn-id: branches/fixes_3_0@33902 -
2016-06-04 10:17:19 +00:00
marco
70aec083c1 --- Merging r33882 into '.':
U    packages/cdrom/src/fpcddb.pp
U    packages/fcl-net/src/httpsvlt.pp
U    packages/fcl-sdo/src/base/sdo_consts.pas
U    packages/fcl-sdo/src/base/sdo_xpath_helper.pas
U    packages/fv/src/editors.pas
U    packages/fv/src/strtxt.inc
U    packages/fcl-db/src/base/dbconst.pas
U    packages/fcl-db/src/sqlite/sqliteds.pas
U    packages/fcl-xml/tests/testgen.pp
U    packages/fcl-xml/src/xmltextreader.pp
U    utils/fpdoc/fpclasschart.pp
U    utils/fpdoc/makeskel.pp
U    utils/fpdoc/unitdiff.pp
U    utils/fpdoc/dwriter.pp
U    utils/fpdoc/dglobals.pp
U    utils/delp.pp
U    ide/fphelp.pas
U    ide/fp.pas
U    ide/wconstse.inc
U    rtl/objpas/sysconst.pp
U    rtl/macos/system.pp
--- Recording mergeinfo for merge of r33882 into '.':
 U   .

# revisions: 33882

git-svn-id: branches/fixes_3_0@33883 -
2016-06-02 20:13:06 +00:00
marco
3e49f952ae --- Merging r32864 into '.':
U    rtl/objpas/typinfo.pp
--- Recording mergeinfo for merge of r32864 into '.':
 U   .

# revisions: 32864

git-svn-id: branches/fixes_3_0@33880 -
2016-06-02 19:30:43 +00:00
marco
b644d609cb * partially merge 30274 to fix embedded (not recorded), mantis #30221
git-svn-id: branches/fixes_3_0@33873 -
2016-06-01 19:10:10 +00:00
marco
ea23385d59 * revert pos(offs,string)
git-svn-id: branches/fixes_3_0@33871 -
2016-06-01 18:38:08 +00:00
marco
2afe1cf19f --- Merging r32354 into '.':
U    rtl/msdos/Makefile.fpc
U    rtl/msdos/Makefile
--- Recording mergeinfo for merge of r32354 into '.':
 U   .

# revisions: 32354

git-svn-id: branches/fixes_3_0@33870 -
2016-06-01 15:38:04 +00:00
marco
4d72f97d75 # revisions: reversemerge 33713 and 33714
git-svn-id: branches/fixes_3_0@33869 -
2016-06-01 15:33:40 +00:00
marco
0412d28156 --- Merging r33711 into '.':
U    rtl/nativent/Makefile.fpc
U    rtl/nativent/buildrtl.pp
A    rtl/nativent/dos.pp
--- Recording mergeinfo for merge of r33711 into '.':
 U   .
--- Merging r33712 into '.':
C    rtl/nativent/Makefile.fpc
--- Recording mergeinfo for merge of r33712 into '.':
 G   .
Summary of conflicts:
  Text conflicts: 1

# revisions: 33711,33712

git-svn-id: branches/fixes_3_0@33868 -
2016-06-01 15:11:59 +00:00
marco
05349cdb81 --- Merging r30016 into '.':
U    rtl/os2/sysucode.inc
--- Recording mergeinfo for merge of r30016 into '.':
 U   .
--- Merging r32270 into '.':
G    rtl/os2/sysucode.inc
--- Recording mergeinfo for merge of r32270 into '.':
 G   .

# revisions: 30016,32270

git-svn-id: branches/fixes_3_0@33866 -
2016-05-31 21:55:48 +00:00
marco
f18c6b3273 --- Merging r32277 into '.':
U    rtl/wince/sysutils.pp
--- Recording mergeinfo for merge of r32277 into '.':
 U   .

# revisions: 32277

git-svn-id: branches/fixes_3_0@33864 -
2016-05-31 21:13:28 +00:00
marco
c67f8f2a28 --- Merging r32845 into '.':
A    tests/webtbs/tw29321.pp
U    compiler/pexpr.pas
--- Recording mergeinfo for merge of r32845 into '.':
 U   .

# revisions: 32845

git-svn-id: branches/fixes_3_0@33862 -
2016-05-31 07:23:52 +00:00
marco
bce375dc3a --- Merging r31434 into '.':
U    rtl/inc/heaptrc.pp
--- Recording mergeinfo for merge of r31434 into '.':
 U   .

# revisions: 31434

git-svn-id: branches/fixes_3_0@33861 -
2016-05-31 05:59:35 +00:00
marco
f8e7eddefc --- Merging r33429 into '.':
U    packages/libndsfpc/src/nds/fifocommon.inc
U    packages/libndsfpc/src/nds/arm7/sdmmc.inc
U    packages/libndsfpc/src/nds/fifomessages.inc
U    packages/libndsfpc/src/nds/libversion.inc
--- Recording mergeinfo for merge of r33429 into '.':
 U   .

# revisions: 33429

git-svn-id: branches/fixes_3_0@33857 -
2016-05-30 12:31:17 +00:00
marco
80d45f6b2d * patch from Sven equal to r31911 backported to 3.0.x
git-svn-id: branches/fixes_3_0@33856 -
2016-05-30 09:28:56 +00:00
Jonas Maebe
5addbae947 Merging r33630
git-svn-id: branches/fixes_3_0@33850 -
2016-05-29 16:19:22 +00:00
Jonas Maebe
a7fb19313a Merging -c 29493,29826,31916,32447,33176:33180,33190
git-svn-id: branches/fixes_3_0@33849 -
2016-05-29 16:15:44 +00:00
Jonas Maebe
5107d65b32 Merging r33050
git-svn-id: branches/fixes_3_0@33845 -
2016-05-29 15:22:48 +00:00
Jonas Maebe
feb56205b3 Merging r32904
git-svn-id: branches/fixes_3_0@33844 -
2016-05-29 15:21:22 +00:00
marco
874a86309f # revisions: 32540,32818,32939,33299,33305,33328,33329,33339,33342,33344,33700,33829
git-svn-id: branches/fixes_3_0@33839 -
2016-05-28 13:35:24 +00:00
marco
38a19f9f32 # revisions: 33059,33060,33153,33209,33238
git-svn-id: branches/fixes_3_0@33838 -
2016-05-28 13:07:55 +00:00
marco
60f442447d # revisions: 31464,31467,31468,33055,33056,33057,33058
git-svn-id: branches/fixes_3_0@33837 -
2016-05-28 12:53:59 +00:00
marco
76de6202fd # revisions: 32266
git-svn-id: branches/fixes_3_0@33836 -
2016-05-28 12:33:11 +00:00
marco
cdba09c96d # revisions: 32265
git-svn-id: branches/fixes_3_0@33835 -
2016-05-28 12:32:35 +00:00
marco
ee70e17823 # revisions: 31603
git-svn-id: branches/fixes_3_0@33834 -
2016-05-28 12:30:41 +00:00
marco
bfcff22749 --- Merging r33362 into '.':
U    rtl/objpas/sysutils/sysutilh.inc
--- Recording mergeinfo for merge of r33362 into '.':
 U   .
--- Merging r33363 into '.':
U    rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r33363 into '.':
 G   .
--- Merging r33377 into '.':
G    rtl/objpas/sysutils/sysutilh.inc
U    rtl/objpas/sysutils/sysutils.inc
--- Recording mergeinfo for merge of r33377 into '.':
 G   .
--- Merging r33378 into '.':
G    rtl/objpas/sysutils/sysutilh.inc
G    rtl/objpas/sysutils/sysutils.inc
--- Recording mergeinfo for merge of r33378 into '.':
 G   .

# revisions: 33362,33363,33377,33378

git-svn-id: branches/fixes_3_0@33823 -
2016-05-26 17:13:57 +00:00
marco
a57e3d1682 --- Merging r32858 into '.':
U    packages/rtl-objpas/src/inc/variants.pp
U    rtl/objpas/typinfo.pp
--- Recording mergeinfo for merge of r32858 into '.':
 U   .
--- Merging r32863 into '.':
G    packages/rtl-objpas/src/inc/variants.pp
--- Recording mergeinfo for merge of r32863 into '.':
 G   .

# revisions: 32858,32863

git-svn-id: branches/fixes_3_0@33822 -
2016-05-26 16:55:26 +00:00