10512 Commits

Author	SHA1	Message	Date
michael	6166daf414	* Merging revisions 45189,45192 from trunk: ... ------------------------------------------------------------------------ r45189 | michael | 2020-04-30 12:43:03 +0200 (Thu, 30 Apr 2020) | 1 line * Avoid errors when dataset is not active while constructing update SQL. ------------------------------------------------------------------------ r45192 | michael | 2020-04-30 18:20:16 +0200 (Thu, 30 Apr 2020) | 1 line * Fix clearing of arrays and recursive definitions for arrays ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@45193 -	2020-04-30 16:23:46 +00:00
michael	d2deae41f2	* Merging revisions r44373 from trunk: ... ------------------------------------------------------------------------ r44373 | michael | 2020-03-27 07:28:20 +0100 (Fri, 27 Mar 2020) | 1 line * Remove debug statements ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@45049 -	2020-04-24 07:07:04 +00:00
michael	97f098786c	* Merging revisions 44775 from trunk: ... ------------------------------------------------------------------------ r44775 | michael | 2020-04-18 12:36:03 +0200 (Sat, 18 Apr 2020) | 1 line * Fix bug #36851: Content-Length header needs to be removed if automatically added ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@45048 -	2020-04-24 07:04:58 +00:00
marco	47edf85831	--- Merging r44845 into '.': ... U packages/rtl-extra/src/inc/sockets.inc --- Recording mergeinfo for merge of r44845 into '.': U . # revisions: 44845 git-svn-id: branches/fixes_3_2@44880 -	2020-04-20 11:41:46 +00:00
marco	32b4647870	# revisions: 44443,44667,44714,44724 ... git-svn-id: branches/fixes_3_2@44864 -	2020-04-19 18:13:59 +00:00
marco	8250336193	# revisions: 44496,44529,44632,44635,44643,44644,44664 ... git-svn-id: branches/fixes_3_2@44863 -	2020-04-19 18:06:48 +00:00
Jonas Maebe	89025f241c	--- Merging r42501 into '.': ... U packages/cocoaint/src/AVFoundation.pas U packages/cocoaint/src/AVKit.pas U packages/cocoaint/src/Accounts.pas U packages/cocoaint/src/AddressBook.pas U packages/cocoaint/src/AppKit.pas U packages/cocoaint/src/AppleScriptObjC.pas U packages/cocoaint/src/AudioVideoBridging.pas U packages/cocoaint/src/Automator.pas U packages/cocoaint/src/CFOpenDirectory.pas U packages/cocoaint/src/CalendarStore.pas U packages/cocoaint/src/CloudKit.pas U packages/cocoaint/src/CocoaAll.pas U packages/cocoaint/src/Collaboration.pas U packages/cocoaint/src/CoreAudio.pas U packages/cocoaint/src/CoreAudioKit.pas U packages/cocoaint/src/CoreBluetooth.pas U packages/cocoaint/src/CoreData.pas U packages/cocoaint/src/CoreImage.pas U packages/cocoaint/src/CoreLocation.pas U packages/cocoaint/src/CoreMedia.pas U packages/cocoaint/src/CoreMediaIO.pas U packages/cocoaint/src/CoreVideo.pas U packages/cocoaint/src/CryptoTokenKit.pas U packages/cocoaint/src/DefinedClassesAVFoundation.pas U packages/cocoaint/src/DefinedClassesAVKit.pas U packages/cocoaint/src/DefinedClassesAccounts.pas U packages/cocoaint/src/DefinedClassesAddressBook.pas U packages/cocoaint/src/DefinedClassesAppKit.pas U packages/cocoaint/src/DefinedClassesAppleScriptObjC.pas U packages/cocoaint/src/DefinedClassesAudioVideoBridging.pas U packages/cocoaint/src/DefinedClassesAutomator.pas U packages/cocoaint/src/DefinedClassesCFOpenDirectory.pas U packages/cocoaint/src/DefinedClassesCalendarStore.pas U packages/cocoaint/src/DefinedClassesCloudKit.pas U packages/cocoaint/src/DefinedClassesCollaboration.pas U packages/cocoaint/src/DefinedClassesCoreAudio.pas U packages/cocoaint/src/DefinedClassesCoreAudioKit.pas U packages/cocoaint/src/DefinedClassesCoreBluetooth.pas U packages/cocoaint/src/DefinedClassesCoreData.pas U packages/cocoaint/src/DefinedClassesCoreImage.pas U packages/cocoaint/src/DefinedClassesCoreLocation.pas U packages/cocoaint/src/DefinedClassesCoreMedia.pas U packages/cocoaint/src/DefinedClassesCoreMediaIO.pas U packages/cocoaint/src/DefinedClassesCoreVideo.pas U packages/cocoaint/src/DefinedClassesCryptoTokenKit.pas U packages/cocoaint/src/DefinedClassesEventKit.pas U packages/cocoaint/src/DefinedClassesFinderSync.pas U packages/cocoaint/src/DefinedClassesFoundation.pas U packages/cocoaint/src/DefinedClassesGLKit.pas U packages/cocoaint/src/DefinedClassesGameController.pas U packages/cocoaint/src/DefinedClassesGameKit.pas U packages/cocoaint/src/DefinedClassesIOBluetooth.pas U packages/cocoaint/src/DefinedClassesIOBluetoothUI.pas U packages/cocoaint/src/DefinedClassesImageCaptureCore.pas U packages/cocoaint/src/DefinedClassesImageKit.pas U packages/cocoaint/src/DefinedClassesInputMethodKit.pas U packages/cocoaint/src/DefinedClassesInstallerPlugins.pas U packages/cocoaint/src/DefinedClassesInstantMessage.pas U packages/cocoaint/src/DefinedClassesLocalAuthentication.pas U packages/cocoaint/src/DefinedClassesMapKit.pas U packages/cocoaint/src/DefinedClassesMediaAccessibility.pas U packages/cocoaint/src/DefinedClassesMediaLibrary.pas U packages/cocoaint/src/DefinedClassesMultipeerConnectivity.pas U packages/cocoaint/src/DefinedClassesNotificationCenter.pas U packages/cocoaint/src/DefinedClassesOSAKit.pas U packages/cocoaint/src/DefinedClassesOpenDirectory.pas U packages/cocoaint/src/DefinedClassesPDFKit.pas U packages/cocoaint/src/DefinedClassesPreferencePanes.pas U packages/cocoaint/src/DefinedClassesPubSub.pas U packages/cocoaint/src/DefinedClassesQTKit.pas U packages/cocoaint/src/DefinedClassesQuartzComposer.pas U packages/cocoaint/src/DefinedClassesQuartzCore.pas U packages/cocoaint/src/DefinedClassesQuartzFilters.pas U packages/cocoaint/src/DefinedClassesQuickLook.pas U packages/cocoaint/src/DefinedClassesQuickLookUI.pas U packages/cocoaint/src/DefinedClassesSceneKit.pas U packages/cocoaint/src/DefinedClassesScreenSaver.pas U packages/cocoaint/src/DefinedClassesScriptingBridge.pas U packages/cocoaint/src/DefinedClassesSecurityFoundation.pas U packages/cocoaint/src/DefinedClassesSecurityInterface.pas U packages/cocoaint/src/DefinedClassesServiceManagement.pas U packages/cocoaint/src/DefinedClassesSocial.pas U packages/cocoaint/src/DefinedClassesSpriteKit.pas U packages/cocoaint/src/DefinedClassesStoreKit.pas U packages/cocoaint/src/DefinedClassesSyncServices.pas U packages/cocoaint/src/DefinedClassesWebKit.pas U packages/cocoaint/src/DefinedClassesiTunesLibrary.pas U packages/cocoaint/src/EventKit.pas U packages/cocoaint/src/FinderSync.pas U packages/cocoaint/src/Foundation.pas U packages/cocoaint/src/GLKit.pas U packages/cocoaint/src/GameController.pas U packages/cocoaint/src/GameKit.pas U packages/cocoaint/src/IOBluetooth.pas U packages/cocoaint/src/IOBluetoothUI.pas U packages/cocoaint/src/ImageCaptureCore.pas U packages/cocoaint/src/ImageKit.pas U packages/cocoaint/src/InputMethodKit.pas U packages/cocoaint/src/InstallerPlugins.pas U packages/cocoaint/src/InstantMessage.pas U packages/cocoaint/src/LocalAuthentication.pas U packages/cocoaint/src/MapKit.pas U packages/cocoaint/src/MediaAccessibility.pas U packages/cocoaint/src/MediaLibrary.pas U packages/cocoaint/src/MultipeerConnectivity.pas U packages/cocoaint/src/NotificationCenter.pas U packages/cocoaint/src/OSAKit.pas U packages/cocoaint/src/OpenDirectory.pas U packages/cocoaint/src/PDFKit.pas U packages/cocoaint/src/PreferencePanes.pas U packages/cocoaint/src/PubSub.pas U packages/cocoaint/src/QTKit.pas U packages/cocoaint/src/QuartzComposer.pas U packages/cocoaint/src/QuartzCore.pas U packages/cocoaint/src/QuartzFilters.pas U packages/cocoaint/src/QuickLook.pas U packages/cocoaint/src/QuickLookUI.pas U packages/cocoaint/src/SceneKit.pas U packages/cocoaint/src/ScreenSaver.pas U packages/cocoaint/src/ScriptingBridge.pas U packages/cocoaint/src/SecurityFoundation.pas U packages/cocoaint/src/SecurityInterface.pas U packages/cocoaint/src/ServiceManagement.pas U packages/cocoaint/src/Social.pas U packages/cocoaint/src/SpriteKit.pas U packages/cocoaint/src/StoreKit.pas U packages/cocoaint/src/SyncServices.pas U packages/cocoaint/src/WebKit.pas U packages/cocoaint/src/addressbook/ABAddressBook.inc U packages/cocoaint/src/appkit/NSAnimation.inc U packages/cocoaint/src/appkit/NSApplication.inc U packages/cocoaint/src/appkit/NSArrayController.inc U packages/cocoaint/src/appkit/NSBitmapImageRep.inc U packages/cocoaint/src/appkit/NSBox.inc U packages/cocoaint/src/appkit/NSClipView.inc U packages/cocoaint/src/appkit/NSColorList.inc U packages/cocoaint/src/appkit/NSColorWell.inc U packages/cocoaint/src/appkit/NSComboBoxCell.inc U packages/cocoaint/src/appkit/NSControl.inc U packages/cocoaint/src/appkit/NSController.inc U packages/cocoaint/src/appkit/NSCursor.inc U packages/cocoaint/src/appkit/NSDatePickerCell.inc U packages/cocoaint/src/appkit/NSDictionaryController.inc U packages/cocoaint/src/appkit/NSDocument.inc U packages/cocoaint/src/appkit/NSFont.inc U packages/cocoaint/src/appkit/NSFontPanel.inc U packages/cocoaint/src/appkit/NSGestureRecognizer.inc U packages/cocoaint/src/appkit/NSImage.inc U packages/cocoaint/src/appkit/NSImageCell.inc U packages/cocoaint/src/appkit/NSImageRep.inc U packages/cocoaint/src/appkit/NSImageView.inc U packages/cocoaint/src/appkit/NSLayoutManager.inc U packages/cocoaint/src/appkit/NSMenu.inc U packages/cocoaint/src/appkit/NSMenuItem.inc U packages/cocoaint/src/appkit/NSMenuItemCell.inc U packages/cocoaint/src/appkit/NSMenuView.inc U packages/cocoaint/src/appkit/NSNib.inc U packages/cocoaint/src/appkit/NSObjectController.inc U packages/cocoaint/src/appkit/NSPageController.inc U packages/cocoaint/src/appkit/NSPanGestureRecognizer.inc U packages/cocoaint/src/appkit/NSPopUpButton.inc U packages/cocoaint/src/appkit/NSRulerMarker.inc U packages/cocoaint/src/appkit/NSScrollView.inc U packages/cocoaint/src/appkit/NSScroller.inc U packages/cocoaint/src/appkit/NSSearchFieldCell.inc U packages/cocoaint/src/appkit/NSSliderCell.inc U packages/cocoaint/src/appkit/NSSpellChecker.inc U packages/cocoaint/src/appkit/NSStatusBar.inc U packages/cocoaint/src/appkit/NSTabView.inc U packages/cocoaint/src/appkit/NSTabViewItem.inc U packages/cocoaint/src/appkit/NSTableColumn.inc U packages/cocoaint/src/appkit/NSTextContainer.inc U packages/cocoaint/src/appkit/NSTextFieldCell.inc U packages/cocoaint/src/appkit/NSToolbar.inc U packages/cocoaint/src/appkit/NSToolbarItem.inc U packages/cocoaint/src/appkit/NSTreeController.inc U packages/cocoaint/src/appkit/NSUserDefaultsController.inc U packages/cocoaint/src/appkit/NSView.inc U packages/cocoaint/src/appkit/NSWindow.inc U packages/cocoaint/src/appkit/NSWindowController.inc U packages/cocoaint/src/automator/AMWorkflowController.inc U packages/cocoaint/src/automator/AMWorkflowView.inc U packages/cocoaint/src/coredata/NSBatchUpdateRequest.inc U packages/cocoaint/src/coredata/NSEntityDescription.inc U packages/cocoaint/src/coredata/NSEntityMapping.inc U packages/cocoaint/src/coredata/NSFetchRequestExpression.inc U packages/cocoaint/src/coredata/NSManagedObjectContext.inc U packages/cocoaint/src/coredata/NSManagedObjectModel.inc U packages/cocoaint/src/coredata/NSMappingModel.inc U packages/cocoaint/src/coredata/NSPersistentStore.inc U packages/cocoaint/src/coredata/NSPersistentStoreCoordinator.inc U packages/cocoaint/src/coredata/NSPropertyDescription.inc U packages/cocoaint/src/coredata/NSPropertyMapping.inc U packages/cocoaint/src/foundation/InlineFunctions.inc U packages/cocoaint/src/foundation/NSProxy.inc U packages/cocoaint/src/iTunesLibrary.pas --- Recording mergeinfo for merge of r42501 into '.': U . git-svn-id: branches/fixes_3_2@44841 -	2020-04-19 10:42:57 +00:00
michael	525d1c5ed5	* Merging revisions 44429 from trunk: ... ------------------------------------------------------------------------ r44429 | michael | 2020-03-30 11:26:02 +0200 (Mon, 30 Mar 2020) | 1 line * Patch from Bart Broersma to fix bug ID #36809 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@44430 -	2020-03-30 09:57:29 +00:00
ondrej	227f408df9	Merge revisions: r44040, r43881, r43700, r43699, r43698, r43602 ... Revision: 44040 Author: ondrej Date: Sonntag, 26. Januar 2020 18:49:08 Message: fcl-db: allow 0 length in binary field (MSSQL can have a null/0 field length in a view) ---- Modified : /trunk/packages/fcl-db/src/base/fields.inc Revision: 43881 Author: ondrej Date: Dienstag, 7. Januar 2020 10:41:20 Message: odbc: fix international column names ---- Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas Modified : /trunk/packages/fcl-db/src/sqldb/sqldb.pp Revision: 43700 Author: ondrej Date: Donnerstag, 19. Dezember 2019 18:43:34 Message: sqldb: odbc: use ANSI codepage for connection as default ---- Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas Revision: 43699 Author: ondrej Date: Donnerstag, 19. Dezember 2019 17:54:36 Message: sqldb: odbc: send SQL to ODBC as WideString to support FPC 3.0.x character conversion ---- Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas Revision: 43698 Author: ondrej Date: Donnerstag, 19. Dezember 2019 17:41:57 Message: odbc: fix passing ANSI parameters with FPC character conversion ---- Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas Revision: 43602 Author: ondrej Date: Donnerstag, 28. November 2019 13:59:13 Message: fcl-db: ODBC: allow NULL parameters (TParam.Value := Null sets type to ftUnknown) ---- Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas git-svn-id: branches/fixes_3_2@44391 -	2020-03-29 06:46:42 +00:00
ondrej	6b3a22efb5	Merge revision: r43294 ... Author: ondrej Date: Montag, 21. Oktober 2019 19:28:27 Message: fcl-image: make test compile ---- Modified : /trunk/packages/fcl-image/test/tcbarcodes.pp Modified : /trunk/packages/fcl-image/test/testfpimage.lpr git-svn-id: branches/fixes_3_2@44390 -	2020-03-29 06:34:44 +00:00
Jonas Maebe	d73b4e1e81	--- Merging r42509 into '.': ... U packages/cocoaint/fpmake.pp --- Recording mergeinfo for merge of r42509 into '.': U . git-svn-id: branches/fixes_3_2@44327 -	2020-03-21 15:42:17 +00:00
marco	b2dedf8aec	--- Merging r43469 into '.': ... U packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r43469 into '.': U . --- Merging r43470 into '.': G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r43470 into '.': G . --- Merging r43471 into '.': G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r43471 into '.': G . # revisions: 43469,43470,43471 git-svn-id: branches/fixes_3_2@44308 -	2020-03-17 14:38:55 +00:00
marco	6d1a81ffde	--- Recording mergeinfo for merge of r44225 into '.': ... G . # revisions: 44225 git-svn-id: branches/fixes_3_2@44307 -	2020-03-17 09:36:47 +00:00
marco	7b1408640e	--- Merging r43290 into '.': ... U packages/fcl-image/src/freetype.pp --- Recording mergeinfo for merge of r43290 into '.': U . --- Merging r43291 into '.': G packages/fcl-image/src/freetype.pp --- Recording mergeinfo for merge of r43291 into '.': G . --- Merging r43292 into '.': U packages/fcl-image/src/libfreetype.inc --- Recording mergeinfo for merge of r43292 into '.': G . --- Merging r43293 into '.': U packages/fcl-image/examples/textout.pp G packages/fcl-image/src/freetype.pp U packages/fcl-image/src/ftfont.pp --- Recording mergeinfo for merge of r43293 into '.': G . --- Merging r43334 into '.': U packages/fcl-image/src/freetypehdyn.pp --- Recording mergeinfo for merge of r43334 into '.': G . --- Merging r43335 into '.': U packages/fcl-image/src/fphelper.inc --- Recording mergeinfo for merge of r43335 into '.': G . --- Merging r43420 into '.': U packages/rtl-generics/src/inc/generics.dictionaries.inc --- Recording mergeinfo for merge of r43420 into '.': G . # revisions: 43290,43291,43292,43293,43334,43335,43420 git-svn-id: branches/fixes_3_2@44300 -	2020-03-14 15:56:48 +00:00
marco	c06a8ad7bb	# revisions: 44262 ... git-svn-id: branches/fixes_3_2@44299 -	2020-03-14 15:25:47 +00:00
marco	913dd3190f	# revisions: 43950,44275,44276,44277,44278,44280,44282,44290 ... git-svn-id: branches/fixes_3_2@44298 -	2020-03-14 15:22:22 +00:00
marco	8a2da3c007	--- Merging r44258 into '.': ... U rtl/win/wininc/struct.inc --- Recording mergeinfo for merge of r44258 into '.': U . --- Merging r44259 into '.': U packages/winunits-base/src/commctrl.pp U packages/winunits-base/src/nb30.pp --- Recording mergeinfo for merge of r44259 into '.': G . --- Merging r44260 into '.': G packages/winunits-base/src/commctrl.pp --- Recording mergeinfo for merge of r44260 into '.': G . # revisions: 44258,44259,44260 git-svn-id: branches/fixes_3_2@44263 -	2020-03-04 09:37:16 +00:00
pierre	eec778bcd5	Merge of commit 44246 from trunk branch ... + other fixes to packages/*/fpmake.pp with wrong versions. Fixes shortsrc target in fixes_3_2 branch. ------------------------------------------------------------------------ r44246 | pierre | 2020-02-27 07:32:00 +0000 (Thu, 27 Feb 2020) | 3 lines * Fix sourcezip make target, correcting mixed case input file names. ------------------------------------------------------------------------ --- Merging r44246 into '.': U packages/ide/fpmake.pp U packages/libgbafpc/fpmake.pp U packages/libndsfpc/fpmake.pp U packages/vcl-compat/fpmake.pp --- Recording mergeinfo for merge of r44246 into '.': U . git-svn-id: branches/fixes_3_2@44247 -	2020-02-27 16:52:50 +00:00
Jonas Maebe	e1d37acf20	--- Merging r44231 into '.': ... U packages/cocoaint/src/foundation/NSExtensionContext.inc git-svn-id: branches/fixes_3_2@44232 -	2020-02-22 16:23:14 +00:00
joost	313ff530ff	--- Merging (from foreign repository) r44152 into '.': ... U fpmake.pp U packages/fpmake.pp U packages/ide/fpmake.pp --- Merging (from foreign repository) r44154 into '.': G packages/ide/fpmake.pp git-svn-id: branches/fixes_3_2@44229 -	2020-02-21 14:50:44 +00:00
joost	6704b5fa9f	--- Merging (from foreign repository) r44089 into '.': ... U packages/fcl-web/src/base/fphttpserver.pp git-svn-id: branches/fixes_3_2@44227 -	2020-02-21 14:49:20 +00:00
joost	2e864e6bb7	--- Merging (from foreign repository) r44088 into '.': ... U packages/fcl-net/src/netdb.pp git-svn-id: branches/fixes_3_2@44226 -	2020-02-21 14:48:42 +00:00
joost	46d8498a7a	--- Merging (from foreign repository) r44183 into '.': ... U packages/fppkg/src/fprepos.pp git-svn-id: branches/fixes_3_2@44224 -	2020-02-21 14:17:45 +00:00
marco	75558b7437	--- Merging r44178 into '.': ... U packages/winunits-base/src/activex.pp --- Recording mergeinfo for merge of r44178 into '.': U . # revisions: 44178 git-svn-id: branches/fixes_3_2@44209 -	2020-02-18 13:47:58 +00:00
michael	1fe4a6ff79	* Merging revisions 44149,44150 from trunk: ... ------------------------------------------------------------------------ r44149 | michael | 2020-02-11 10:44:49 +0100 (Tue, 11 Feb 2020) | 1 line * Enable use of EFS flag when zipping files ------------------------------------------------------------------------ r44150 | michael | 2020-02-11 11:17:47 +0100 (Tue, 11 Feb 2020) | 1 line * Patch from Petr K to save directory with zero size (Bug ID 36691) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@44160 -	2020-02-12 09:19:25 +00:00
michael	e3174352cb	* Merging revisions 44142 from trunk: ... ------------------------------------------------------------------------ r44142 | michael | 2020-02-09 18:51:06 +0100 (Sun, 09 Feb 2020) | 1 line * Patch from Simon Ameis to actually implement parameter checking ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@44159 -	2020-02-12 09:18:23 +00:00
michael	3088728222	* Merging revisions 44004 from trunk: ... ------------------------------------------------------------------------ r44004 | michael | 2020-01-20 19:23:58 +0100 (Mon, 20 Jan 2020) | 1 line * Clear search path (fix from Pascal Riekenberg, bug ID #36609) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@44158 -	2020-02-12 09:17:32 +00:00
michael	9770687180	* Merging revisions 43977 from trunk: ... ------------------------------------------------------------------------ r43977 | michael | 2020-01-19 10:38:32 +0100 (Sun, 19 Jan 2020) | 1 line * Fix bug #36603, disable inline ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@44157 -	2020-02-12 09:16:51 +00:00
michael	6851a89514	* Merging revisions 43974 from trunk: ... ------------------------------------------------------------------------ r43974 | michael | 2020-01-18 17:44:22 +0100 (Sat, 18 Jan 2020) | 1 line * Fix regression ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@44156 -	2020-02-12 09:16:25 +00:00
michael	a99bcc7d4a	* Merging revisions 43972 from trunk: ... ------------------------------------------------------------------------ r43972 | michael | 2020-01-18 16:35:25 +0100 (Sat, 18 Jan 2020) | 1 line * Fix bug ID #0036482, various fixes by Alexey T. ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@44155 -	2020-02-12 09:16:02 +00:00
marco	e4165fa85f	--- Merging r44125 into '.': ... U packages/paszlib/src/zipper.pp --- Recording mergeinfo for merge of r44125 into '.': U . --- Merging r44126 into '.': G packages/paszlib/src/zipper.pp --- Recording mergeinfo for merge of r44126 into '.': G . # revisions: 44125,44126 git-svn-id: branches/fixes_3_2@44129 -	2020-02-08 13:08:51 +00:00
marco	08e9298df4	--- Merging r42301 into '.': ... U packages/fcl-process/src/amicommon/process.inc --- Recording mergeinfo for merge of r42301 into '.': U . --- Merging r42760 into '.': U packages/amunits/src/coreunits/intuition.pas --- Recording mergeinfo for merge of r42760 into '.': G . --- Merging r44045 into '.': U packages/amunits/src/coreunits/amigados.pas --- Recording mergeinfo for merge of r44045 into '.': G . --- Merging r44059 into '.': U packages/arosunits/src/amigados.pas --- Recording mergeinfo for merge of r44059 into '.': G . --- Merging r44102 into '.': G packages/arosunits/src/amigados.pas --- Recording mergeinfo for merge of r44102 into '.': G . --- Merging r44105 into '.': U packages/amunits/src/coreunits/agraphics.pas U packages/amunits/src/coreunits/datatypes.pas U packages/amunits/src/coreunits/exec.pas G packages/amunits/src/coreunits/intuition.pas U packages/amunits/src/coreunits/locale.pas U packages/amunits/src/otherlibs/cybergraphics.pas U packages/morphunits/src/keymap.pas U packages/morphunits/src/mui.pas --- Recording mergeinfo for merge of r44105 into '.': G . # revisions: 42301,42760,44045,44059,44102,44105 git-svn-id: branches/fixes_3_2@44106 -	2020-02-03 19:32:16 +00:00
marco	9bf0616b5e	--- Merging r44024 into '.': ... U packages/rtl-objpas/src/inc/strutils.pp --- Recording mergeinfo for merge of r44024 into '.': U . # revisions: 44024 git-svn-id: branches/fixes_3_2@44092 -	2020-02-02 14:15:02 +00:00
ondrej	a4394be6a5	Merge revisions r43936, r43937, r43938, r43939 from trunk ... (TIniFile encoding fixes) r43936 TIniFile: remove obsolete FBOM (it will be implemented with TEncoding support) --------------------- r43937 IniFiles: fix OwnsEncoding default values --------------------- r43938 TIniFile: fix encoding support: * preserve loaded encoding (regression from r42932, issue #36052) * preserve BOM of the original file. --------------------- r43939 TIniFile: allow to set Encoding --------------------- git-svn-id: branches/fixes_3_2@44068 -	2020-01-30 06:23:58 +00:00
ondrej	9e9c7e1409	Merging revisions r43838, r43839, r43840, r43841, r43842, r43844, r43845, r43846, r43848, r43942, r43945, r43946, r43947, r43948 from trunk ... (TStrings&TEncoding encoding fixes) r43838 classes: fix TMBCSEncoding.IsSingleByte. Issue #36504 --------------------- r43839 classes: fix TStrings.SaveToStream overloads (Delphi-compatibility + introduce IgnoreEncoding-overload for legacy FPC code like for LoadFromStream) --------------------- r43840 sysutils: fix TMBCSEncoding.GetPreamble --------------------- r43841 classes: add TStrings.Options (Delphi-compatibility) --------------------- r43842 sysutils: change TEncoding.Default from ANSI to SystemEncoding. (It is Delphi-compatible indeed because default SystemEncoding is ANSI.) --------------------- r43844 fpmkunit: fix compilation after r43841 --------------------- r43845 classes: introduce TRawByteStringStream --------------------- r43846 sysutils: TEncoding.IsStandardEncoding: FSystemEncodings are standard encodings (they must not be destroyed in user code) --------------------- r43848 classes: add TStringsOption.soPreserveBOM --------------------- r43942 TStrings: old SaveToFile(string) and SaveToStream(TStream) should ignore Encoding and stay backwards compatible within FPC. Use the other overloads for Encoding-aware SaveTo* methods --------------------- r43945 TStrings: add missing SaveToFile overload with IgnoreEncoding parameter --------------------- r43946 Revert r43942: TStrings: old SaveToFile(string) and SaveToStream(TStream) should ignore Encoding and stay backwards compatible within FPC. Use the other overloads for Encoding-aware SaveTo* methods --------------------- r43947 TStrings: default options: * remove soWriteBOM for FPC backwards compatibility * add soPreserveBOM so that a loaded file is correctly resaved --------------------- r43948 TStrings.SaveToStream(TStream): use FEncoding as the default for IgnoreEncoding=False so that loaded files are correctly resaved --------------------- git-svn-id: branches/fixes_3_2@44067 -	2020-01-30 06:21:12 +00:00
Jonas Maebe	eeb8c747d5	--- Merging r42499 into '.': ... U packages/univint/fpmake.pp ... --- Recording mergeinfo for merge of r42499 into '.': U . --- Merging r42500 into '.': U packages/cocoaint/fpmake.pp ... --- Recording mergeinfo for merge of r42500 into '.': G . --- Merging r42548 into '.': G packages/univint/src/AUComponent.pas G packages/univint/src/AudioUnitProperties.pas --- Recording mergeinfo for merge of r42548 into '.': G . --- Merging r43684 into '.': U compiler/msg/errore.msg ... --- Recording mergeinfo for merge of r43684 into '.': G . --- Merging r43687 into '.': G packages/univint/src/AudioComponents.pas U packages/univint/src/AudioServices.pas --- Recording mergeinfo for merge of r43687 into '.': G . git-svn-id: branches/fixes_3_2@44035 -	2020-01-26 12:48:42 +00:00
marco	07940fc2ef	--- Merging r43688 into '.': ... U packages/fcl-passrc/src/pasresolver.pp U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r43688 into '.': U . --- Merging r43872 into '.': U packages/fcl-passrc/src/pastree.pp U packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r43872 into '.': G . # revisions: 43688,43872 git-svn-id: branches/fixes_3_2@44015 -	2020-01-22 11:03:09 +00:00
marco	b310a1d977	--- Merging r43190 into '.': ... U packages/fcl-report/src/fpreport.pp --- Recording mergeinfo for merge of r43190 into '.': U . # revisions: 43190 git-svn-id: branches/fixes_3_2@44003 -	2020-01-20 09:06:22 +00:00
michael	b715259e5a	* Merging revisions 43993 from trunk: ... ------------------------------------------------------------------------ r43993 | michael | 2020-01-19 17:46:30 +0100 (Sun, 19 Jan 2020) | 1 line * More verbose error for array with non-supported element type ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43994 -	2020-01-19 16:47:16 +00:00
michael	3c503ae3c4	* Merging revisions 43991 from trunk: ... ------------------------------------------------------------------------ r43991 | michael | 2020-01-19 17:34:03 +0100 (Sun, 19 Jan 2020) | 1 line * Add calendar example ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43992 -	2020-01-19 16:34:12 +00:00
michael	611a60ad5b	* Merging revisions r43889,r43891,r43895,r43899,r43900,r43930,r43954,r43955,r43973 from trunk: ... ------------------------------------------------------------------------ r43889 | michael | 2020-01-08 15:16:51 +0100 (Wed, 08 Jan 2020) | 1 line * Reset parent font when needed. Patch by Pascal Riekenberg (bug ID 36531) ------------------------------------------------------------------------ r43891 | michael | 2020-01-08 20:37:48 +0100 (Wed, 08 Jan 2020) | 1 line * Fix from Pascal Riekenberg to fix missing assign of columngap (bug ID 36537) ------------------------------------------------------------------------ r43895 | michael | 2020-01-09 10:52:25 +0100 (Thu, 09 Jan 2020) | 1 line * Do not raise error in case of warning (bug ID 36541) ------------------------------------------------------------------------ r43899 | michael | 2020-01-10 14:35:01 +0100 (Fri, 10 Jan 2020) | 1 line * Fix from Pascal Riekenberg to fix failing tests ------------------------------------------------------------------------ r43900 | michael | 2020-01-10 14:44:10 +0100 (Fri, 10 Jan 2020) | 1 line * Patch from Pascal Riekenberg to allow saving rendered report to JSON (bug ID 36547) ------------------------------------------------------------------------ r43930 | michael | 2020-01-13 22:14:41 +0100 (Mon, 13 Jan 2020) | 1 line * Fix from Pascal Riekenberg to fix nested groups (bug ID 36532) ------------------------------------------------------------------------ r43954 | michael | 2020-01-16 10:40:03 +0100 (Thu, 16 Jan 2020) | 1 line * Patch from Pascal Riekenberg to fix running a report twice. (Bug ID 36592) ------------------------------------------------------------------------ r43955 | michael | 2020-01-16 11:27:16 +0100 (Thu, 16 Jan 2020) | 1 line * Remove debug statement, patch by Pascal Riekenberg (Bug ID 36585) ------------------------------------------------------------------------ r43973 | michael | 2020-01-18 17:40:57 +0100 (Sat, 18 Jan 2020) | 1 line * Fix bug #0036581, amended patch by Pascal Riekenberg ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43990 -	2020-01-19 16:20:08 +00:00
michael	57026e8804	* Merging revisions 43787,r43798,r43799,r43800,r43806,r43807,r43836 from trunk: ... ------------------------------------------------------------------------ r43787 | michael | 2019-12-25 14:56:23 +0100 (Wed, 25 Dec 2019) | 1 line * Remove some unused identifiers ------------------------------------------------------------------------ r43798 | michael | 2019-12-27 12:02:30 +0100 (Fri, 27 Dec 2019) | 1 line * Fix bug ID #36484: macos forbids loading unversioned library ------------------------------------------------------------------------ r43799 | michael | 2019-12-27 12:08:52 +0100 (Fri, 27 Dec 2019) | 1 line * Fix bug #36478: add array of category names ------------------------------------------------------------------------ r43800 | michael | 2019-12-27 23:09:52 +0100 (Fri, 27 Dec 2019) | 1 line * Fix recno ------------------------------------------------------------------------ r43806 | michael | 2019-12-28 22:21:13 +0100 (Sat, 28 Dec 2019) | 1 line * Search with Postscript font name and humanreadable font name ------------------------------------------------------------------------ r43807 | michael | 2019-12-28 22:21:45 +0100 (Sat, 28 Dec 2019) | 1 line * Set default font to postscript name ------------------------------------------------------------------------ r43836 | michael | 2020-01-02 15:10:29 +0100 (Thu, 02 Jan 2020) | 1 line * Fix bug #0036503 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43989 -	2020-01-19 16:17:05 +00:00
joost	0d9489f617	--- Merging r43915 into '.': ... C packages/fcl-xml/fpmake.pp C packages/fpmkunit/fpmake.pp --- Recording mergeinfo for merge of r43915 into '.': U . Summary of conflicts: Text conflicts: 2 Summary of conflicts: Text conflicts: 2 git-svn-id: branches/fixes_3_2@43980 -	2020-01-19 13:26:11 +00:00
marco	897ae85a0e	revs 43962,43963,43964,43965,43969 ... * license clarifications. Accidental GPL removed. Introduced by me during *nix reform in a few .incs and those templates got copied around (os* sysc*) * clarify OS2/EMX license to actually name the license rather than saying "NOT GPL" and refering to EMX. git-svn-id: branches/fixes_3_2@43970 -	2020-01-18 12:32:05 +00:00
marco	01cb09e1a0	--- Merging r43812 into '.': ... U packages/amunits/src/coreunits/console.pas U packages/amunits/src/coreunits/conunit.pas --- Recording mergeinfo for merge of r43812 into '.': U . --- Merging r43814 into '.': U packages/rtl-console/fpmake.pp U packages/rtl-console/src/amiga/crt.pp --- Recording mergeinfo for merge of r43814 into '.': G . --- Merging r43815 into '.': U packages/arosunits/fpmake.pp A packages/arosunits/src/console.pas A packages/arosunits/src/conunit.pas U packages/morphunits/fpmake.pp A packages/morphunits/src/console.pas A packages/morphunits/src/conunit.pas U packages/os4units/fpmake.pp A packages/os4units/src/console.pas A packages/os4units/src/conunit.pas G packages/rtl-console/fpmake.pp A packages/rtl-console/src/amicommon/crt.pp D packages/rtl-console/src/amiga --- Recording mergeinfo for merge of r43815 into '.': G . --- Merging r43827 into '.': G packages/rtl-console/fpmake.pp U packages/rtl-console/src/amicommon/crt.pp --- Recording mergeinfo for merge of r43827 into '.': G . --- Merging r43847 into '.': G packages/rtl-console/src/amicommon/crt.pp --- Recording mergeinfo for merge of r43847 into '.': G . --- Merging r43854 into '.': G packages/rtl-console/src/amicommon/crt.pp --- Recording mergeinfo for merge of r43854 into '.': G . --- Merging r43876 into '.': G packages/rtl-console/src/amicommon/crt.pp --- Recording mergeinfo for merge of r43876 into '.': G . # revisions: 43812,43814,43815,43827,43847,43854,43876 git-svn-id: branches/fixes_3_2@43959 -	2020-01-16 17:33:51 +00:00
marco	114fad8b83	--- Merging r43572 into '.': ... A .gitignore --- Recording mergeinfo for merge of r43572 into '.': U . --- Merging r43581 into '.': U .gitignore --- Recording mergeinfo for merge of r43581 into '.': G . --- Merging r43582 into '.': G .gitignore --- Recording mergeinfo for merge of r43582 into '.': G . --- Merging r43916 into '.': A packages/ide/fpx64.lpi --- Recording mergeinfo for merge of r43916 into '.': G . # revisions: 43572,43581,43582,43916 git-svn-id: branches/fixes_3_2@43956 -	2020-01-16 13:33:43 +00:00
marco	1ead3be620	# revisions: 43009,43591,43772,43777,43778,43779,43780,43791,43792 ... git-svn-id: branches/fixes_3_2@43943 -	2020-01-14 10:51:13 +00:00
joost	b068f8fe00	--- Merging r43892 into '.': ... U packages/Makefile U packages/Makefile.fpc U utils/Makefile U utils/Makefile.fpc --- Recording mergeinfo for merge of r43892 into '.': U . git-svn-id: branches/fixes_3_2@43932 -	2020-01-13 21:38:28 +00:00
marco	700c4453df	# revisions: 43361 ... git-svn-id: branches/fixes_3_2@43929 -	2020-01-13 19:53:00 +00:00
marco	09e568fb0f	--- Merging r43324 into '.': ... U rtl/unix/genfdset.inc --- Recording mergeinfo for merge of r43324 into '.': U . --- Merging r43389 into '.': U packages/ncurses/src/ncurses.pp --- Recording mergeinfo for merge of r43389 into '.': G . # revisions: 43324,43389 git-svn-id: branches/fixes_3_2@43927 -	2020-01-13 11:20:22 +00:00
marco	0d0b4ebb4b	--- Merging r43608 into '.': ... U packages/winunits-jedi/src/jediapilib.inc --- Recording mergeinfo for merge of r43608 into '.': U . # revisions: 43608 git-svn-id: branches/fixes_3_2@43926 -	2020-01-13 11:18:39 +00:00
marco	baf51cbab3	--- Merging r43857 into '.': ... U packages/fcl-image/src/fppixlcanv.pp --- Recording mergeinfo for merge of r43857 into '.': U . # revisions: 43857 git-svn-id: branches/fixes_3_2@43924 -	2020-01-13 11:16:39 +00:00
marco	cb589a9201	--- Merging r43859 into '.': ... U packages/libtar/src/libtar.pp --- Recording mergeinfo for merge of r43859 into '.': U . # revisions: 43859 git-svn-id: branches/fixes_3_2@43923 -	2020-01-13 11:14:03 +00:00
joost	2326437903	--- Merging r41797 into '.': ... U packages/fcl-registry/src/registry.pp --- Recording mergeinfo for merge of r41797 into '.': U . git-svn-id: branches/fixes_3_2@43914 -	2020-01-11 21:20:26 +00:00
joost	f6a3ade0cb	--- Merging r41325 into '.': ... U packages/fcl-registry/src/winreg.inc A tests/test/packages/fcl-registry/tw35060a.pp A tests/test/packages/fcl-registry/tw35060b.pp --- Recording mergeinfo for merge of r41325 into '.': U . --- Merging r41352 into '.': G packages/fcl-registry/src/winreg.inc --- Recording mergeinfo for merge of r41352 into '.': G . --- Merging r41415 into '.': U packages/fcl-registry/src/registry.pp U tests/test/packages/fcl-registry/tw35060a.pp U tests/test/packages/fcl-registry/tw35060b.pp A tests/test/packages/fcl-registry/tw35060c.pp --- Recording mergeinfo for merge of r41415 into '.': G . --- Merging r41784 into '.': U packages/fcl-registry/src/regdef.inc G packages/fcl-registry/src/registry.pp G packages/fcl-registry/src/winreg.inc U packages/fcl-registry/src/xmlreg.pp U packages/fcl-registry/src/xregreg.inc --- Recording mergeinfo for merge of r41784 into '.': G . --- Merging r41785 into '.': A packages/fcl-registry/examples/testunicode2.pp --- Recording mergeinfo for merge of r41785 into '.': G . git-svn-id: branches/fixes_3_2@43903 -	2020-01-10 18:52:38 +00:00
joost	c833d621b7	--- Merging r41267 into '.': ... U packages/fcl-registry/src/registry.pp U packages/fcl-registry/src/winreg.inc --- Recording mergeinfo for merge of r41267 into '.': U . git-svn-id: branches/fixes_3_2@43902 -	2020-01-10 18:46:12 +00:00
michael	75a8525c7f	* Merging revisions 43802 from trunk: ... ------------------------------------------------------------------------ r43802 | michael | 2019-12-28 15:10:59 +0100 (Sat, 28 Dec 2019) | 1 line * Fix bug ID #36486, add parameter to force use of largeint for sqlite ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43803 -	2019-12-28 16:19:14 +00:00
michael	a00ee7af19	* Merging revisions r43038 from trunk: ... ------------------------------------------------------------------------ r43038 | michael | 2019-09-19 10:39:35 +0200 (Thu, 19 Sep 2019) | 1 line Call CurrentIndexBuf only once ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43763 -	2019-12-23 14:20:21 +00:00
michael	40d9899d65	* Merging revisions r43558 from trunk: ... ------------------------------------------------------------------------ r43558 | michael | 2019-11-22 16:15:15 +0100 (Fri, 22 Nov 2019) | 1 line * Add column separator ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43762 -	2019-12-23 14:16:30 +00:00
michael	20b8a0c49b	* Merged r43556,r43557 ... git-svn-id: branches/fixes_3_2@43761 -	2019-12-23 14:12:57 +00:00
michael	4875100e8a	* Merging revisions r43556 from trunk: ... ------------------------------------------------------------------------ r43556 | michael | 2019-11-22 15:25:35 +0100 (Fri, 22 Nov 2019) | 1 line * Add boolean field length correction ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43759 -	2019-12-23 14:06:48 +00:00
michael	bafc953874	* Merging revisions r43713 from trunk: ... ------------------------------------------------------------------------ r43713 | michael | 2019-12-23 14:05:59 +0100 (Mon, 23 Dec 2019) | 1 line * Fix writing of special chars (bug ID 0036470) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43758 -	2019-12-23 14:05:27 +00:00
michael	030c65ec38	* Fixed merge conflicts ... git-svn-id: branches/fixes_3_2@43757 -	2019-12-23 14:04:40 +00:00
michael	f55addba35	* Fixed merge conflicts ... git-svn-id: branches/fixes_3_2@43756 -	2019-12-23 14:04:31 +00:00
michael	b8a22b8e6d	* Merging revisions r43507 from trunk: ... ------------------------------------------------------------------------ r43507 | michael | 2019-11-17 10:33:03 +0100 (Sun, 17 Nov 2019) | 1 line * Accidentally made all published properties protected ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43755 -	2019-12-23 13:59:58 +00:00
michael	582fd28d5c	* Merging revisions r43477,r43483 from trunk: ... ------------------------------------------------------------------------ r43477 | michael | 2019-11-15 15:40:48 +0100 (Fri, 15 Nov 2019) | 1 line * Fix bug ID #0027891, newer version compaible with 1.3.14 ------------------------------------------------------------------------ r43483 | michael | 2019-11-15 18:40:58 +0100 (Fri, 15 Nov 2019) | 1 line * Forgot to commit ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43751 -	2019-12-23 13:44:29 +00:00
michael	dccde4e0df	* Merging revisions r43468 from trunk: ... ------------------------------------------------------------------------ r43468 | michael | 2019-11-15 12:33:19 +0100 (Fri, 15 Nov 2019) | 1 line * Fix bug ID #36303, change russian comment with english ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43748 -	2019-12-23 13:42:33 +00:00
michael	cbaf231b47	* Merging revisions r43435 from trunk: ... ------------------------------------------------------------------------ r43435 | michael | 2019-11-10 11:12:05 +0100 (Sun, 10 Nov 2019) | 1 line * Fix compilation for windows ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43746 -	2019-12-23 13:41:42 +00:00
michael	7c51d49c61	* Merging revisions r43363 from trunk: ... ------------------------------------------------------------------------ r43363 | michael | 2019-11-02 15:35:18 +0100 (Sat, 02 Nov 2019) | 1 line * Fix bug ID #36248 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43738 -	2019-12-23 13:34:27 +00:00
michael	29550e5633	* Merging revisions r43362 from trunk: ... ------------------------------------------------------------------------ r43362 | michael | 2019-11-02 15:33:19 +0100 (Sat, 02 Nov 2019) | 1 line * Forgot to commit ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43737 -	2019-12-23 13:34:17 +00:00
michael	13a835b99f	* Merging revisions r43360 from trunk: ... ------------------------------------------------------------------------ r43360 | michael | 2019-11-02 14:07:34 +0100 (Sat, 02 Nov 2019) | 1 line * Fix bug #36244 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43736 -	2019-12-23 13:34:04 +00:00
michael	04f887dbaf	* Merging revisions r43356 from trunk: ... ------------------------------------------------------------------------ r43356 | michael | 2019-11-02 12:42:32 +0100 (Sat, 02 Nov 2019) | 1 line * Explicitly use UTF8, fix bug ID #36231: RTF export must write unicode chars escaped ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43734 -	2019-12-23 13:33:34 +00:00
michael	357d54b94d	* Merging revisions r43355 from trunk: ... ------------------------------------------------------------------------ r43355 | michael | 2019-11-02 12:17:37 +0100 (Sat, 02 Nov 2019) | 1 line * Fix case where table streams are nil ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43733 -	2019-12-23 13:33:18 +00:00
michael	33e004a0a3	* Merging revisions r43354 from trunk: ... ------------------------------------------------------------------------ r43354 | michael | 2019-11-02 11:28:27 +0100 (Sat, 02 Nov 2019) | 1 line * Patch from Michal Gawrycki to handle duplicating strings (bug ID 36243) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43732 -	2019-12-23 13:33:07 +00:00
michael	35f2b45849	* Merging revisions r43701 from trunk: ... ------------------------------------------------------------------------ r43701 | michael | 2019-12-20 16:28:57 +0100 (Fri, 20 Dec 2019) | 1 line * Correct font handling for blocks in memos with different fonts (bug ID 36459, patch by Andi Friess) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43730 -	2019-12-23 13:29:32 +00:00
michael	8468db2175	* Merging revisions r43697 from trunk: ... ------------------------------------------------------------------------ r43697 | michael | 2019-12-18 13:14:51 +0100 (Wed, 18 Dec 2019) | 1 line * Fix currency to SQL_NUMERIC_STRUCT for platforms without extended ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43729 -	2019-12-23 13:29:04 +00:00
michael	4e1e808c25	* Merging revisions r43693 from trunk: ... ------------------------------------------------------------------------ r43693 | michael | 2019-12-15 18:13:08 +0100 (Sun, 15 Dec 2019) | 1 line * Fix bug #36443, patch from Andrew H. Allow non-blocking read ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43728 -	2019-12-23 13:28:44 +00:00
michael	9017588d3f	* Merging revisions r43680 from trunk: ... ------------------------------------------------------------------------ r43680 | michael | 2019-12-14 12:59:53 +0100 (Sat, 14 Dec 2019) | 1 line * Fix option character test (bug ID 36438) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43727 -	2019-12-23 13:28:27 +00:00
michael	0dd65110d1	* Merging revisions r43605 from trunk: ... ------------------------------------------------------------------------ r43605 | michael | 2019-11-28 17:19:30 +0100 (Thu, 28 Nov 2019) | 1 line * Less errors when connection is broken (bug ID 36373) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43726 -	2019-12-23 13:28:15 +00:00
michael	3dae852e85	* Merging revisions r43585 from trunk: ... ------------------------------------------------------------------------ r43585 | michael | 2019-11-25 15:24:38 +0100 (Mon, 25 Nov 2019) | 1 line * Better explanation of connection ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43725 -	2019-12-23 13:28:00 +00:00
michael	04ede12878	* Merging revisions r43584 from trunk: ... ------------------------------------------------------------------------ r43584 | michael | 2019-11-25 15:14:19 +0100 (Mon, 25 Nov 2019) | 1 line * Simple, read-only example, no authentication ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43724 -	2019-12-23 13:27:46 +00:00
michael	aa412f290b	* Merging revisions r43562,r43563,r43564 from trunk: ... ------------------------------------------------------------------------ r43562 | michael | 2019-11-23 09:03:12 +0100 (Sat, 23 Nov 2019) | 1 line * Fix bug ID #0036335: console pops up when getting compiler info ------------------------------------------------------------------------ r43563 | michael | 2019-11-23 14:34:45 +0100 (Sat, 23 Nov 2019) | 1 line * Report error with correct exit code ------------------------------------------------------------------------ r43564 | michael | 2019-11-23 14:40:49 +0100 (Sat, 23 Nov 2019) | 1 line * Show --stop-on-parser-error in help ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43723 -	2019-12-23 13:27:07 +00:00
michael	417f8e072a	* Merging revisions r43492 from trunk: ... ------------------------------------------------------------------------ r43492 | michael | 2019-11-16 14:26:06 +0100 (Sat, 16 Nov 2019) | 1 line * Add ellipsis, fix string type when wrapping ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43722 -	2019-12-23 13:24:50 +00:00
michael	dbb053a67e	* Merging revisions r43491 from trunk: ... ------------------------------------------------------------------------ r43491 | michael | 2019-11-16 13:59:25 +0100 (Sat, 16 Nov 2019) | 1 line * Implement option to replace too-long words with asterisks (bug ID 33639) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43721 -	2019-12-23 13:24:40 +00:00
michael	61ff151b2e	* Merging revisions r43490 from trunk: ... ------------------------------------------------------------------------ r43490 | michael | 2019-11-16 13:11:32 +0100 (Sat, 16 Nov 2019) | 1 line * Fix overflow in case of disabled wordwrap (bug ID 33356) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43720 -	2019-12-23 13:24:28 +00:00
michael	c561c43c32	* Merging revisions r43489 from trunk: ... ------------------------------------------------------------------------ r43489 | michael | 2019-11-16 12:30:37 +0100 (Sat, 16 Nov 2019) | 1 line * Fix bug ID #0035296: need to handle really long words for memos ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43719 -	2019-12-23 13:24:15 +00:00
michael	067a40c68e	* Merging revisions r43484 from trunk: ... ------------------------------------------------------------------------ r43484 | michael | 2019-11-15 19:13:30 +0100 (Fri, 15 Nov 2019) | 1 line * Fix warnings and hints ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43718 -	2019-12-23 13:23:56 +00:00
michael	c47afd74ab	* Merging revisions r43480 from trunk: ... ------------------------------------------------------------------------ r43480 | michael | 2019-11-15 16:21:38 +0100 (Fri, 15 Nov 2019) | 1 line * Make Draw, Stretchdraw, CopyRect virtual. Bug ID #35126 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43717 -	2019-12-23 13:23:27 +00:00
michael	8e7c1a2d6f	* Merging revisions r43479 from trunk: ... ------------------------------------------------------------------------ r43479 | michael | 2019-11-15 16:17:52 +0100 (Fri, 15 Nov 2019) | 1 line * Fix bug #35128, correctly apply clipping rect ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43716 -	2019-12-23 13:23:16 +00:00
michael	7fff8e538e	* Merging revisions 43555 from trunk: ... ------------------------------------------------------------------------ r43555 | michael | 2019-11-22 15:25:15 +0100 (Fri, 22 Nov 2019) | 1 line * Add boolean field length correction ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43715 -	2019-12-23 13:20:53 +00:00
michael	2b52be98b5	* Merging revisions r43654,r43662,r43663,r43664 from trunk: ... ------------------------------------------------------------------------ r43654 | michael | 2019-12-06 09:53:43 +0100 (Fri, 06 Dec 2019) | 1 line * Fix bug #0035436 ------------------------------------------------------------------------ r43662 | michael | 2019-12-08 21:05:14 +0100 (Sun, 08 Dec 2019) | 1 line * Fix memleaks (bug ID 36408) ------------------------------------------------------------------------ r43663 | michael | 2019-12-08 21:05:53 +0100 (Sun, 08 Dec 2019) | 1 line * Fix memleak in comparer, improve date recognition ------------------------------------------------------------------------ r43664 | michael | 2019-12-08 21:11:23 +0100 (Sun, 08 Dec 2019) | 1 line * Fix lime color (bug ID 0036407) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43666 -	2019-12-09 08:29:34 +00:00
michael	30843263ff	* Merging revisions 43655 from trunk: ... ------------------------------------------------------------------------ r43655 | michael | 2019-12-06 10:57:10 +0100 (Fri, 06 Dec 2019) | 1 line * Indicate and use sqSequences connection info, fix bug #0035241 (statement for sqlite next sequence value) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43657 -	2019-12-06 10:00:23 +00:00
michael	9c1d71246c	* Merging revisions 43615 from trunk: ... ------------------------------------------------------------------------ r43615 | joost | 2019-11-30 12:04:19 +0100 (Sat, 30 Nov 2019) | 1 line * Fix for timestamps very close to a whole day in Firebird ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43656 -	2019-12-06 10:00:01 +00:00
michael	f96857ba2c	* Merging revisions 43648 from trunk: ... ------------------------------------------------------------------------ r43648 | michael | 2019-12-05 17:16:08 +0100 (Thu, 05 Dec 2019) | 1 line * Make sure open/close use same options in CSV close/open writing ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43649 -	2019-12-05 16:16:49 +00:00
michael	d9c6b8f145	* Merging revisions r43641,r43642,r43643,r43644,r43645 from trunk: ... ------------------------------------------------------------------------ r43641 | michael | 2019-12-05 11:43:02 +0100 (Thu, 05 Dec 2019) | 1 line * Fix bug #0036361, use buffer when reading csv ------------------------------------------------------------------------ r43642 | michael | 2019-12-05 13:51:14 +0100 (Thu, 05 Dec 2019) | 1 line * Fix 16 bit support for PNM (bug ID 35080) ------------------------------------------------------------------------ r43643 | michael | 2019-12-05 15:01:43 +0100 (Thu, 05 Dec 2019) | 1 line * Rework default file mechanism in bufdataset to fix bug #34435 ------------------------------------------------------------------------ r43644 | michael | 2019-12-05 15:02:03 +0100 (Thu, 05 Dec 2019) | 1 line * Fix name array ------------------------------------------------------------------------ r43645 | michael | 2019-12-05 15:54:15 +0100 (Thu, 05 Dec 2019) | 1 line * Fix bug #32532: AV when killing daemon app ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43647 -	2019-12-05 15:18:26 +00:00
michael	9b048da8fb	* Merging revisions r43640 from trunk: ... ------------------------------------------------------------------------ r43640 | michael | 2019-12-05 10:07:20 +0100 (Thu, 05 Dec 2019) | 1 line * Fix bug ID #36399: add some easy access methods to TZipper/TUnzipper ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43646 -	2019-12-05 15:17:42 +00:00
michael	4b550545b5	* Merging revisions r43636,r43637 from trunk: ... ------------------------------------------------------------------------ r43636 | michael | 2019-12-04 12:30:04 +0100 (Wed, 04 Dec 2019) | 1 line * Patch by Werner Pamler to delete builtin (bug ID 36396) ------------------------------------------------------------------------ r43637 | michael | 2019-12-04 12:42:48 +0100 (Wed, 04 Dec 2019) | 1 line * Added possibility for array arguments ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43638 -	2019-12-04 11:45:49 +00:00
michael	12e34bcef5	* Merging revisions r43627,r43630 from trunk: ... ------------------------------------------------------------------------ r43627 | michael | 2019-12-02 22:42:32 +0100 (Mon, 02 Dec 2019) | 1 line * Patch from Klaus (computertechnik@web.de) to read/write columncount/columngap ------------------------------------------------------------------------ r43630 | michael | 2019-12-03 00:00:11 +0100 (Tue, 03 Dec 2019) | 1 line * Enable compilation for Win64 bit ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43632 -	2019-12-02 23:11:57 +00:00
pierre	d146b8fea7	Merge r43603 ... ------------------------------------------------------------------------ r43603 | pierre | 2019-11-28 13:47:47 +0000 (Thu, 28 Nov 2019) | 1 line Disable ucomplex and matrix units for i8086-embedded target, because no fpu is installed in RTL by default ------------------------------------------------------------------------ --- Merging r43603 into '.': U packages/rtl-extra/fpmake.pp --- Recording mergeinfo for merge of r43603 into '.': U . git-svn-id: branches/fixes_3_2@43619 -	2019-12-01 09:02:24 +00:00
michael	d27126b64c	* Merging revisions 43511 from trunk: ... ------------------------------------------------------------------------ r43511 | michael | 2019-11-17 23:27:28 +0100 (Sun, 17 Nov 2019) | 1 line * Fix bug ID #36147 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43512 -	2019-11-17 22:28:21 +00:00
marco	4fbb2d9cf0	--- Merging r42809 into '.': ... U packages/rtl-objpas/tests/tests.rtti.util.pas --- Recording mergeinfo for merge of r42809 into '.': U . --- Merging r42810 into '.': U packages/rtl-objpas/tests/tests.rtti.pas G packages/rtl-objpas/tests/tests.rtti.util.pas --- Recording mergeinfo for merge of r42810 into '.': G . --- Recording mergeinfo for merge of r42810 into 'packages/rtl-objpas/tests/tests.rtti.pas': U packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42988 into '.': U compiler/aarch64/racpugas.pas --- Recording mergeinfo for merge of r42988 into '.': G . --- Recording mergeinfo for merge of r42988 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42989 into '.': G compiler/aarch64/racpugas.pas --- Recording mergeinfo for merge of r42989 into '.': G . --- Recording mergeinfo for merge of r42989 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42990 into '.': U packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42990 into '.': G . --- Recording mergeinfo for merge of r42990 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42991 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42991 into '.': G . --- Recording mergeinfo for merge of r42991 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r43016 into '.': U compiler/aarch64/aasmcpu.pas U compiler/aarch64/agcpugas.pas G compiler/aarch64/racpugas.pas --- Recording mergeinfo for merge of r43016 into '.': G . --- Recording mergeinfo for merge of r43016 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas # revisions: 42809,42810,42988,42989,42990,42991,43016 git-svn-id: branches/fixes_3_2@43424 -	2019-11-09 13:28:55 +00:00
marco	f6d44edc07	--- Merging r42088 into '.': ... U packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42088 into '.': U . --- Merging r42708 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42708 into '.': G . --- Merging r42709 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42709 into '.': G . --- Merging r42710 into '.': U packages/rtl-objpas/tests/tests.rtti.impl.pas --- Recording mergeinfo for merge of r42710 into '.': G . --- Merging r42720 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42720 into '.': G . --- Merging r42731 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42731 into '.': G . --- Merging r42732 into '.': U packages/rtl-objpas/tests/tests.rtti.pas --- Recording mergeinfo for merge of r42732 into '.': G . --- Recording mergeinfo for merge of r42732 into 'packages/rtl-objpas/tests/tests.rtti.pas': U packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42733 into '.': G packages/rtl-objpas/tests/tests.rtti.pas --- Recording mergeinfo for merge of r42733 into '.': G . --- Recording mergeinfo for merge of r42733 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42734 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42734 into '.': G . --- Recording mergeinfo for merge of r42734 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42738 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42738 into '.': G . --- Recording mergeinfo for merge of r42738 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42740 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42740 into '.': G . --- Recording mergeinfo for merge of r42740 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42755 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42755 into '.': G . --- Recording mergeinfo for merge of r42755 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42756 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42756 into '.': G . --- Recording mergeinfo for merge of r42756 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42757 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42757 into '.': G . --- Recording mergeinfo for merge of r42757 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42758 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42758 into '.': G . --- Recording mergeinfo for merge of r42758 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42780 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42780 into '.': G . --- Recording mergeinfo for merge of r42780 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42801 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42801 into '.': G . --- Recording mergeinfo for merge of r42801 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42802 into '.': U rtl/objpas/typinfo.pp --- Recording mergeinfo for merge of r42802 into '.': G . --- Recording mergeinfo for merge of r42802 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42803 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42803 into '.': G . --- Recording mergeinfo for merge of r42803 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42804 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42804 into '.': G . --- Recording mergeinfo for merge of r42804 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42805 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42805 into '.': G . --- Recording mergeinfo for merge of r42805 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r42806 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r42806 into '.': G . --- Recording mergeinfo for merge of r42806 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas # revisions: 42088,42708,42709,42710,42720,42731,42732,42733,42734,42738,42740,42755,42756,42757,42758,42780,42801,42802,42803,42804,42805,42806 git-svn-id: branches/fixes_3_2@43423 -	2019-11-09 12:23:56 +00:00
marco	037583ef4e	--- Merging r40654 into '.': ... U compiler/msg/errore.msg --- Recording mergeinfo for merge of r40654 into '.': U . --- Merging r40656 into '.': U compiler/pdecvar.pas A tests/tbf/tb0266a.pp A tests/tbf/tb0266b.pp --- Recording mergeinfo for merge of r40656 into '.': G . --- Merging r41308 into '.': U tests/webtbs/tw35027.pp --- Recording mergeinfo for merge of r41308 into '.': G . --- Merging r41829 into '.': U compiler/htypechk.pas U compiler/ncal.pas A tests/tbs/tb0656.pp --- Recording mergeinfo for merge of r41829 into '.': G . --- Merging r42511 into '.': U packages/rtl-objpas/src/inc/rtti.pp U rtl/objpas/typinfo.pp U tests/test/trtti19.pp --- Recording mergeinfo for merge of r42511 into '.': G . # revisions: 40654,40656,41308,41829,42511 git-svn-id: branches/fixes_3_2@43410 -	2019-11-07 10:04:13 +00:00
marco	f131ff18ad	# revisions: 42717,42718,42719,42754 ... git-svn-id: branches/fixes_3_2@43403 -	2019-11-05 16:46:30 +00:00
marco	89e051bac9	# revisions: 41828,41830,41831,41832,41833,41834,41835,41836,41837,41838,41839,41841,41842,42025,42031,42032,42033,42034,42035,42036,42065,42066,42067,42068,42069,42070,42071,42072,42073,42089,42150,42151,42181,42182,42183,42184,42185,42219,42220,42221,42222 ... git-svn-id: branches/fixes_3_2@43400 -	2019-11-05 16:17:53 +00:00
marco	9c8a2d29e1	# revisions: 40702,40703,40704,40747,40750,40765,41277,41535,41536,41537,41548,41549,41770 ... git-svn-id: branches/fixes_3_2@43399 -	2019-11-05 16:08:58 +00:00
marco	9987e790f8	# revisions: 40657,40701 ... git-svn-id: branches/fixes_3_2@43398 -	2019-11-05 16:05:22 +00:00
marco	a85fa3a3d8	# revisions: 40660,40661,40662,40663,40664,40665,40666,40667,40668,40669,40670,40673,40692,40693,40694,40695,40696,40697,40698,40699,40700 ... git-svn-id: branches/fixes_3_2@43397 -	2019-11-05 15:53:08 +00:00
marco	b8e3d6efa1	# revisions: 41570,41571,41938,42457,42327,42556,42557 ... git-svn-id: branches/fixes_3_2@43393 -	2019-11-05 15:16:28 +00:00
marco	cf2b4ee4f7	# revisions: 43198,43199,43201,43202,43204,43206,43207,43209,43210,43212,43213,43214,43215,43216,43219,43220,43221,43222,43223,43224,43225,43228,43229,43285,43286,43287,43288,43295,43296,43297,43303,43304,43310,43316,43317,43318,43320,43321,43322,43323,43325,43326,43329,43330,43331,43332,43333 ... git-svn-id: branches/fixes_3_2@43380 -	2019-11-03 14:20:49 +00:00
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 -	2019-11-03 14:13:54 +00:00
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 -	2019-11-03 14:10:42 +00:00
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 -	2019-11-03 14:00:03 +00:00
michael	118dcac881	* Merging revisions r42982 from trunk: ... ------------------------------------------------------------------------ r42982 | michael | 2019-09-13 18:22:14 +0200 (Fri, 13 Sep 2019) | 1 line * Fix uninitialized var warning ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43271 -	2019-10-20 08:12:44 +00:00
michael	3fed351374	* Merging revisions r42899 from trunk: ... ------------------------------------------------------------------------ r42899 | michael | 2019-09-02 09:22:01 +0200 (Mon, 02 Sep 2019) | 1 line * Fix some warnings/hints ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43270 -	2019-10-20 08:11:43 +00:00
michael	af8e4a77bd	* Merging revisions r42884 from trunk: ... ------------------------------------------------------------------------ r42884 | michael | 2019-08-31 15:48:00 +0200 (Sat, 31 Aug 2019) | 1 line * Speed rework, second iteration ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43269 -	2019-10-20 08:07:35 +00:00
michael	8afba43447	* Merging revisions r42270 from trunk: ... ------------------------------------------------------------------------ r42270 | michael | 2019-06-22 16:01:06 +0200 (Sat, 22 Jun 2019) | 1 line * Fix parsing of command-line in ParseSource ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43268 -	2019-10-20 08:06:38 +00:00
michael	cd1a714336	* Merging revisions 43227 from trunk: ... ------------------------------------------------------------------------ r43227 | michael | 2019-10-19 15:09:04 +0200 (Sat, 19 Oct 2019) | 1 line Search for .inc .pp .pas if an include file name has no extension ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43263 -	2019-10-19 14:56:52 +00:00
michael	3cbce0f7de	* Merging revisions 43060,43061,43063,43064,43065,43066,43080,43096,43100,43104 from trunk: ... ------------------------------------------------------------------------ r43060 | michael | 2019-09-23 17:14:35 +0200 (Mon, 23 Sep 2019) | 1 line * Fix appending path info and setting headers ------------------------------------------------------------------------ r43061 | michael | 2019-09-23 17:19:25 +0200 (Mon, 23 Sep 2019) | 1 line * Use AppendPathInfo ------------------------------------------------------------------------ r43063 | michael | 2019-09-25 16:06:28 +0200 (Wed, 25 Sep 2019) | 1 line * Add (cust)microhttpapp, high-concurrency standalone server ------------------------------------------------------------------------ r43064 | michael | 2019-09-25 17:38:20 +0200 (Wed, 25 Sep 2019) | 1 line * Improve header & get variable fetching ------------------------------------------------------------------------ r43065 | michael | 2019-09-25 17:40:19 +0200 (Wed, 25 Sep 2019) | 1 line * remove forced debug flag ------------------------------------------------------------------------ r43066 | michael | 2019-09-25 17:49:28 +0200 (Wed, 25 Sep 2019) | 1 line * Construct query string, needed in proxy ------------------------------------------------------------------------ r43080 | michael | 2019-09-26 15:29:26 +0200 (Thu, 26 Sep 2019) | 1 line * Set namevalueseparator for headers ------------------------------------------------------------------------ r43096 | michael | 2019-09-29 23:42:53 +0200 (Sun, 29 Sep 2019) | 1 line * Specify dependency on libmicrohttpd ------------------------------------------------------------------------ r43100 | karoly | 2019-09-30 15:01:22 +0200 (Mon, 30 Sep 2019) | 1 line fcl-web: re-enabled platforms which were disabled in r43096 ------------------------------------------------------------------------ r43104 | pierre | 2019-10-01 21:21:30 +0200 (Tue, 01 Oct 2019) | 1 line Use same list of supported OSes for libmicrohttpd package in libmicrohttpd and fcl-web, and adapt packages/fpmake_proc.inc ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43261 -	2019-10-19 14:50:08 +00:00
michael	ee93aa0798	* Merging revisions 43060,43061,43063,43064,43065,43066,43080,43081 from trunk: ... ------------------------------------------------------------------------ r43060 | michael | 2019-09-23 17:14:35 +0200 (Mon, 23 Sep 2019) | 1 line * Fix appending path info and setting headers ------------------------------------------------------------------------ r43061 | michael | 2019-09-23 17:19:25 +0200 (Mon, 23 Sep 2019) | 1 line * Use AppendPathInfo ------------------------------------------------------------------------ r43063 | michael | 2019-09-25 16:06:28 +0200 (Wed, 25 Sep 2019) | 1 line * Add (cust)microhttpapp, high-concurrency standalone server ------------------------------------------------------------------------ r43064 | michael | 2019-09-25 17:38:20 +0200 (Wed, 25 Sep 2019) | 1 line * Improve header & get variable fetching ------------------------------------------------------------------------ r43065 | michael | 2019-09-25 17:40:19 +0200 (Wed, 25 Sep 2019) | 1 line * remove forced debug flag ------------------------------------------------------------------------ r43066 | michael | 2019-09-25 17:49:28 +0200 (Wed, 25 Sep 2019) | 1 line * Construct query string, needed in proxy ------------------------------------------------------------------------ r43080 | michael | 2019-09-26 15:29:26 +0200 (Thu, 26 Sep 2019) | 1 line * Set namevalueseparator for headers ------------------------------------------------------------------------ r43081 | michael | 2019-09-26 15:54:23 +0200 (Thu, 26 Sep 2019) | 1 line * Allow max-age for cache control ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43260 -	2019-10-19 14:49:37 +00:00
michael	b2fb59716e	* Merging revisions 42993 from trunk: ... ------------------------------------------------------------------------ r42993 | michael | 2019-09-14 15:05:03 +0200 (Sat, 14 Sep 2019) | 1 line * Fix bug ID #36075 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43259 -	2019-10-19 14:48:24 +00:00
michael	9d1975338a	* Merging revisions 42981,42983,42984,42985 from trunk: ... ------------------------------------------------------------------------ r42981 | michael | 2019-09-13 18:21:44 +0200 (Fri, 13 Sep 2019) | 1 line * Fix warnings about method visibilty ------------------------------------------------------------------------ r42983 | michael | 2019-09-13 18:22:35 +0200 (Fri, 13 Sep 2019) | 1 line * Fix uninitialized result warning ------------------------------------------------------------------------ r42984 | michael | 2019-09-13 18:28:48 +0200 (Fri, 13 Sep 2019) | 1 line * Add fpwebproxy ------------------------------------------------------------------------ r42985 | michael | 2019-09-13 18:29:38 +0200 (Fri, 13 Sep 2019) | 1 line * Add .ini config file possibility, plus simple proxy server config ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43258 -	2019-10-19 14:47:47 +00:00
michael	916e4ca83b	* Merging revisions 42980 from trunk: ... ------------------------------------------------------------------------ r42980 | michael | 2019-09-13 18:21:19 +0200 (Fri, 13 Sep 2019) | 1 line * Remove unused variable name ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43257 -	2019-10-19 14:47:08 +00:00
michael	b1347be8f7	* Merging revisions 42979 from trunk: ... ------------------------------------------------------------------------ r42979 | michael | 2019-09-13 18:20:59 +0200 (Fri, 13 Sep 2019) | 1 line * Fix uninitialized var warning ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43256 -	2019-10-19 14:46:59 +00:00
michael	9acb68ee32	* Merging revisions 42978 from trunk: ... ------------------------------------------------------------------------ r42978 | michael | 2019-09-13 18:20:39 +0200 (Fri, 13 Sep 2019) | 1 line * Fix some deprecated warnings ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43255 -	2019-10-19 14:46:50 +00:00
michael	b4ac2e2027	* Merging revisions 42904 from trunk: ... ------------------------------------------------------------------------ r42904 | michael | 2019-09-02 14:36:37 +0200 (Mon, 02 Sep 2019) | 1 line * Additional case where whitespace can mess up (bug ID 36037) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43254 -	2019-10-19 14:46:44 +00:00
michael	d785134a57	* Merging revisions 42888 from trunk: ... ------------------------------------------------------------------------ r42888 | mattias | 2019-09-01 15:39:23 +0200 (Sun, 01 Sep 2019) | 1 line fcl-json: fixed compile with fpc 3.0.4 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43253 -	2019-10-19 14:46:35 +00:00
michael	616e4f7342	* Merging revisions 42887 from trunk: ... ------------------------------------------------------------------------ r42887 | michael | 2019-09-01 13:43:01 +0200 (Sun, 01 Sep 2019) | 1 line * Fix whitespace handling due to new structure ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43252 -	2019-10-19 14:46:30 +00:00
michael	493b0ba4fc	* Merging revisions 42882 from trunk: ... ------------------------------------------------------------------------ r42882 | michael | 2019-08-31 12:38:49 +0200 (Sat, 31 Aug 2019) | 1 line * Speed improvements, iteration 1 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43251 -	2019-10-19 14:46:17 +00:00
michael	39f9916ef5	* Merging revisions 42875 from trunk: ... ------------------------------------------------------------------------ r42875 | michael | 2019-08-30 08:57:53 +0200 (Fri, 30 Aug 2019) | 1 line * Fix bug ID #35306: use rawbytestring for stringcontent ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43250 -	2019-10-19 14:46:09 +00:00
michael	dcd9071815	* Merging revisions 42496 from trunk: ... ------------------------------------------------------------------------ r42496 | svenbarth | 2019-07-26 07:16:35 +0200 (Fri, 26 Jul 2019) | 1 line * also check mimetypes/m option ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43249 -	2019-10-19 14:45:37 +00:00
michael	e3a1461bd9	* Merging revisions 43143 from trunk: ... ------------------------------------------------------------------------ r43143 | michael | 2019-10-06 15:11:17 +0200 (Sun, 06 Oct 2019) | 1 line * Fix bug #0030379: detect circular refences ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43248 -	2019-10-19 14:44:24 +00:00
michael	0fbf02d8e4	* Merging revisions 43140 from trunk: ... ------------------------------------------------------------------------ r43140 | michael | 2019-10-06 13:21:00 +0200 (Sun, 06 Oct 2019) | 1 line * Add defaults ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43247 -	2019-10-19 14:44:18 +00:00
michael	fc29eebcdd	* Merging revisions 43139 from trunk: ... ------------------------------------------------------------------------ r43139 | michael | 2019-10-06 13:20:20 +0200 (Sun, 06 Oct 2019) | 1 line * Fix bug ID #32625: added several firebird constructs ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43246 -	2019-10-19 14:43:56 +00:00
michael	9e73870256	* Merging revisions 43105 from trunk: ... ------------------------------------------------------------------------ r43105 | michael | 2019-10-02 09:26:54 +0200 (Wed, 02 Oct 2019) | 1 line * Introduce codepage, bug ID #0016587 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43245 -	2019-10-19 14:43:38 +00:00
michael	afbfdaaf91	* Merging revisions 43041 from trunk: ... ------------------------------------------------------------------------ r43041 | michael | 2019-09-19 19:14:49 +0200 (Thu, 19 Sep 2019) | 1 line * Lazarus project file for json test ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43244 -	2019-10-19 14:43:12 +00:00
michael	bcbe47d0de	* Merging revisions 43040 from trunk: ... ------------------------------------------------------------------------ r43040 | michael | 2019-09-19 19:11:55 +0200 (Thu, 19 Sep 2019) | 1 line command-line version of test progam ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43243 -	2019-10-19 14:42:50 +00:00
michael	b23d37325b	* Merging revisions 43035 from trunk: ... ------------------------------------------------------------------------ r43035 | michael | 2019-09-19 09:40:26 +0200 (Thu, 19 Sep 2019) | 1 line * Added test for bug ID #36086 (lookup on empty dataset) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43242 -	2019-10-19 14:41:47 +00:00
michael	fb9be3b79b	* Merging revisions 43034 from trunk: ... ------------------------------------------------------------------------ r43034 | michael | 2019-09-19 09:35:38 +0200 (Thu, 19 Sep 2019) | 1 line * Fix bug #36086 (Lookup causes AV if dataset is empty) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43241 -	2019-10-19 14:41:35 +00:00
michael	cd46a3fdf3	* Merging revisions 43025 from trunk: ... ------------------------------------------------------------------------ r43025 | michael | 2019-09-17 11:54:13 +0200 (Tue, 17 Sep 2019) | 1 line * Fix bug #36080, add wirecompression to IBConnection ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43240 -	2019-10-19 14:40:52 +00:00
michael	20f92f5db7	* Merging revisions 43023 from trunk: ... ------------------------------------------------------------------------ r43023 | michael | 2019-09-17 09:14:28 +0200 (Tue, 17 Sep 2019) | 1 line * Remove debug statement ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43239 -	2019-10-19 14:40:42 +00:00
michael	f484b61402	* Merging revisions 42974 from trunk: ... ------------------------------------------------------------------------ r42974 | michael | 2019-09-11 09:40:44 +0200 (Wed, 11 Sep 2019) | 1 line * Fix bug ID #31385 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43238 -	2019-10-19 14:38:48 +00:00
michael	8ca580c2ad	* Merging revisions 42972 from trunk: ... ------------------------------------------------------------------------ r42972 | michael | 2019-09-10 10:44:41 +0200 (Tue, 10 Sep 2019) | 1 line * Make link dataset/connection/transaction thread safe (Bug ID 34274) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43237 -	2019-10-19 14:38:01 +00:00
michael	299e79e0f0	* Merging revisions 42965 from trunk: ... ------------------------------------------------------------------------ r42965 | michael | 2019-09-09 09:17:39 +0200 (Mon, 09 Sep 2019) | 1 line * Make codepage property public in TFieldDef ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43236 -	2019-10-19 14:37:49 +00:00
michael	50275955bc	* Merging revisions 42945 from trunk: ... ------------------------------------------------------------------------ r42945 | michael | 2019-09-08 12:31:05 +0200 (Sun, 08 Sep 2019) | 1 line * Additional tests for sqlite3dataset by Luis Americo (bug ID 323247) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43235 -	2019-10-19 14:37:29 +00:00
michael	eb0fe9ac13	* Merging revisions 42892 from trunk: ... ------------------------------------------------------------------------ r42892 | michael | 2019-09-01 19:42:38 +0200 (Sun, 01 Sep 2019) | 1 line Patch from Laco to allow switching to unicode version without change of end-user code ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43234 -	2019-10-19 14:35:45 +00:00
michael	53309395e1	* Merging revisions 42886 from trunk: ... ------------------------------------------------------------------------ r42886 | michael | 2019-09-01 13:32:14 +0200 (Sun, 01 Sep 2019) | 1 line * Fix bug ID #35769 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43233 -	2019-10-19 14:35:27 +00:00
michael	89448abde1	* Merging revisions 42737 from trunk: ... ------------------------------------------------------------------------ r42737 | lacak | 2019-08-19 13:52:28 +0200 (Mon, 19 Aug 2019) | 1 line fcl-db: sqldb: Upgrade TDS protocol version from 7.0 (MS SQL Server 2000) to newer 7.3 (MS SQL Server 2008) to support new data types DATE, TIME, DATETIME2 introduced in MS SQL Server 2008. ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43232 -	2019-10-19 14:34:55 +00:00
michael	a94e6c784e	* Merging revisions 42672 from trunk: ... ------------------------------------------------------------------------ r42672 | lacak | 2019-08-13 09:31:12 +0200 (Tue, 13 Aug 2019) | 1 line fcl-db: base: cosmetic (char-case) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43231 -	2019-10-19 14:34:36 +00:00
michael	4fede25682	* Merging revisions 42671 from trunk: ... ------------------------------------------------------------------------ r42671 | lacak | 2019-08-13 09:28:26 +0200 (Tue, 13 Aug 2019) | 1 line fcl-db: tests: small improvement (change order of tests; first test native field type, after that string representation) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43230 -	2019-10-19 14:33:48 +00:00
michael	12117f7caf	* Merging revisions 43211 from trunk: ... ------------------------------------------------------------------------ r43211 | lacak | 2019-10-17 14:59:25 +0200 (Thu, 17 Oct 2019) | 1 line fcl-db: sdf: add virtual to ExtractDelimited(). Bug #36190 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@43226 -	2019-10-19 12:04:04 +00:00
marco	c31f787eb2	--- Merging r43208 into '.': ... U packages/fcl-process/src/processbody.inc --- Recording mergeinfo for merge of r43208 into '.': U . # revisions: 43208 git-svn-id: branches/fixes_3_2@43217 -	2019-10-17 19:30:59 +00:00
marco	65ae9d2413	* merge revs ... git-svn-id: branches/fixes_3_2@43196 -	2019-10-14 13:58:40 +00:00
pierre	e05774c6c8	Fix list of targets for vcl-compat package ... by also merging commits #4294 and 42967 ------------------------------------------------------------------------ r42941 | karoly | 2019-09-07 21:01:14 +0000 (Sat, 07 Sep 2019) | 1 line vcl-compat: disabled it for palmos, atari, msdos and go32v2. fcl-web is not compiled for these, and that is a dependency. ------------------------------------------------------------------------ --- Merging r42941 into '.': U packages/vcl-compat/fpmake.pp --- Recording mergeinfo for merge of r42941 into '.': U . ------------------------------------------------------------------------ r42967 | pierre | 2019-09-09 08:27:53 +0000 (Mon, 09 Sep 2019) | 1 line Copy supported systems from fcl-web/fpmake.pp to avoid several build failures ------------------------------------------------------------------------ --- Merging r42967 into '.': G packages/vcl-compat/fpmake.pp --- Recording mergeinfo for merge of r42967 into '.': G . git-svn-id: branches/fixes_3_2@43180 -	2019-10-13 07:06:54 +00:00
marco	3e2807a08e	--- Merging r43102 into '.': ... U packages/fcl-extra/src/daemonapp.pp --- Recording mergeinfo for merge of r43102 into '.': U . # revisions: 43102 git-svn-id: branches/fixes_3_2@43174 -	2019-10-12 16:36:45 +00:00
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 -	2019-10-12 16:15:55 +00:00
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 -	2019-10-12 15:24:05 +00:00
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 -	2019-10-12 11:59:37 +00:00
pierre	4ab14200d5	Merge of commits 42696, 42745, 42761 and 42762 ... ------------------------------------------------------------------------ r42696 | svenbarth | 2019-08-15 11:41:36 +0000 (Thu, 15 Aug 2019) | 3 lines * fix for Mantis #35964: reestablish pre r42594 behavior for WinCE as at least Windows Mobile does not support the required COM functions Note: in theory Windows CE *can* support these functions, but it dependends on the provider whether they're indeed supported (e.g. Windows Mobile does not). Probably this should be revisited once we support the "delayed" directive. ------------------------------------------------------------------------ --- Merging r42696 into '.': U packages/winunits-base/src/comobj.pp --- Recording mergeinfo for merge of r42696 into '.': U . ------------------------------------------------------------------------ r42745 | pierre | 2019-08-20 12:11:17 +0000 (Tue, 20 Aug 2019) | 1 line Add x86_64-aros and m68k-macos to OSCPUSupported table ------------------------------------------------------------------------ --- Merging r42745 into '.': C packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r42745 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r42761 | pierre | 2019-08-22 13:01:08 +0000 (Thu, 22 Aug 2019) | 1 line Also use ACPU and AOS parameters to call GetUnitConfigOutputFilename ------------------------------------------------------------------------ --- Merging r42761 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r42761 into '.': G . ------------------------------------------------------------------------ r42762 | pierre | 2019-08-22 15:33:45 +0000 (Thu, 22 Aug 2019) | 6 lines * Fix errors in sourcezip generation: in fcl-process, by adding src subdirectory also as include dir. in winceunits, by removing activex from implicit unit list for wince target, as it already is in the explicit unit list. ------------------------------------------------------------------------ --- Merging r42762 into '.': U packages/fcl-process/fpmake.pp U packages/winceunits/fpmake.pp --- Recording mergeinfo for merge of r42762 into '.': G . git-svn-id: branches/fixes_3_2@43036 -	2019-09-19 07:42:56 +00:00
marco	c07b8a1954	--- Merging r42594 into '.': ... U packages/winunits-base/src/comobj.pp U packages/winunits-base/src/comserv.pp --- Recording mergeinfo for merge of r42594 into '.': U . --- Merging r42908 into '.': U packages/fcl-stl/doc/hashmapexample.pp U packages/fcl-stl/src/ghashmap.pp --- Recording mergeinfo for merge of r42908 into '.': G . --- Merging r42909 into '.': G packages/fcl-stl/src/ghashmap.pp U packages/fcl-stl/src/gvector.pp --- Recording mergeinfo for merge of r42909 into '.': G . --- Merging r42910 into '.': U packages/fcl-stl/doc/mapexample.pp U packages/fcl-stl/src/gmap.pp --- Recording mergeinfo for merge of r42910 into '.': G . --- Merging r42914 into '.': U packages/chm/src/chmreader.pas --- Recording mergeinfo for merge of r42914 into '.': G . --- Merging r42915 into '.': U packages/fcl-stl/src/ghashset.pp U packages/fcl-stl/src/gset.pp --- Recording mergeinfo for merge of r42915 into '.': G . # revisions: 42594,42908,42909,42910,42914,42915 git-svn-id: branches/fixes_3_2@42922 -	2019-09-05 12:17:22 +00:00
marco	415c951a87	--- Merging r42331 into '.': ... U packages/fcl-db/src/base/dbconst.pas --- Recording mergeinfo for merge of r42331 into '.': U . --- Merging r42467 into '.': U packages/fcl-db/src/base/db.pas --- Recording mergeinfo for merge of r42467 into '.': G . --- Merging r42497 into '.': U packages/fcl-db/tests/testfieldtypes.pas --- Recording mergeinfo for merge of r42497 into '.': G . # revisions: 42331,42467,42497 git-svn-id: branches/fixes_3_2@42913 -	2019-09-03 14:52:53 +00:00
marco	c054c303ba	--- Merging r42812 into '.': ... A packages/winunits-base/tests/inproccomtest A packages/winunits-base/tests/inproccomtest/com_clnt.dpr A packages/winunits-base/tests/inproccomtest/com_impl.pas A packages/winunits-base/tests/inproccomtest/com_serv.dpr A packages/winunits-base/tests/inproccomtest/com_serv.tlb A packages/winunits-base/tests/inproccomtest/com_serv_TLB.pas --- Recording mergeinfo for merge of r42812 into '.': U . --- Merging r42813 into '.': U rtl/objpas/classes/classesh.inc --- Recording mergeinfo for merge of r42813 into '.': G . --- Merging r42586 into '.': U packages/fcl-image/src/fptiffcmn.pas U packages/fcl-image/src/fpwritetiff.pas --- Recording mergeinfo for merge of r42586 into '.': G . --- Merging r42876 into '.': U packages/fcl-image/src/fpreadpng.pp --- Recording mergeinfo for merge of r42876 into '.': G . # revisions: 42812,42813,42586,42876 git-svn-id: branches/fixes_3_2@42912 -	2019-09-03 14:27:17 +00:00
marco	65e16f4f98	--- Merging r41636 into '.': ... U rtl/win/sysosh.inc --- Recording mergeinfo for merge of r41636 into '.': U . --- Merging r41795 into '.': U rtl/objpas/classes/classesh.inc U rtl/objpas/classes/collect.inc --- Recording mergeinfo for merge of r41795 into '.': G . --- Merging r41881 into '.': U rtl/objpas/sysutils/syshelph.inc --- Recording mergeinfo for merge of r41881 into '.': G . --- Merging r42149 into '.': U rtl/msdos/dos.pp --- Recording mergeinfo for merge of r42149 into '.': G . --- Merging r42180 into '.': U rtl/freebsd/sysnr.inc --- Recording mergeinfo for merge of r42180 into '.': G . --- Merging r42452 into '.': U rtl/objpas/sysutils/datih.inc --- Recording mergeinfo for merge of r42452 into '.': G . --- Merging r42775 into '.': U packages/winunits-base/src/mmsystem.pp --- Recording mergeinfo for merge of r42775 into '.': G . # revisions: 41636,41795,41881,42149,42180,42452,42775 git-svn-id: branches/fixes_3_2@42911 -	2019-09-03 13:30:49 +00:00
michael	810989c765	* Merging revisions r42871,r42872 from trunk: ... ------------------------------------------------------------------------ r42871 | michael | 2019-08-29 21:02:08 +0200 (Thu, 29 Aug 2019) | 1 line * Fix forgotten loadmimetypes ------------------------------------------------------------------------ r42872 | michael | 2019-08-29 21:07:52 +0200 (Thu, 29 Aug 2019) | 1 line * Observe -m ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42873 -	2019-08-29 19:08:45 +00:00
michael	7e962b39e2	* Merging revisions 42867 from trunk: ... ------------------------------------------------------------------------ r42867 | michael | 2019-08-29 08:44:01 +0200 (Thu, 29 Aug 2019) | 1 line Fix bug ID #36023, deprecate sslleay ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42868 -	2019-08-29 06:45:00 +00:00
michael	f6681cb340	* Merging revisions 42864 from trunk: ... ------------------------------------------------------------------------ r42864 | michael | 2019-08-28 21:28:30 +0200 (Wed, 28 Aug 2019) | 1 line * Bring OpenSSL up to date with V1.1 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42865 -	2019-08-28 19:30:24 +00:00
pierre	8875b9a109	--- Merging r42858 into '.': ... U packages/fcl-web/fpmake.pp --- Recording mergeinfo for merge of r42858 into '.': U . ------------------------------------------------------------------------ r42858 | pierre | 2019-08-27 13:51:22 +0000 (Tue, 27 Aug 2019) | 1 line Explicitly add fpc-registry dependency for AllWindowsOSes (because fpmimetypes unit uses registry unit) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42861 -	2019-08-28 09:47:37 +00:00
michael	15a627acea	* Merging revisions r42795 from trunk: ... ------------------------------------------------------------------------ r42795 | michael | 2019-08-24 11:56:58 +0200 (Sat, 24 Aug 2019) | 1 line * Small cosmetic improvement to output ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42856 -	2019-08-27 07:08:18 +00:00
michael	4e5b29cb58	* Merging revisions r42794 from trunk: ... ------------------------------------------------------------------------ r42794 | michael | 2019-08-24 11:56:27 +0200 (Sat, 24 Aug 2019) | 1 line * Add module to units part of project ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42855 -	2019-08-27 07:08:07 +00:00
michael	2627964fec	* Merging revisions 42350 from trunk: ... ------------------------------------------------------------------------ r42350 | michael | 2019-07-11 22:17:29 +0200 (Thu, 11 Jul 2019) | 1 line * Always try to show the field name when possible ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42853 -	2019-08-27 07:07:01 +00:00
michael	85bf1fdb9e	* Merging revisions 42349 from trunk: ... ------------------------------------------------------------------------ r42349 | michael | 2019-07-11 22:16:35 +0200 (Thu, 11 Jul 2019) | 1 line * Always try to show the field name when possible ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42852 -	2019-08-27 07:06:46 +00:00
michael	fb0ce8bc32	* Merging revisions 42344 from trunk: ... ------------------------------------------------------------------------ r42344 | michael | 2019-07-08 12:27:11 +0200 (Mon, 08 Jul 2019) | 1 line * Fix bug ID #35796, codepage issue when getting string as variant ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42851 -	2019-08-27 07:06:28 +00:00
michael	590c23c6bb	* Merging revisions 42831,42832 from trunk: ... ------------------------------------------------------------------------ r42831 | michael | 2019-08-26 20:32:59 +0200 (Mon, 26 Aug 2019) | 1 line * Fix bug ID #35887 ------------------------------------------------------------------------ r42832 | michael | 2019-08-26 20:50:03 +0200 (Mon, 26 Aug 2019) | 1 line * Add support for citext field ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42850 -	2019-08-27 07:03:44 +00:00
michael	6ef897798e	* Merging revisions 42820,42821,42822,42823,42825 from trunk: ... ------------------------------------------------------------------------ r42820 | michael | 2019-08-26 08:36:01 +0200 (Mon, 26 Aug 2019) | 1 line * Add LoadKnownTypes to load default set from OS (including registry on windows) ------------------------------------------------------------------------ r42821 | michael | 2019-08-26 08:44:10 +0200 (Mon, 26 Aug 2019) | 1 line * Add mime.types for benefit of windows users, call new LoadKnownTypes ------------------------------------------------------------------------ r42822 | michael | 2019-08-26 08:52:21 +0200 (Mon, 26 Aug 2019) | 1 line * Some additional help ------------------------------------------------------------------------ r42823 | michael | 2019-08-26 08:53:12 +0200 (Mon, 26 Aug 2019) | 1 line * Remove units no longer needed ------------------------------------------------------------------------ r42825 | michael | 2019-08-26 10:30:06 +0200 (Mon, 26 Aug 2019) | 1 line * Moved fpmimetypes unit to fcl-web ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42849 -	2019-08-27 07:03:08 +00:00
michael	a26b523a35	* Merging revisions 42800 from trunk: ... ------------------------------------------------------------------------ r42800 | michael | 2019-08-24 13:05:19 +0200 (Sat, 24 Aug 2019) | 1 line * Make order of ISO8601ToDate consistent, ReturnUTC always at the end, and default true ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42848 -	2019-08-27 07:01:25 +00:00
michael	10629fb682	* Merging revisions 42799 from trunk: ... ------------------------------------------------------------------------ r42799 | michael | 2019-08-24 13:01:15 +0200 (Sat, 24 Aug 2019) | 1 line * Make order of args in TryISO8601ToDate delphi compatible ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42847 -	2019-08-27 07:01:11 +00:00
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 -	2019-08-27 07:00:37 +00:00
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 -	2019-08-27 06:59:13 +00:00
michael	909b54579d	* Merging revisions 42743,42766,42767,42768,42782 from trunk: ... ------------------------------------------------------------------------ r42743 | michael | 2019-08-20 09:03:24 +0200 (Tue, 20 Aug 2019) | 1 line * Fix bug #0035985 ------------------------------------------------------------------------ r42766 | michael | 2019-08-23 08:45:11 +0200 (Fri, 23 Aug 2019) | 1 line * Fix bug ID #0035596: better detection of vcs device ------------------------------------------------------------------------ r42767 | michael | 2019-08-23 09:21:03 +0200 (Fri, 23 Aug 2019) | 1 line * Make TResponse.Content a RawByteString ------------------------------------------------------------------------ r42768 | michael | 2019-08-23 09:21:44 +0200 (Fri, 23 Aug 2019) | 1 line * Set content-type on response (bug ID 35990) ------------------------------------------------------------------------ r42782 | michael | 2019-08-24 10:54:24 +0200 (Sat, 24 Aug 2019) | 1 line * Add WideString support in json string constructor ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42844 -	2019-08-27 06:57:58 +00:00
Jonas Maebe	c540b3b2df	--- Merging r42483 into '.': ... U packages/cocoaint/src/CocoaAll.pas U packages/cocoaint/src/InlineFunctions.inc U packages/cocoaint/src/appkit/NSATSTypesetter.inc U packages/cocoaint/src/appkit/NSAccessibility.inc U packages/cocoaint/src/appkit/NSAlert.inc U packages/cocoaint/src/appkit/NSAnimation.inc U packages/cocoaint/src/appkit/NSApplication.inc U packages/cocoaint/src/appkit/NSApplicationScripting.inc U packages/cocoaint/src/appkit/NSArrayController.inc U packages/cocoaint/src/appkit/NSAttributedString.inc U packages/cocoaint/src/appkit/NSBezierPath.inc U packages/cocoaint/src/appkit/NSBitmapImageRep.inc U packages/cocoaint/src/appkit/NSBox.inc U packages/cocoaint/src/appkit/NSBrowser.inc U packages/cocoaint/src/appkit/NSBrowserCell.inc U packages/cocoaint/src/appkit/NSButton.inc U packages/cocoaint/src/appkit/NSButtonCell.inc U packages/cocoaint/src/appkit/NSCachedImageRep.inc U packages/cocoaint/src/appkit/NSCell.inc U packages/cocoaint/src/appkit/NSClipView.inc U packages/cocoaint/src/appkit/NSCollectionView.inc U packages/cocoaint/src/appkit/NSColor.inc U packages/cocoaint/src/appkit/NSColorList.inc U packages/cocoaint/src/appkit/NSColorPanel.inc U packages/cocoaint/src/appkit/NSColorPicking.inc U packages/cocoaint/src/appkit/NSColorWell.inc U packages/cocoaint/src/appkit/NSComboBox.inc U packages/cocoaint/src/appkit/NSComboBoxCell.inc U packages/cocoaint/src/appkit/NSControl.inc U packages/cocoaint/src/appkit/NSController.inc U packages/cocoaint/src/appkit/NSCursor.inc U packages/cocoaint/src/appkit/NSDatePicker.inc U packages/cocoaint/src/appkit/NSDatePickerCell.inc U packages/cocoaint/src/appkit/NSDictionaryController.inc U packages/cocoaint/src/appkit/NSDockTile.inc U packages/cocoaint/src/appkit/NSDocument.inc U packages/cocoaint/src/appkit/NSDocumentController.inc U packages/cocoaint/src/appkit/NSDragging.inc U packages/cocoaint/src/appkit/NSDrawer.inc U packages/cocoaint/src/appkit/NSEvent.inc U packages/cocoaint/src/appkit/NSFileWrapper.inc U packages/cocoaint/src/appkit/NSFont.inc U packages/cocoaint/src/appkit/NSFontManager.inc U packages/cocoaint/src/appkit/NSFontPanel.inc U packages/cocoaint/src/appkit/NSFormCell.inc U packages/cocoaint/src/appkit/NSGraphics.inc U packages/cocoaint/src/appkit/NSGraphicsContext.inc U packages/cocoaint/src/appkit/NSHelpManager.inc U packages/cocoaint/src/appkit/NSImage.inc U packages/cocoaint/src/appkit/NSImageRep.inc U packages/cocoaint/src/appkit/NSImageView.inc U packages/cocoaint/src/appkit/NSInputManager.inc U packages/cocoaint/src/appkit/NSInputServer.inc U packages/cocoaint/src/appkit/NSKeyValueBinding.inc U packages/cocoaint/src/appkit/NSLayoutManager.inc U packages/cocoaint/src/appkit/NSMatrix.inc U packages/cocoaint/src/appkit/NSMenu.inc U packages/cocoaint/src/appkit/NSMenuItem.inc U packages/cocoaint/src/appkit/NSMenuItemCell.inc U packages/cocoaint/src/appkit/NSMenuView.inc U packages/cocoaint/src/appkit/NSMovie.inc U packages/cocoaint/src/appkit/NSMovieView.inc U packages/cocoaint/src/appkit/NSNib.inc U packages/cocoaint/src/appkit/NSNibLoading.inc U packages/cocoaint/src/appkit/NSObjectController.inc U packages/cocoaint/src/appkit/NSOpenPanel.inc U packages/cocoaint/src/appkit/NSOutlineView.inc U packages/cocoaint/src/appkit/NSPanel.inc U packages/cocoaint/src/appkit/NSPasteboard.inc U packages/cocoaint/src/appkit/NSPasteboardItem.inc U packages/cocoaint/src/appkit/NSPathCell.inc U packages/cocoaint/src/appkit/NSPathControl.inc U packages/cocoaint/src/appkit/NSPersistentDocument.inc U packages/cocoaint/src/appkit/NSPopUpButton.inc U packages/cocoaint/src/appkit/NSPopUpButtonCell.inc U packages/cocoaint/src/appkit/NSPrintInfo.inc U packages/cocoaint/src/appkit/NSPrintOperation.inc U packages/cocoaint/src/appkit/NSPrinter.inc U packages/cocoaint/src/appkit/NSProgressIndicator.inc U packages/cocoaint/src/appkit/NSQuickDrawView.inc U packages/cocoaint/src/appkit/NSResponder.inc U packages/cocoaint/src/appkit/NSRuleEditor.inc U packages/cocoaint/src/appkit/NSRulerMarker.inc U packages/cocoaint/src/appkit/NSRulerView.inc U packages/cocoaint/src/appkit/NSRunningApplication.inc U packages/cocoaint/src/appkit/NSSavePanel.inc U packages/cocoaint/src/appkit/NSScrollView.inc U packages/cocoaint/src/appkit/NSScroller.inc U packages/cocoaint/src/appkit/NSSearchFieldCell.inc U packages/cocoaint/src/appkit/NSSecureTextField.inc U packages/cocoaint/src/appkit/NSSegmentedControl.inc U packages/cocoaint/src/appkit/NSSlider.inc U packages/cocoaint/src/appkit/NSSliderCell.inc U packages/cocoaint/src/appkit/NSSound.inc U packages/cocoaint/src/appkit/NSSpeechRecognizer.inc U packages/cocoaint/src/appkit/NSSpeechSynthesizer.inc U packages/cocoaint/src/appkit/NSSpellChecker.inc U packages/cocoaint/src/appkit/NSSplitView.inc U packages/cocoaint/src/appkit/NSStatusBar.inc U packages/cocoaint/src/appkit/NSStatusItem.inc U packages/cocoaint/src/appkit/NSStepper.inc U packages/cocoaint/src/appkit/NSStepperCell.inc U packages/cocoaint/src/appkit/NSTabView.inc U packages/cocoaint/src/appkit/NSTabViewItem.inc U packages/cocoaint/src/appkit/NSTableColumn.inc U packages/cocoaint/src/appkit/NSTableHeaderCell.inc U packages/cocoaint/src/appkit/NSTableHeaderView.inc U packages/cocoaint/src/appkit/NSTableView.inc U packages/cocoaint/src/appkit/NSText.inc U packages/cocoaint/src/appkit/NSTextAttachment.inc U packages/cocoaint/src/appkit/NSTextContainer.inc U packages/cocoaint/src/appkit/NSTextField.inc U packages/cocoaint/src/appkit/NSTextFieldCell.inc U packages/cocoaint/src/appkit/NSTextInputClient.inc U packages/cocoaint/src/appkit/NSTextInputContext.inc U packages/cocoaint/src/appkit/NSTextStorage.inc U packages/cocoaint/src/appkit/NSTextTable.inc U packages/cocoaint/src/appkit/NSTextView.inc U packages/cocoaint/src/appkit/NSTokenField.inc U packages/cocoaint/src/appkit/NSTokenFieldCell.inc U packages/cocoaint/src/appkit/NSToolbar.inc U packages/cocoaint/src/appkit/NSToolbarItem.inc U packages/cocoaint/src/appkit/NSTouch.inc U packages/cocoaint/src/appkit/NSTreeController.inc U packages/cocoaint/src/appkit/NSTreeNode.inc U packages/cocoaint/src/appkit/NSTypesetter.inc U packages/cocoaint/src/appkit/NSUserDefaultsController.inc U packages/cocoaint/src/appkit/NSUserInterfaceItemSearching.inc U packages/cocoaint/src/appkit/NSUserInterfaceValidation.inc U packages/cocoaint/src/appkit/NSView.inc U packages/cocoaint/src/appkit/NSViewController.inc U packages/cocoaint/src/appkit/NSWindow.inc U packages/cocoaint/src/appkit/NSWindowController.inc U packages/cocoaint/src/appkit/NSWindowScripting.inc U packages/cocoaint/src/appkit/NSWorkspace.inc U packages/cocoaint/src/coredata/NSAtomicStore.inc U packages/cocoaint/src/coredata/NSEntityDescription.inc U packages/cocoaint/src/coredata/NSEntityMigrationPolicy.inc U packages/cocoaint/src/coredata/NSFetchRequest.inc U packages/cocoaint/src/coredata/NSFetchRequestExpression.inc U packages/cocoaint/src/coredata/NSManagedObject.inc U packages/cocoaint/src/coredata/NSManagedObjectContext.inc U packages/cocoaint/src/coredata/NSManagedObjectID.inc U packages/cocoaint/src/coredata/NSManagedObjectModel.inc U packages/cocoaint/src/coredata/NSMigrationManager.inc U packages/cocoaint/src/coredata/NSPersistentStore.inc U packages/cocoaint/src/coredata/NSPersistentStoreCoordinator.inc U packages/cocoaint/src/coredata/NSPropertyDescription.inc U packages/cocoaint/src/coredata/NSRelationshipDescription.inc U packages/cocoaint/src/foundation/NSAppleEventDescriptor.inc U packages/cocoaint/src/foundation/NSAppleEventManager.inc U packages/cocoaint/src/foundation/NSAppleScript.inc U packages/cocoaint/src/foundation/NSArchiver.inc U packages/cocoaint/src/foundation/NSArray.inc U packages/cocoaint/src/foundation/NSBundle.inc U packages/cocoaint/src/foundation/NSCache.inc U packages/cocoaint/src/foundation/NSCalendar.inc U packages/cocoaint/src/foundation/NSCharacterSet.inc U packages/cocoaint/src/foundation/NSCoder.inc U packages/cocoaint/src/foundation/NSConnection.inc U packages/cocoaint/src/foundation/NSData.inc U packages/cocoaint/src/foundation/NSDate.inc U packages/cocoaint/src/foundation/NSDateFormatter.inc U packages/cocoaint/src/foundation/NSDecimalNumber.inc U packages/cocoaint/src/foundation/NSDictionary.inc U packages/cocoaint/src/foundation/NSDistributedLock.inc U packages/cocoaint/src/foundation/NSDistributedNotificationCenter.inc U packages/cocoaint/src/foundation/NSError.inc U packages/cocoaint/src/foundation/NSFileHandle.inc U packages/cocoaint/src/foundation/NSFileManager.inc U packages/cocoaint/src/foundation/NSFormatter.inc U packages/cocoaint/src/foundation/NSGarbageCollector.inc U packages/cocoaint/src/foundation/NSGeometry.inc U packages/cocoaint/src/foundation/NSHTTPCookie.inc U packages/cocoaint/src/foundation/NSHashTable.inc U packages/cocoaint/src/foundation/NSHost.inc U packages/cocoaint/src/foundation/NSIndexSet.inc U packages/cocoaint/src/foundation/NSInvocation.inc U packages/cocoaint/src/foundation/NSKeyValueCoding.inc U packages/cocoaint/src/foundation/NSKeyValueObserving.inc U packages/cocoaint/src/foundation/NSKeyedArchiver.inc U packages/cocoaint/src/foundation/NSLock.inc U packages/cocoaint/src/foundation/NSMapTable.inc U packages/cocoaint/src/foundation/NSMetadata.inc U packages/cocoaint/src/foundation/NSMethodSignature.inc U packages/cocoaint/src/foundation/NSNetServices.inc U packages/cocoaint/src/foundation/NSNumberFormatter.inc U packages/cocoaint/src/foundation/NSObject.inc U packages/cocoaint/src/foundation/NSOperation.inc U packages/cocoaint/src/foundation/NSPathUtilities.inc U packages/cocoaint/src/foundation/NSPointerFunctions.inc U packages/cocoaint/src/foundation/NSPort.inc U packages/cocoaint/src/foundation/NSPortCoder.inc U packages/cocoaint/src/foundation/NSPortMessage.inc U packages/cocoaint/src/foundation/NSPortNameServer.inc U packages/cocoaint/src/foundation/NSPredicate.inc U packages/cocoaint/src/foundation/NSPropertyList.inc U packages/cocoaint/src/foundation/NSProxy.inc U packages/cocoaint/src/foundation/NSRunLoop.inc U packages/cocoaint/src/foundation/NSScanner.inc U packages/cocoaint/src/foundation/NSScriptClassDescription.inc U packages/cocoaint/src/foundation/NSScriptCommand.inc U packages/cocoaint/src/foundation/NSScriptCommandDescription.inc U packages/cocoaint/src/foundation/NSScriptObjectSpecifiers.inc U packages/cocoaint/src/foundation/NSScriptSuiteRegistry.inc U packages/cocoaint/src/foundation/NSScriptWhoseTests.inc U packages/cocoaint/src/foundation/NSSet.inc U packages/cocoaint/src/foundation/NSSortDescriptor.inc U packages/cocoaint/src/foundation/NSSpellServer.inc U packages/cocoaint/src/foundation/NSStream.inc U packages/cocoaint/src/foundation/NSString.inc U packages/cocoaint/src/foundation/NSTask.inc U packages/cocoaint/src/foundation/NSThread.inc U packages/cocoaint/src/foundation/NSTimeZone.inc U packages/cocoaint/src/foundation/NSTimer.inc U packages/cocoaint/src/foundation/NSURL.inc U packages/cocoaint/src/foundation/NSURLConnection.inc U packages/cocoaint/src/foundation/NSURLCredential.inc U packages/cocoaint/src/foundation/NSURLDownload.inc U packages/cocoaint/src/foundation/NSURLHandle.inc U packages/cocoaint/src/foundation/NSURLProtectionSpace.inc U packages/cocoaint/src/foundation/NSURLProtocol.inc U packages/cocoaint/src/foundation/NSURLRequest.inc U packages/cocoaint/src/foundation/NSUndoManager.inc U packages/cocoaint/src/foundation/NSUserDefaults.inc U packages/cocoaint/src/foundation/NSValue.inc U packages/cocoaint/src/foundation/NSValueTransformer.inc U packages/cocoaint/src/foundation/NSXMLDTD.inc U packages/cocoaint/src/foundation/NSXMLDTDNode.inc U packages/cocoaint/src/foundation/NSXMLDocument.inc U packages/cocoaint/src/foundation/NSXMLElement.inc U packages/cocoaint/src/foundation/NSXMLNode.inc U packages/cocoaint/src/foundation/NSXMLParser.inc U packages/cocoaint/src/foundation/NSZone.inc U packages/cocoaint/src/quartzcore/CAAnimation.inc U packages/cocoaint/src/quartzcore/CACIFilterAdditions.inc U packages/cocoaint/src/quartzcore/CAEmitterCell.inc U packages/cocoaint/src/quartzcore/CAEmitterLayer.inc U packages/cocoaint/src/quartzcore/CALayer.inc U packages/cocoaint/src/quartzcore/CAMediaTiming.inc U packages/cocoaint/src/quartzcore/CAOpenGLLayer.inc U packages/cocoaint/src/quartzcore/CAReplicatorLayer.inc U packages/cocoaint/src/quartzcore/CATextLayer.inc U packages/cocoaint/src/quartzcore/CATransaction.inc U packages/cocoaint/src/quartzcore/CATransform3D.inc U packages/cocoaint/src/quartzcore/CIFilterGenerator.inc U packages/cocoaint/src/quartzcore/CIFilterShape.inc U packages/cocoaint/src/quartzcore/CIImage.inc U packages/cocoaint/src/quartzcore/CIPlugIn.inc U packages/cocoaint/src/quartzcore/CIPlugInInterface.inc U packages/cocoaint/src/webkit/DOMAttr.inc U packages/cocoaint/src/webkit/DOMCSSStyleDeclaration.inc U packages/cocoaint/src/webkit/DOMDocument.inc U packages/cocoaint/src/webkit/DOMElement.inc U packages/cocoaint/src/webkit/DOMEvent.inc U packages/cocoaint/src/webkit/DOMEventTarget.inc U packages/cocoaint/src/webkit/DOMHTMLAreaElement.inc U packages/cocoaint/src/webkit/DOMHTMLButtonElement.inc U packages/cocoaint/src/webkit/DOMHTMLDListElement.inc U packages/cocoaint/src/webkit/DOMHTMLDirectoryElement.inc U packages/cocoaint/src/webkit/DOMHTMLDocument.inc U packages/cocoaint/src/webkit/DOMHTMLElement.inc U packages/cocoaint/src/webkit/DOMHTMLFrameElement.inc U packages/cocoaint/src/webkit/DOMHTMLHRElement.inc U packages/cocoaint/src/webkit/DOMHTMLImageElement.inc U packages/cocoaint/src/webkit/DOMHTMLInputElement.inc U packages/cocoaint/src/webkit/DOMHTMLLinkElement.inc U packages/cocoaint/src/webkit/DOMHTMLMenuElement.inc U packages/cocoaint/src/webkit/DOMHTMLOListElement.inc U packages/cocoaint/src/webkit/DOMHTMLObjectElement.inc U packages/cocoaint/src/webkit/DOMHTMLOptGroupElement.inc U packages/cocoaint/src/webkit/DOMHTMLOptionElement.inc U packages/cocoaint/src/webkit/DOMHTMLPreElement.inc U packages/cocoaint/src/webkit/DOMHTMLScriptElement.inc U packages/cocoaint/src/webkit/DOMHTMLSelectElement.inc U packages/cocoaint/src/webkit/DOMHTMLStyleElement.inc U packages/cocoaint/src/webkit/DOMHTMLTableCellElement.inc U packages/cocoaint/src/webkit/DOMHTMLTextAreaElement.inc U packages/cocoaint/src/webkit/DOMHTMLUListElement.inc U packages/cocoaint/src/webkit/DOMImplementation.inc U packages/cocoaint/src/webkit/DOMKeyboardEvent.inc U packages/cocoaint/src/webkit/DOMMouseEvent.inc U packages/cocoaint/src/webkit/DOMMutationEvent.inc U packages/cocoaint/src/webkit/DOMNode.inc U packages/cocoaint/src/webkit/DOMNodeIterator.inc U packages/cocoaint/src/webkit/DOMOverflowEvent.inc U packages/cocoaint/src/webkit/DOMProgressEvent.inc U packages/cocoaint/src/webkit/DOMRange.inc U packages/cocoaint/src/webkit/DOMStyleSheet.inc U packages/cocoaint/src/webkit/DOMTreeWalker.inc U packages/cocoaint/src/webkit/DOMUIEvent.inc U packages/cocoaint/src/webkit/DOMWheelEvent.inc U packages/cocoaint/src/webkit/DOMXPathResult.inc U packages/cocoaint/src/webkit/WebBackForwardList.inc U packages/cocoaint/src/webkit/WebDataSource.inc U packages/cocoaint/src/webkit/WebDocument.inc U packages/cocoaint/src/webkit/WebEditingDelegate.inc U packages/cocoaint/src/webkit/WebFrameView.inc U packages/cocoaint/src/webkit/WebHistory.inc U packages/cocoaint/src/webkit/WebPlugin.inc U packages/cocoaint/src/webkit/WebPreferences.inc U packages/cocoaint/src/webkit/WebScriptObject.inc U packages/cocoaint/src/webkit/WebUIDelegate.inc U packages/cocoaint/src/webkit/WebView.inc U rtl/inc/objc1.inc U rtl/inc/objcbase.pp U rtl/inc/objcnf.inc --- Recording mergeinfo for merge of r42483 into '.': U . git-svn-id: branches/fixes_3_2@42484 -	2019-07-23 09:18:13 +00:00
michael	fc89dc3cb1	* Merging revisions 42041 from trunk: ... ------------------------------------------------------------------------ r42041 | michael | 2019-05-12 09:54:02 +0200 (Sun, 12 May 2019) | 1 line * Add largeint (int64) parameter supportby Silvio Clecio (bug ID 35554) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42444 -	2019-07-14 08:55:17 +00:00
michael	d0ff90ff06	* Merging revisions 42040 from trunk: ... ------------------------------------------------------------------------ r42040 | michael | 2019-05-12 09:51:38 +0200 (Sun, 12 May 2019) | 1 line * Patch from Ondrej Pokorny to fix bug ID #35544 (accept short timezones) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42443 -	2019-07-14 08:55:05 +00:00
michael	a60b9c6846	* Merging revisions r42021 from trunk: ... ------------------------------------------------------------------------ r42021 | michael | 2019-05-07 17:40:00 +0200 (Tue, 07 May 2019) | 1 line * GetPrimaryIndexFields is now a public class method, needed in designer ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42442 -	2019-07-14 08:54:50 +00:00
michael	807a917a5f	* Undo 42424 ... git-svn-id: branches/fixes_3_2@42441 -	2019-07-14 08:54:20 +00:00
michael	fa5b9b4f5c	* Merging revisions r42343 from trunk: ... ------------------------------------------------------------------------ r42343 | michael | 2019-07-08 12:24:00 +0200 (Mon, 08 Jul 2019) | 1 line * Patch from Maciej Izak to allow loading multiple times ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42435 -	2019-07-13 13:41:06 +00:00
michael	bf7c181fe2	* Merging revisions r42316 from trunk: ... ------------------------------------------------------------------------ r42316 | mattias | 2019-07-01 16:16:32 +0200 (Mon, 01 Jul 2019) | 1 line fcl-image: fpreadtiff: fixed inline ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42434 -	2019-07-13 13:40:09 +00:00
michael	02d9b6f18d	* Merging revisions r42273,r42276,r42277,r42278,r42279,r42285,r42295,r42296,r42297,r42298,r42298,r42299,r42300 from trunk: ... ------------------------------------------------------------------------ r42273 | michael | 2019-06-23 00:38:02 +0200 (Sun, 23 Jun 2019) | 1 line * Fix setusessl ------------------------------------------------------------------------ r42276 | lacak | 2019-06-23 20:02:38 +0200 (Sun, 23 Jun 2019) | 1 line fcl-db: sqldb: add connection charset aliases "win1250" (Firebird) and "cp1250" (MySQL) (although unicode is preferred nowadays and these SBCS are just a remnant of the past) ------------------------------------------------------------------------ r42277 | michael | 2019-06-24 09:18:34 +0200 (Mon, 24 Jun 2019) | 1 line * Correctly handle use in restmodule: use pathinfo to configure dispatcher ------------------------------------------------------------------------ r42278 | michael | 2019-06-24 09:22:02 +0200 (Mon, 24 Jun 2019) | 1 line * Smarter handling of DispatchOptions options ------------------------------------------------------------------------ r42279 | michael | 2019-06-24 09:51:45 +0200 (Mon, 24 Jun 2019) | 1 line * Allow using of connection charset if none is specified at DB level (bug ID 35755) ------------------------------------------------------------------------ r42285 | michael | 2019-06-26 10:34:47 +0200 (Wed, 26 Jun 2019) | 1 line * Allow generators in sqlite in 3.0.4 ------------------------------------------------------------------------ r42295 | michael | 2019-06-27 13:33:26 +0200 (Thu, 27 Jun 2019) | 1 line * Better CORS handling: return origin if available and allowed domains not set (* will prohibit credentials) ------------------------------------------------------------------------ r42296 | michael | 2019-06-27 13:37:38 +0200 (Thu, 27 Jun 2019) | 1 line * Better CORS handling: return origin if available and allowed domains not set (fix compilation) ------------------------------------------------------------------------ r42297 | michael | 2019-06-27 14:42:34 +0200 (Thu, 27 Jun 2019) | 1 line * Better CORS handling: return origin if available and allowed domains not set (activate using option) ------------------------------------------------------------------------ r42298 | michael | 2019-06-27 18:13:15 +0200 (Thu, 27 Jun 2019) | 1 line * Fix ISODateTime constant, trailing quote ------------------------------------------------------------------------ r42298 | michael | 2019-06-27 18:13:15 +0200 (Thu, 27 Jun 2019) | 1 line * Fix ISODateTime constant, trailing quote ------------------------------------------------------------------------ r42299 | michael | 2019-06-27 18:13:55 +0200 (Thu, 27 Jun 2019) | 1 line * Better code documentation for processql, add %OPTIONALWHERE% ------------------------------------------------------------------------ r42300 | michael | 2019-06-27 18:14:40 +0200 (Thu, 27 Jun 2019) | 1 line * Some fixes in parameter handling ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42432 -	2019-07-13 13:39:15 +00:00
michael	5aaedaab7c	* Merging revisions r42247,r42248,r42249,r42250,r42262,r42263,r42264,r42265,r42266,r42267,r42269 from trunk: ... ------------------------------------------------------------------------ r42247 | michael | 2019-06-19 08:12:15 +0200 (Wed, 19 Jun 2019) | 1 line * Fix bug ID #35731 (ReadSectionRaw needs to read comments) ------------------------------------------------------------------------ r42248 | michael | 2019-06-19 08:25:02 +0200 (Wed, 19 Jun 2019) | 1 line * Patch from Pascal Riekenberg to make component loading thread safe (bug ID 35638) ------------------------------------------------------------------------ r42249 | michael | 2019-06-19 10:10:26 +0200 (Wed, 19 Jun 2019) | 1 line * Fix non-threading platforms ------------------------------------------------------------------------ r42250 | michael | 2019-06-19 14:24:59 +0200 (Wed, 19 Jun 2019) | 1 line * Patch from Ondrej Pokorny to support streaming to position 0 (bug ID 35724) ------------------------------------------------------------------------ r42262 | michael | 2019-06-22 09:16:19 +0200 (Sat, 22 Jun 2019) | 1 line * Make sure error content is sent ------------------------------------------------------------------------ r42263 | michael | 2019-06-22 09:29:34 +0200 (Sat, 22 Jun 2019) | 1 line * Correct registration of metadata resource in case rdoConnectionInURL is specified ------------------------------------------------------------------------ r42264 | michael | 2019-06-22 09:33:49 +0200 (Sat, 22 Jun 2019) | 1 line * Add RoutesRegistered property to TSQLDBRestBridge ------------------------------------------------------------------------ r42265 | michael | 2019-06-22 09:44:18 +0200 (Sat, 22 Jun 2019) | 1 line * Unregister routes ------------------------------------------------------------------------ r42266 | michael | 2019-06-22 10:19:16 +0200 (Sat, 22 Jun 2019) | 1 line * Make sure output contains something in case of empty dataset ------------------------------------------------------------------------ r42267 | michael | 2019-06-22 10:22:30 +0200 (Sat, 22 Jun 2019) | 1 line * Correct autoincrement handling ------------------------------------------------------------------------ r42269 | michael | 2019-06-22 15:37:47 +0200 (Sat, 22 Jun 2019) | 1 line * Add SplitCommandLine ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42431 -	2019-07-13 13:37:12 +00:00
michael	38ab3a3b8a	* Merging revisions r42191,r42192 from trunk: ... ------------------------------------------------------------------------ r42191 | michael | 2019-06-08 16:41:09 +0200 (Sat, 08 Jun 2019) | 1 line * Unicode string assertequal ------------------------------------------------------------------------ r42192 | michael | 2019-06-08 16:43:39 +0200 (Sat, 08 Jun 2019) | 1 line * Unicode string assertequal (removed doubles) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42430 -	2019-07-13 13:34:16 +00:00
michael	93ebf5468f	* Merging revisions r42153,r42168,r42170,r42171,r42172,r42173,r42174 from trunk: ... ------------------------------------------------------------------------ r42153 | michael | 2019-06-01 11:42:27 +0200 (Sat, 01 Jun 2019) | 1 line * Fix bug #35660, introduce prefervaluestonames ------------------------------------------------------------------------ r42168 | michael | 2019-06-03 08:27:37 +0200 (Mon, 03 Jun 2019) | 1 line * Changed String.Split to conform to behaviour in Delphi Rio (bug ID 35669) ------------------------------------------------------------------------ r42170 | michael | 2019-06-04 09:00:48 +0200 (Tue, 04 Jun 2019) | 1 line * Better fix for 35660: Introduced TMissingNameValueSeparatorAction ------------------------------------------------------------------------ r42171 | michael | 2019-06-04 09:08:45 +0200 (Tue, 04 Jun 2019) | 1 line * Sort public properties/methods in stringlist ------------------------------------------------------------------------ r42172 | michael | 2019-06-04 09:29:53 +0200 (Tue, 04 Jun 2019) | 1 line * Added constant for new error message in stringlist ------------------------------------------------------------------------ r42173 | michael | 2019-06-04 10:31:39 +0200 (Tue, 04 Jun 2019) | 1 line Fix bug ID #0035672 ------------------------------------------------------------------------ r42174 | michael | 2019-06-05 13:42:40 +0200 (Wed, 05 Jun 2019) | 1 line * Fix bug ID #35674, do not create filestream for directories ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42429 -	2019-07-13 13:33:31 +00:00
michael	0dfec0d081	* Merging revisions r42143,r42144 from trunk: ... ------------------------------------------------------------------------ r42143 | marco | 2019-05-31 11:38:45 +0200 (Fri, 31 May 2019) | 2 lines * mantis #35586 ------------------------------------------------------------------------ r42144 | marco | 2019-05-31 11:41:28 +0200 (Fri, 31 May 2019) | 2 lines * freetype windows compat patch from Pascal Riekenberg, mantis #35644 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42428 -	2019-07-13 13:31:43 +00:00
michael	8c43258e68	* Merging revisions 42021,42040,42041,42042 from trunk: ... ------------------------------------------------------------------------ r42021 | michael | 2019-05-07 17:40:00 +0200 (Tue, 07 May 2019) | 1 line * GetPrimaryIndexFields is now a public class method, needed in designer ------------------------------------------------------------------------ r42040 | michael | 2019-05-12 09:51:38 +0200 (Sun, 12 May 2019) | 1 line * Patch from Ondrej Pokorny to fix bug ID #35544 (accept short timezones) ------------------------------------------------------------------------ r42041 | michael | 2019-05-12 09:54:02 +0200 (Sun, 12 May 2019) | 1 line * Add largeint (int64) parameter supportby Silvio Clecio (bug ID 35554) ------------------------------------------------------------------------ r42042 | michael | 2019-05-12 12:09:16 +0200 (Sun, 12 May 2019) | 1 line * Add Read/Write(Buffer) TBytes, ReadData/WriteData, ReadBufferData/WriteBufferData to be Delphi compatible ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42424 -	2019-07-13 13:28:03 +00:00
michael	1a568f4178	* Merging revisions 42004,42005,42009,42012 from trunk: ... ------------------------------------------------------------------------ r42004 | michael | 2019-05-06 09:37:15 +0200 (Mon, 06 May 2019) | 1 line * Copy connection name in assign ------------------------------------------------------------------------ r42005 | michael | 2019-05-06 09:38:00 +0200 (Mon, 06 May 2019) | 1 line * Split out processing of SQL so it can be used in editor. Correct LoadFromFile ------------------------------------------------------------------------ r42009 | michael | 2019-05-06 13:45:06 +0200 (Mon, 06 May 2019) | 1 line * Remove unused unit from uses clause ------------------------------------------------------------------------ r42012 | michael | 2019-05-06 17:47:45 +0200 (Mon, 06 May 2019) | 1 line * Fix redirect codes (bug ID 0035532) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42423 -	2019-07-13 13:26:43 +00:00
michael	4b65c24f2d	* Merging revisions 42003 from trunk: ... ------------------------------------------------------------------------ r42003 | michael | 2019-05-06 09:36:46 +0200 (Mon, 06 May 2019) | 1 line * Add Ini to some helper method names to avoid confusion ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42422 -	2019-07-13 13:26:19 +00:00
michael	4020adc422	* Merging revisions 41951,41954,41958,r41961 from trunk: ... ------------------------------------------------------------------------ r41951 | michael | 2019-04-28 11:02:41 +0200 (Sun, 28 Apr 2019) | 1 line * Patch from Ondrej Pokorny to fix bug ID : #32961 reflect system code page change in TEncoding ------------------------------------------------------------------------ r41954 | michael | 2019-04-28 13:47:49 +0200 (Sun, 28 Apr 2019) | 1 line * Added ISO8601ToDate and inverse (Bug ID 35307) ------------------------------------------------------------------------ r41958 | michael | 2019-04-28 19:15:35 +0200 (Sun, 28 Apr 2019) | 1 line * Avoid ScanDateTime in TryISO functions, it raises an exception ------------------------------------------------------------------------ r41961 | michael | 2019-04-30 07:53:38 +0200 (Tue, 30 Apr 2019) | 1 line * Fix compilation on 16-bit targets ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42421 -	2019-07-13 13:24:09 +00:00
michael	d18904d076	* Merging revisions 40394 from trunk: ... ------------------------------------------------------------------------ r40394 | michael | 2018-11-29 16:34:00 +0100 (Thu, 29 Nov 2018) | 1 line * Allow to retrieve argument size, patch by Silvio Clecio (bug ID 34611) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42416 -	2019-07-13 13:13:23 +00:00
michael	ff2025b522	* Merging revisions 40057 from trunk: ... ------------------------------------------------------------------------ r40057 | michael | 2018-10-27 17:08:11 +0200 (Sat, 27 Oct 2018) | 1 line * Fix some warnings ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42414 -	2019-07-13 13:12:20 +00:00
marco	dc6d580270	--- Merging r42261 into '.': ... U packages/morphunits/src/agraphics.pas U packages/os4units/src/agraphics.pas --- Recording mergeinfo for merge of r42261 into '.': U . # revisions: 42261 git-svn-id: branches/fixes_3_2@42345 -	2019-07-08 13:45:57 +00:00
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 -	2019-06-29 14:23:04 +00:00
michael	15303f3b55	* Merging revisions 42282 from trunk: ... ------------------------------------------------------------------------ r42282 | michael | 2019-06-25 07:54:25 +0200 (Tue, 25 Jun 2019) | 1 line Fix memleak (bug ID 0035761) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42284 -	2019-06-25 05:58:08 +00:00
michael	d1c7fa73b6	* Merging revisions 42280 from trunk: ... ------------------------------------------------------------------------ r42280 | michael | 2019-06-24 12:42:37 +0200 (Mon, 24 Jun 2019) | 1 line * Fix Bug ID #35759 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@42283 -	2019-06-25 05:57:41 +00:00
marco	b2bfb388da	--- Merging r42147 into '.': ... U rtl/inc/getopts.pp --- Recording mergeinfo for merge of r42147 into '.': U . --- Merging r42148 into '.': U packages/winunits-base/src/shlwapi.pp --- Recording mergeinfo for merge of r42148 into '.': G . --- Merging r42152 into '.': G packages/winunits-base/src/shlwapi.pp --- Recording mergeinfo for merge of r42152 into '.': G . # revisions: 42147,42148,42152 git-svn-id: branches/fixes_3_2@42161 -	2019-06-02 12:58:43 +00:00
marco	a67e69ae28	--- Merging r42086 into '.': ... U packages/gdbint/src/gdbint.pp --- Recording mergeinfo for merge of r42086 into '.': U . --- Merging r42113 into '.': U packages/openssl/src/openssl.pas --- Recording mergeinfo for merge of r42113 into '.': G . --- Merging r42114 into '.': G packages/openssl/src/openssl.pas --- Recording mergeinfo for merge of r42114 into '.': G . --- Merging r42122 into '.': U packages/fcl-base/examples/README.txt A packages/fcl-base/examples/testappexit.pp --- Recording mergeinfo for merge of r42122 into '.': G . --- Merging r42123 into '.': G packages/fcl-base/examples/README.txt A packages/fcl-base/examples/demoio.pp --- Recording mergeinfo for merge of r42123 into '.': G . # revisions: 42086,42113,42114,42122,42123 git-svn-id: branches/fixes_3_2@42160 -	2019-06-02 10:18:01 +00:00
pierre	12c54a62e7	Update all Makefile's to enable x86_64-haiku target ... git-svn-id: branches/fixes_3_2@42135 -	2019-05-28 22:07:11 +00:00
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 -	2019-05-28 21:50:18 +00:00
marco	8fa5c6e445	--- Merging r41612 into '.': ... U packages/sqlite/tests/testapiv3x.pp --- Recording mergeinfo for merge of r41612 into '.': U . # revisions: 41612 r41612 | michael | 2019-03-06 08:27:28 +0100 (Wed, 06 Mar 2019) | 1 line Changed paths: M /trunk/packages/sqlite/tests/testapiv3x.pp * Fix bug #35194 git-svn-id: branches/fixes_3_2@42099 -	2019-05-19 08:42:36 +00:00
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 -	2019-05-05 16:05:49 +00:00
marco	e0314439fa	# revisions: 41432,41655,41801,41939 ... git-svn-id: branches/fixes_3_2@42000 -	2019-05-05 15:46:15 +00:00
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 -	2019-05-05 15:31:55 +00:00
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 -	2019-05-05 15:27:59 +00:00
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 -	2019-05-05 15:25:38 +00:00
marco	250874bfbe	# revisions: 40926 ... git-svn-id: branches/fixes_3_2@41995 -	2019-05-05 14:47:22 +00:00
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 -	2019-05-05 14:40:51 +00:00
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 -	2019-05-05 14:36:34 +00:00
marco	046150ddeb	--- Merging r41646 into '.': ... U packages/opengl/src/gl.pp U packages/opengl/src/glu.pp U packages/opengl/src/glut.pp --- Recording mergeinfo for merge of r41646 into '.': U . --- Merging r41647 into '.': G packages/opengl/src/gl.pp G packages/opengl/src/glu.pp G packages/opengl/src/glut.pp --- Recording mergeinfo for merge of r41647 into '.': G . --- Merging r41675 into '.': U compiler/systems/i_bsd.pas --- Recording mergeinfo for merge of r41675 into '.': G . --- Merging r41695 into '.': A rtl/openbsd/si_impl.inc U rtl/openbsd/si_intf.inc U rtl/openbsd/si_prc.pp U rtl/openbsd/x86_64/si_prc.inc --- Recording mergeinfo for merge of r41695 into '.': G . --- Merging r41696 into '.': U compiler/systems/t_bsd.pas --- Recording mergeinfo for merge of r41696 into '.': G . --- Merging r41697 into '.': G compiler/systems/t_bsd.pas --- Recording mergeinfo for merge of r41697 into '.': G . --- Merging r41698 into '.': G compiler/systems/t_bsd.pas --- Recording mergeinfo for merge of r41698 into '.': G . --- Merging r41699 into '.': G compiler/systems/t_bsd.pas --- Recording mergeinfo for merge of r41699 into '.': G . --- Merging r41700 into '.': G compiler/systems/t_bsd.pas --- Recording mergeinfo for merge of r41700 into '.': G . --- Merging r41701 into '.': U rtl/openbsd/si_impl.inc G rtl/openbsd/si_intf.inc G rtl/openbsd/x86_64/si_prc.inc --- Recording mergeinfo for merge of r41701 into '.': G . # revisions: 41646,41647,41675,41695,41696,41697,41698,41699,41700,41701 git-svn-id: branches/fixes_3_2@41985 -	2019-05-04 21:36:49 +00:00
marco	c9a68fbdba	--- Merging r41941 into '.': ... U packages/morphunits/src/amigados.pas U packages/morphunits/src/exec.pas --- Recording mergeinfo for merge of r41941 into '.': U . --- Merging r41942 into '.': U packages/arosunits/src/amigados.pas --- Recording mergeinfo for merge of r41942 into '.': G . --- Merging r41944 into '.': U packages/arosunits/src/agraphics.pas --- Recording mergeinfo for merge of r41944 into '.': G . --- Merging r41945 into '.': U packages/morphunits/src/agraphics.pas --- Recording mergeinfo for merge of r41945 into '.': G . --- Merging r41947 into '.': U packages/arosunits/src/intuition.pas --- Recording mergeinfo for merge of r41947 into '.': G . --- Merging r41948 into '.': U packages/morphunits/src/intuition.pas --- Recording mergeinfo for merge of r41948 into '.': G . --- Merging r41953 into '.': U packages/morphunits/src/utility.pas --- Recording mergeinfo for merge of r41953 into '.': G . --- Merging r41955 into '.': U packages/amunits/src/coreunits/agraphics.pas U packages/amunits/src/coreunits/clipboard.pas U packages/amunits/src/coreunits/intuition.pas --- Recording mergeinfo for merge of r41955 into '.': G . --- Merging r41956 into '.': U packages/arosunits/src/datatypes.pas U packages/arosunits/src/locale.pas U packages/arosunits/src/serial.pas U packages/arosunits/src/workbench.pas --- Recording mergeinfo for merge of r41956 into '.': G . --- Merging r41957 into '.': U packages/morphunits/src/datatypes.pas --- Recording mergeinfo for merge of r41957 into '.': G . # revisions: 41941,41942,41944,41945,41947,41948,41953,41955,41956,41957 git-svn-id: branches/fixes_3_2@41984 -	2019-05-04 15:51:54 +00:00
michael	def5c7feab	* Merging revisions 41662 from trunk: ... ------------------------------------------------------------------------ r41662 | michael | 2019-03-09 20:46:46 +0100 (Sat, 09 Mar 2019) | 1 line * Expose TDOMWriter and TXMLWriter ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@41950 -	2019-04-28 08:36:49 +00:00
marco	d48846231c	--- Merging r40644 into '.': ... U packages/fcl-db/src/json/extjsdataset.pp U packages/fcl-db/src/json/fpjsondataset.pp --- Recording mergeinfo for merge of r40644 into '.': U . --- Merging r41656 into '.': U packages/fcl-db/src/base/xmldatapacketreader.pp --- Recording mergeinfo for merge of r41656 into '.': G . --- Merging r41796 into '.': U packages/fcl-db/src/base/dsparams.inc --- Recording mergeinfo for merge of r41796 into '.': G . # revisions: 40644,41656,41796 r40644 | michael | 2018-12-25 17:29:19 +0100 (Tue, 25 Dec 2018) | 1 line Changed paths: M /trunk/packages/fcl-db/src/json/extjsdataset.pp M /trunk/packages/fcl-db/src/json/fpjsondataset.pp * Implement locate and lookup r41656 | michael | 2019-03-09 18:34:49 +0100 (Sat, 09 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-db/src/base/xmldatapacketreader.pp * Small compatibility fix for width r41796 | marcus | 2019-03-26 16:47:08 +0100 (Tue, 26 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-db/src/base/dsparams.inc Fixed compilation after r41795 git-svn-id: branches/fixes_3_2@41935 -	2019-04-25 13:12:31 +00:00
marco	e41ddf221c	--- Merging r41271 into '.': ... U packages/fpmake_add.inc U packages/fpmake_proc.inc A packages/libmagic A packages/libmagic/Makefile A packages/libmagic/Makefile.fpc A packages/libmagic/examples A packages/libmagic/examples/basic.pp A packages/libmagic/fpmake.pp A packages/libmagic/src A packages/libmagic/src/libmagic.pp --- Recording mergeinfo for merge of r41271 into '.': U . --- Merging r41330 into '.': U rtl/objpas/sysutils/syssr.inc U rtl/objpas/sysutils/sysstr.inc U rtl/objpas/sysutils/sysstrh.inc U rtl/objpas/sysutils/sysuni.inc U rtl/objpas/sysutils/sysunih.inc U rtl/objpas/sysutils/syswide.inc U rtl/objpas/sysutils/syswideh.inc --- Recording mergeinfo for merge of r41330 into '.': G . --- Merging r41336 into '.': G rtl/objpas/sysutils/sysstr.inc G rtl/objpas/sysutils/sysstrh.inc U rtl/win/sysutils.pp --- Recording mergeinfo for merge of r41336 into '.': G . --- Merging r41337 into '.': G rtl/win/sysutils.pp --- Recording mergeinfo for merge of r41337 into '.': G . --- Merging r41342 into '.': U rtl/objpas/objpas.pp --- Recording mergeinfo for merge of r41342 into '.': G . --- Merging r41343 into '.': U packages/rtl-objpas/src/inc/strutils.pp --- Recording mergeinfo for merge of r41343 into '.': G . --- Recording mergeinfo for merge of r41400 into '.': G . --- Merging r41547 into '.': U rtl/objpas/sysutils/sysencodingh.inc --- Recording mergeinfo for merge of r41547 into '.': G . # revisions: 41271,41330,41336,41337,41342,41343,41400,41547 r41271 | michael | 2019-02-09 20:57:11 +0100 (Sat, 09 Feb 2019) | 1 line Changed paths: M /trunk/packages/fpmake_add.inc M /trunk/packages/fpmake_proc.inc A /trunk/packages/libmagic A /trunk/packages/libmagic/Makefile A /trunk/packages/libmagic/Makefile.fpc A /trunk/packages/libmagic/examples A /trunk/packages/libmagic/examples/basic.pp A /trunk/packages/libmagic/fpmake.pp A /trunk/packages/libmagic/src A /trunk/packages/libmagic/src/libmagic.pp * libmagic headers by Silvio Clecio r41330 | michael | 2019-02-16 08:55:26 +0100 (Sat, 16 Feb 2019) | 1 line Changed paths: M /trunk/rtl/objpas/sysutils/syssr.inc M /trunk/rtl/objpas/sysutils/sysstr.inc M /trunk/rtl/objpas/sysutils/sysstrh.inc M /trunk/rtl/objpas/sysutils/sysuni.inc M /trunk/rtl/objpas/sysutils/sysunih.inc M /trunk/rtl/objpas/sysutils/syswide.inc M /trunk/rtl/objpas/sysutils/syswideh.inc * Add overloaded version of stringreplace with replacement count (ID 23987) r41336 | michael | 2019-02-16 11:50:31 +0100 (Sat, 16 Feb 2019) | 1 line Changed paths: M /trunk/rtl/objpas/sysutils/sysstr.inc M /trunk/rtl/objpas/sysutils/sysstrh.inc M /trunk/rtl/win/sysutils.pp * Complete the implementation of IsLeadChar r41337 | michael | 2019-02-16 11:52:51 +0100 (Sat, 16 Feb 2019) | 1 line Changed paths: M /trunk/rtl/win/sysutils.pp * Actually call InitLeadBytes r41342 | michael | 2019-02-16 13:52:00 +0100 (Sat, 16 Feb 2019) | 1 line Changed paths: M /trunk/rtl/objpas/objpas.pp * Add overloaded version of AssignFile with codepage. See bug ID #34889 r41343 | michael | 2019-02-16 15:52:17 +0100 (Sat, 16 Feb 2019) | 1 line Changed paths: M /trunk/packages/rtl-objpas/src/inc/strutils.pp * Fix bug ID #35098 (count param) r41400 | yury | 2019-02-20 16:11:45 +0100 (Wed, 20 Feb 2019) | 1 line Changed paths: M /trunk/rtl/android/sysandroid.inc M /trunk/rtl/linux/system.pp * android: Fixed stdio redirection for threads. r41547 | michael | 2019-03-02 11:42:19 +0100 (Sat, 02 Mar 2019) | 1 line Changed paths: M /trunk/rtl/objpas/sysutils/sysencodingh.inc * Make FreeEncodings protected: they cannot be public, as it causes AVs (see bug ID #34856) git-svn-id: branches/fixes_3_2@41933 -	2019-04-25 12:40:02 +00:00
marco	d0b2f3852a	--- Merging r41648 into '.': ... U packages/paszlib/src/ziputils.pas --- Recording mergeinfo for merge of r41648 into '.': U . --- Merging r41803 into '.': U rtl/objpas/sysutils/fmtflt.inc --- Recording mergeinfo for merge of r41803 into '.': G . --- Merging r41807 into '.': U packages/paszlib/src/zipper.pp --- Recording mergeinfo for merge of r41807 into '.': G . --- Merging r41818 into '.': U rtl/objpas/classes/cregist.inc --- Recording mergeinfo for merge of r41818 into '.': G . # revisions: 41648,41803,41807,41818 r41648 | michael | 2019-03-09 15:58:53 +0100 (Sat, 09 Mar 2019) | 1 line Changed paths: M /trunk/packages/paszlib/src/ziputils.pas * Fix bug #35211, open mode when unzipping r41803 | michael | 2019-03-30 16:47:50 +0100 (Sat, 30 Mar 2019) | 1 line Changed paths: M /trunk/rtl/objpas/sysutils/fmtflt.inc * Fix formatfloat in case E not followed by +/- (bug id 35297) r41807 | michael | 2019-03-31 18:22:10 +0200 (Sun, 31 Mar 2019) | 1 line Changed paths: M /trunk/packages/paszlib/src/zipper.pp * Fix bug ID #35269, patch from Bart Broersma r41818 | michael | 2019-04-01 19:25:29 +0200 (Mon, 01 Apr 2019) | 1 line Changed paths: M /trunk/rtl/objpas/classes/cregist.inc * Patch from Ondrej Pokorny to make RegisterClassAlias thread-safe git-svn-id: branches/fixes_3_2@41927 -	2019-04-23 12:37:25 +00:00
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 -	2019-04-22 11:51:36 +00:00
marco	204fac0c20	--- Merging r41551 into '.': ... A packages/fcl-pdf/examples/diamond.png U packages/fcl-pdf/examples/testfppdf.lpr U packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r41551 into '.': G . --- Merging r41552 into '.': U packages/fcl-pdf/examples/testfppdf.lpi G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r41552 into '.': G . --- Merging r41553 into '.': U packages/fcl-pdf/src/fpttf.pp --- Recording mergeinfo for merge of r41553 into '.': G . --- Merging r41591 into '.': G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r41591 into '.': G . --- Merging r41592 into '.': G packages/fcl-pdf/src/fpttf.pp --- Recording mergeinfo for merge of r41592 into '.': G . --- Merging r41798 into '.': G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r41798 into '.': G . --- Merging r41799 into '.': G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r41799 into '.': G . --- Merging r41800 into '.': U packages/fcl-pdf/utils/ttfdump.lpr --- Recording mergeinfo for merge of r41800 into '.': G . # revisions: 41551,41552,41553,41591,41592,41798,41799,41800 r41551 | michael | 2019-03-02 13:21:28 +0100 (Sat, 02 Mar 2019) | 1 line Changed paths: A /trunk/packages/fcl-pdf/examples/diamond.png M /trunk/packages/fcl-pdf/examples/testfppdf.lpr M /trunk/packages/fcl-pdf/src/fppdf.pp * Patch from Ondrej Pokorny to add transparency r41552 | michael | 2019-03-02 13:31:18 +0100 (Sat, 02 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-pdf/examples/testfppdf.lpi M /trunk/packages/fcl-pdf/src/fppdf.pp * Small change in API, use set instead of 2 booleans r41553 | michael | 2019-03-02 15:05:23 +0100 (Sat, 02 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-pdf/src/fpttf.pp * Add (Get|Find)PostScriptFontName r41591 | michael | 2019-03-05 12:23:56 +0100 (Tue, 05 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-pdf/src/fppdf.pp * Fix AV r41592 | michael | 2019-03-05 12:24:23 +0100 (Tue, 05 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-pdf/src/fpttf.pp * Fixed typo r41798 | michael | 2019-03-26 22:31:46 +0100 (Tue, 26 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-pdf/src/fppdf.pp * Fix bug ID #0035252, eliminate wrong combination of options r41799 | michael | 2019-03-26 22:35:15 +0100 (Tue, 26 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-pdf/src/fppdf.pp * Fix range check error (bug ID 35251) r41800 | michael | 2019-03-26 22:36:01 +0100 (Tue, 26 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-pdf/utils/ttfdump.lpr * Fix range check error (bug ID 35251) git-svn-id: branches/fixes_3_2@41916 -	2019-04-20 21:06:37 +00:00
marco	bcb47e7c64	--- Merging r40995 into '.': ... U packages/fcl-image/src/fpreadgif.pas --- Recording mergeinfo for merge of r40995 into '.': U . --- Merging r41341 into '.': A packages/fcl-image/examples/DejaVuLGCSans.ttf A packages/fcl-image/examples/edit-clear.png A packages/fcl-image/examples/fpcanvasalphadraw.pp U packages/fcl-image/src/ellipses.pp U packages/fcl-image/src/fpcanvas.inc U packages/fcl-image/src/fpcanvas.pp U packages/fcl-image/src/fpinterpolation.inc U packages/fcl-image/src/ftfont.pp U packages/fcl-image/src/pixtools.pp --- Recording mergeinfo for merge of r41341 into '.': G . --- Merging r41409 into '.': G packages/fcl-image/src/fpreadgif.pas --- Recording mergeinfo for merge of r41409 into '.': G . --- Merging r41410 into '.': U packages/fcl-image/examples/imgconv.pp --- Recording mergeinfo for merge of r41410 into '.': G . --- Merging r41411 into '.': G packages/fcl-image/examples/imgconv.pp --- Recording mergeinfo for merge of r41411 into '.': G . --- Merging r41546 into '.': U packages/fcl-image/src/clipping.pp --- Recording mergeinfo for merge of r41546 into '.': G . --- Merging r41550 into '.': G packages/fcl-image/src/ellipses.pp U packages/fcl-image/src/fpcolcnv.inc U packages/fcl-image/src/fpimage.pp U packages/fcl-image/src/fpwritexpm.pp G packages/fcl-image/src/ftfont.pp --- Recording mergeinfo for merge of r41550 into '.': G . --- Merging r41802 into '.': G packages/fcl-image/examples/imgconv.pp --- Recording mergeinfo for merge of r41802 into '.': G . # revisions: 40995,41341,41409,41410,41411,41546,41550,41802 r40995 | marco | 2019-01-22 16:11:04 +0100 (Tue, 22 Jan 2019) | 3 lines Changed paths: M /trunk/packages/fcl-image/src/fpreadgif.pas * don't hangt on corrupt gifs, exit loops at end of streams. Fixes mantis #34919 r41341 | michael | 2019-02-16 13:43:14 +0100 (Sat, 16 Feb 2019) | 1 line Changed paths: A /trunk/packages/fcl-image/examples/DejaVuLGCSans.ttf A /trunk/packages/fcl-image/examples/edit-clear.png A /trunk/packages/fcl-image/examples/fpcanvasalphadraw.pp M /trunk/packages/fcl-image/src/ellipses.pp M /trunk/packages/fcl-image/src/fpcanvas.inc M /trunk/packages/fcl-image/src/fpcanvas.pp M /trunk/packages/fcl-image/src/fpinterpolation.inc M /trunk/packages/fcl-image/src/ftfont.pp M /trunk/packages/fcl-image/src/pixtools.pp * Patch from Ondrej Pokorny, to demonstrate alpha blending mode r41409 | michael | 2019-02-22 09:03:39 +0100 (Fri, 22 Feb 2019) | 1 line Changed paths: M /trunk/packages/fcl-image/src/fpreadgif.pas * Patch from Anton Kavalenka to fix gif reading (bug ID 35134) r41410 | michael | 2019-02-22 09:05:24 +0100 (Fri, 22 Feb 2019) | 1 line Changed paths: M /trunk/packages/fcl-image/examples/imgconv.pp * Support reading gifs r41411 | michael | 2019-02-22 09:07:21 +0100 (Fri, 22 Feb 2019) | 1 line Changed paths: M /trunk/packages/fcl-image/examples/imgconv.pp * Add gif to help message r41546 | michael | 2019-03-02 11:29:44 +0100 (Sat, 02 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-image/src/clipping.pp * Fix bug #35127 in CheckRectClipping, patch from Ondrej Pokorny r41550 | michael | 2019-03-02 13:13:31 +0100 (Sat, 02 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-image/src/ellipses.pp M /trunk/packages/fcl-image/src/fpcolcnv.inc M /trunk/packages/fcl-image/src/fpimage.pp M /trunk/packages/fcl-image/src/fpwritexpm.pp M /trunk/packages/fcl-image/src/ftfont.pp * optimization by Ondrej Pokorny, add const in front of TFPColor arguments where possible (bug ID 35131) r41802 | michael | 2019-03-26 23:24:49 +0100 (Tue, 26 Mar 2019) | 1 line Changed paths: M /trunk/packages/fcl-image/examples/imgconv.pp * Enhance example to allow specify grayscale for tiff git-svn-id: branches/fixes_3_2@41915 -	2019-04-20 20:24:17 +00:00
marco	3de6dfa4fb	* some IDE fixes merged ... * gnutls with associated fcl-net revisions merged. git-svn-id: branches/fixes_3_2@41900 -	2019-04-19 14:26:20 +00:00
marco	427d60db4d	--- Merging r39993 into '.': ... A packages/regexpr/tests/testregexpr.pp A packages/regexpr/tests/tcregexp.pp A packages/regexpr/tests/testregexpr.lpi U packages/regexpr/src/regexpr.pas --- Recording mergeinfo for merge of r39993 into '.': U . --- Merging r40056 into '.': G packages/regexpr/src/regexpr.pas --- Recording mergeinfo for merge of r40056 into '.': G . # revisions: 39993,40056 r39993 | michael | 2018-10-20 14:09:07 +0200 (Sat, 20 Oct 2018) | 1 line Changed paths: M /trunk/packages/regexpr/src/regexpr.pas A /trunk/packages/regexpr/tests/tcregexp.pp A /trunk/packages/regexpr/tests/testregexpr.lpi A /trunk/packages/regexpr/tests/testregexpr.pp * Fix bug #0034429, replace now can use escape sequences, and lineending can be set r40056 | michael | 2018-10-27 17:08:00 +0200 (Sat, 27 Oct 2018) | 1 line Changed paths: M /trunk/packages/regexpr/src/regexpr.pas * Introduce overloaded version of ReplaceRegexpr which allows to set more options (see bug ID #34429). git-svn-id: branches/fixes_3_2@41899 -	2019-04-19 13:47:39 +00:00
marco	15b84360ab	--- Merging r40804 into '.': ... U packages/ide/fpmwnd.inc U packages/ide/fpide.pas --- Recording mergeinfo for merge of r40804 into '.': U . --- Merging r40811 into '.': U packages/fv/src/editors.pas U packages/fv/src/statuses.pas U packages/fv/src/validate.pas --- Recording mergeinfo for merge of r40811 into '.': G . # revisions: 40804,40811 r40804 | michael | 2019-01-08 05:15:38 +0100 (Tue, 08 Jan 2019) | 1 line Changed paths: M /trunk/packages/ide/fpide.pas M /trunk/packages/ide/fpmwnd.inc * Apply patch from Margers to fix bug ID #6496 r40811 | marco | 2019-01-09 11:18:36 +0100 (Wed, 09 Jan 2019) | 1 line Changed paths: M /trunk/packages/fv/src/editors.pas M /trunk/packages/fv/src/statuses.pas M /trunk/packages/fv/src/validate.pas * patch from Margers that fixes parameter arrays formatstr, mantis 34839 git-svn-id: branches/fixes_3_2@41895 -	2019-04-18 12:51:40 +00:00
pierre	aa33dfcdcc	Merge of commits 41767 and 41768 into fixes branch: ... ------------------------------------------------------------------------ r41767 | pierre | 2019-03-22 14:26:39 +0000 (Fri, 22 Mar 2019) | 1 line Fix tkBool in class method TValue.Make ------------------------------------------------------------------------ r41768 | pierre | 2019-03-22 14:27:41 +0000 (Fri, 22 Mar 2019) | 1 line Explicitly set values inside TestDataSize procedure to avoid range check errors as values are copied when TValue.Make is called ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@41873 -	2019-04-15 10:03:37 +00:00
marco	5c0a5db4bd	--- Merging r41640 into '.': ... U rtl/bsd/ostypes.inc --- Recording mergeinfo for merge of r41640 into '.': U . --- Merging r41642 into '.': G rtl/bsd/ostypes.inc --- Recording mergeinfo for merge of r41642 into '.': G . --- Merging r41643 into '.': G rtl/bsd/ostypes.inc --- Recording mergeinfo for merge of r41643 into '.': G . --- Merging r41645 into '.': U rtl/openbsd/i386/prt0.as U rtl/openbsd/i386/cprt0.as U rtl/openbsd/x86_64/gprt0.as U rtl/openbsd/x86_64/prt0.as U rtl/openbsd/x86_64/cprt0.as --- Recording mergeinfo for merge of r41645 into '.': G . --- Merging r41649 into '.': G rtl/openbsd/i386/prt0.as G rtl/openbsd/i386/cprt0.as G rtl/openbsd/x86_64/prt0.as G rtl/openbsd/x86_64/cprt0.as --- Recording mergeinfo for merge of r41649 into '.': G . --- Merging r41653 into '.': U rtl/openbsd/x86_64/prt0.as --- Recording mergeinfo for merge of r41653 into '.': G . --- Merging r41654 into '.': G rtl/openbsd/x86_64/prt0.as --- Recording mergeinfo for merge of r41654 into '.': G . --- Merging r41659 into '.': G rtl/openbsd/x86_64/prt0.as --- Recording mergeinfo for merge of r41659 into '.': G . --- Merging r41660 into '.': G rtl/openbsd/x86_64/prt0.as --- Recording mergeinfo for merge of r41660 into '.': G . --- Merging r41669 into '.': U rtl/openbsd/x86_64/cprt0.as --- Recording mergeinfo for merge of r41669 into '.': G . --- Merging r41670 into '.': G rtl/openbsd/x86_64/cprt0.as --- Recording mergeinfo for merge of r41670 into '.': G . --- Merging r41671 into '.': G rtl/openbsd/x86_64/cprt0.as --- Recording mergeinfo for merge of r41671 into '.': G . --- Merging r41672 into '.': U tests/test/cg/obj/openbsd/x86_64/cpptcl2.o U tests/test/cg/obj/openbsd/x86_64/tcext3.o U tests/test/cg/obj/openbsd/x86_64/tcext4.o U tests/test/cg/obj/openbsd/x86_64/tcext5.o U tests/test/cg/obj/openbsd/x86_64/tcext6.o U tests/test/cg/obj/openbsd/x86_64/ctest.o U tests/test/cg/obj/openbsd/x86_64/cpptcl1.o --- Recording mergeinfo for merge of r41672 into '.': G . --- Merging r41677 into '.': U rtl/openbsd/termios.inc --- Recording mergeinfo for merge of r41677 into '.': G . --- Merging r41678 into '.': U packages/rtl-console/src/unix/keyboard.pp --- Recording mergeinfo for merge of r41678 into '.': G . --- Merging r41682 into '.': U rtl/openbsd/i386/prt0.as --- Recording mergeinfo for merge of r41682 into '.': G . --- Merging r41683 into '.': G rtl/openbsd/i386/prt0.as --- Recording mergeinfo for merge of r41683 into '.': G . --- Merging r41685 into '.': G rtl/openbsd/i386/prt0.as --- Recording mergeinfo for merge of r41685 into '.': G . --- Merging r41686 into '.': G rtl/openbsd/i386/cprt0.as --- Recording mergeinfo for merge of r41686 into '.': G . --- Merging r41687 into '.': G rtl/openbsd/i386/cprt0.as --- Recording mergeinfo for merge of r41687 into '.': G . --- Merging r41688 into '.': U tests/test/cg/obj/openbsd/i386/tcext3.o U tests/test/cg/obj/openbsd/i386/tcext4.o U tests/test/cg/obj/openbsd/i386/tcext5.o U tests/test/cg/obj/openbsd/i386/tcext6.o U tests/test/cg/obj/openbsd/i386/ctest.o U tests/test/cg/obj/openbsd/i386/cpptcl1.o U tests/test/cg/obj/openbsd/i386/cpptcl2.o --- Recording mergeinfo for merge of r41688 into '.': G . --- Merging r41692 into '.': A rtl/openbsd/si_dll.pp A rtl/openbsd/i386/si_c.inc A rtl/openbsd/i386/si_prc.inc A rtl/openbsd/i386/si_dll.inc A rtl/openbsd/si_c.pp A rtl/openbsd/si_prc.pp A rtl/openbsd/x86_64/si_c.inc A rtl/openbsd/x86_64/si_prc.inc A rtl/openbsd/x86_64/si_dll.inc A rtl/openbsd/si_intf.inc --- Recording mergeinfo for merge of r41692 into '.': G . # revisions: 41640,41642,41643,41645,41649,41653,41654,41659,41660,41669,41670,41671,41672,41677,41678,41682,41683,41685,41686,41687,41688,41692 r41640 | nickysn | 2019-03-08 17:14:40 +0100 (Fri, 08 Mar 2019) | 2 lines Changed paths: M /trunk/rtl/bsd/ostypes.inc * Adjust for OpenBSD struct changes in the 'stat' structure. Based on OpenBSD ports patch patch-fpcsrc_rtl_bsd_ostypes_inc r41642 | nickysn | 2019-03-08 17:22:53 +0100 (Fri, 08 Mar 2019) | 2 lines Changed paths: M /trunk/rtl/bsd/ostypes.inc * Adjust for OpenBSD struct changes in the 'dirent' structure. Based on OpenBSD ports patch patch-fpcsrc_rtl_bsd_ostypes_inc r41643 | nickysn | 2019-03-08 17:26:40 +0100 (Fri, 08 Mar 2019) | 2 lines Changed paths: M /trunk/rtl/bsd/ostypes.inc * Adjust for OpenBSD struct changes in the 'dir' structure. Based on OpenBSD ports patch patch-fpcsrc_rtl_bsd_ostypes_inc r41645 | nickysn | 2019-03-09 15:33:25 +0100 (Sat, 09 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/i386/cprt0.as M /trunk/rtl/openbsd/i386/prt0.as M /trunk/rtl/openbsd/x86_64/cprt0.as M /trunk/rtl/openbsd/x86_64/gprt0.as M /trunk/rtl/openbsd/x86_64/prt0.as * applied all the OpenBSD startup code patches from the OpenBSD ports tree r41649 | nickysn | 2019-03-09 16:40:34 +0100 (Sat, 09 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/i386/cprt0.as M /trunk/rtl/openbsd/i386/prt0.as M /trunk/rtl/openbsd/x86_64/cprt0.as M /trunk/rtl/openbsd/x86_64/prt0.as - removed duplicated ".note.openbsd.ident" sections, committed erroneously in r41645 r41653 | nickysn | 2019-03-09 17:54:39 +0100 (Sat, 09 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/x86_64/prt0.as * PIC fixes in OpenBSD's prt0.as for x86_64 r41654 | nickysn | 2019-03-09 17:58:25 +0100 (Sat, 09 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/x86_64/prt0.as * fixed bug, due to a typo in the previous commit r41659 | nickysn | 2019-03-09 18:48:28 +0100 (Sat, 09 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/x86_64/prt0.as * use PIC in the eh_frame section as well r41660 | nickysn | 2019-03-09 19:30:31 +0100 (Sat, 09 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/x86_64/prt0.as * changed the type of the .eh_frame section to 'unwind' r41669 | nickysn | 2019-03-10 17:08:46 +0100 (Sun, 10 Mar 2019) | 4 lines Changed paths: M /trunk/rtl/openbsd/x86_64/cprt0.as * some PIC fixes in OpenBSD x86_64 cprt0.as * use the correct section type for .eh_frame r41670 | nickysn | 2019-03-10 17:20:33 +0100 (Sun, 10 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/x86_64/cprt0.as * more PIC fixes in OpenBSD's x86_64 cprt0.as r41671 | nickysn | 2019-03-10 17:53:47 +0100 (Sun, 10 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/x86_64/cprt0.as * more PIC fixes in OpenBSD's x86_64 cprt0.as r41672 | nickysn | 2019-03-10 18:38:07 +0100 (Sun, 10 Mar 2019) | 5 lines Changed paths: M /trunk/tests/test/cg/obj/openbsd/x86_64/cpptcl1.o M /trunk/tests/test/cg/obj/openbsd/x86_64/cpptcl2.o M /trunk/tests/test/cg/obj/openbsd/x86_64/ctest.o M /trunk/tests/test/cg/obj/openbsd/x86_64/tcext3.o M /trunk/tests/test/cg/obj/openbsd/x86_64/tcext4.o M /trunk/tests/test/cg/obj/openbsd/x86_64/tcext5.o M /trunk/tests/test/cg/obj/openbsd/x86_64/tcext6.o * recompiled the OpenBSD x86_64 C and C++ .o test files; GCC version is the same (so, no need to update readme.txt), but OpenBSD's default compile settings have changed (PIC is enabled by default) r41677 | nickysn | 2019-03-11 17:53:00 +0100 (Mon, 11 Mar 2019) | 1 line Changed paths: M /trunk/rtl/openbsd/termios.inc * OpenBSD termios interface updates r41678 | nickysn | 2019-03-11 19:08:21 +0100 (Mon, 11 Mar 2019) | 4 lines Changed paths: M /trunk/packages/rtl-console/src/unix/keyboard.pp * use stdin instead of stdout to switch the console to raw mode; this fixes keyboard input in OpenBSD r41682 | nickysn | 2019-03-12 02:33:06 +0100 (Tue, 12 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/i386/prt0.as * partial PIC conversion of the i386 OpenBSD startup code r41683 | nickysn | 2019-03-12 02:58:11 +0100 (Tue, 12 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/i386/prt0.as * more PIC fixes in the i386 OpenBSD startup code r41685 | nickysn | 2019-03-12 14:55:54 +0100 (Tue, 12 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/i386/prt0.as * more PIC fixes in i386 OpenBSD's startup code. prt0.as is now completely PIC r41686 | nickysn | 2019-03-12 15:56:27 +0100 (Tue, 12 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/i386/cprt0.as * PIC fixes in cprt0 for i386-openbsd r41687 | nickysn | 2019-03-12 17:00:12 +0100 (Tue, 12 Mar 2019) | 3 lines Changed paths: M /trunk/rtl/openbsd/i386/cprt0.as * yet another PIC fix in cprt0 for i386-openbsd r41688 | nickysn | 2019-03-12 17:04:57 +0100 (Tue, 12 Mar 2019) | 3 lines Changed paths: M /trunk/tests/test/cg/obj/openbsd/i386/cpptcl1.o M /trunk/tests/test/cg/obj/openbsd/i386/cpptcl2.o M /trunk/tests/test/cg/obj/openbsd/i386/ctest.o M /trunk/tests/test/cg/obj/openbsd/i386/tcext3.o M /trunk/tests/test/cg/obj/openbsd/i386/tcext4.o M /trunk/tests/test/cg/obj/openbsd/i386/tcext5.o M /trunk/tests/test/cg/obj/openbsd/i386/tcext6.o * the i386-openbsd C and C++ test modules recompiled with -fPIC r41692 | nickysn | 2019-03-13 16:59:36 +0100 (Wed, 13 Mar 2019) | 3 lines Changed paths: A /trunk/rtl/openbsd/i386/si_c.inc A /trunk/rtl/openbsd/i386/si_dll.inc A /trunk/rtl/openbsd/i386/si_prc.inc A /trunk/rtl/openbsd/si_c.pp A /trunk/rtl/openbsd/si_dll.pp A /trunk/rtl/openbsd/si_intf.inc A /trunk/rtl/openbsd/si_prc.pp A /trunk/rtl/openbsd/x86_64/si_c.inc A /trunk/rtl/openbsd/x86_64/si_dll.inc A /trunk/rtl/openbsd/x86_64/si_prc.inc + initial (only a stub for now) implementation of pascal-based startup code units for OpenBSD git-svn-id: branches/fixes_3_2@41782 -	2019-03-23 14:41:24 +00:00
marco	b99879b91b	--- Merging r41747 into '.': ... U packages/os4units/src/asl.pas U packages/arosunits/src/asl.pas --- Recording mergeinfo for merge of r41747 into '.': U . # revisions: 41747 r41747 | marcus | 2019-03-19 21:48:43 +0100 (Tue, 19 Mar 2019) | 1 line Changed paths: M /trunk/packages/arosunits/src/asl.pas M /trunk/packages/os4units/src/asl.pas AROS, AmigaOS4: unified ASL unit for all amiga-likes git-svn-id: branches/fixes_3_2@41756 -	2019-03-21 08:58:04 +00:00
marco	a92567f056	--- Merging r40956 into '.': ... U packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40956 into '.': U . --- Merging r40957 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40957 into '.': G . --- Merging r40958 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40958 into '.': G . --- Merging r40959 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40959 into '.': G . --- Merging r40960 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40960 into '.': G . --- Merging r40961 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40961 into '.': G . --- Merging r40962 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40962 into '.': G . --- Merging r40964 into '.': U packages/graph/src/inc/fills.inc --- Recording mergeinfo for merge of r40964 into '.': G . --- Merging r40965 into '.': G packages/graph/src/inc/fills.inc --- Recording mergeinfo for merge of r40965 into '.': G . --- Merging r40966 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40966 into '.': G . --- Merging r40967 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40967 into '.': G . --- Merging r40968 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40968 into '.': G . --- Merging r40969 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40969 into '.': G . --- Merging r40970 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40970 into '.': G . --- Merging r40971 into '.': G packages/graph/src/inc/fills.inc --- Recording mergeinfo for merge of r40971 into '.': G . --- Merging r40972 into '.': G packages/graph/src/inc/fills.inc --- Recording mergeinfo for merge of r40972 into '.': G . --- Merging r40973 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40973 into '.': G . --- Merging r40974 into '.': G packages/graph/src/inc/fills.inc --- Recording mergeinfo for merge of r40974 into '.': G . --- Merging r40975 into '.': G packages/graph/src/inc/fills.inc --- Recording mergeinfo for merge of r40975 into '.': G . --- Merging r40976 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40976 into '.': G . --- Merging r40977 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40977 into '.': G . --- Merging r40978 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40978 into '.': G . --- Merging r40980 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40980 into '.': G . --- Merging r40981 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40981 into '.': G . --- Merging r40982 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40982 into '.': G . --- Merging r40983 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40983 into '.': G . --- Merging r40984 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40984 into '.': G . --- Merging r40985 into '.': U packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40985 into '.': G . --- Merging r40986 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40986 into '.': G . --- Merging r40987 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40987 into '.': G . --- Merging r40988 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40988 into '.': G . --- Merging r40989 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40989 into '.': G . --- Merging r40990 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40990 into '.': G . --- Merging r40991 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40991 into '.': G . --- Merging r40992 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40992 into '.': G . --- Merging r40993 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40993 into '.': G . --- Merging r40994 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40994 into '.': G . --- Merging r40996 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40996 into '.': G . --- Merging r40997 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40997 into '.': G . --- Merging r40998 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40998 into '.': G . --- Merging r40999 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40999 into '.': G . --- Merging r41000 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41000 into '.': G . --- Merging r41001 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41001 into '.': G . --- Merging r41002 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41002 into '.': G . --- Merging r41003 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41003 into '.': G . --- Merging r41004 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41004 into '.': G . --- Merging r41005 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41005 into '.': G . --- Merging r41006 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41006 into '.': G . --- Merging r41007 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41007 into '.': G . --- Merging r41009 into '.': U packages/graph/src/inc/graph.inc --- Recording mergeinfo for merge of r41009 into '.': G . --- Merging r41010 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41010 into '.': G . --- Merging r41011 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41011 into '.': G . --- Merging r41012 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41012 into '.': G . --- Merging r41013 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41013 into '.': G . --- Merging r41014 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41014 into '.': G . --- Merging r41015 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41015 into '.': G . --- Merging r41016 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41016 into '.': G . --- Merging r41017 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41017 into '.': G . --- Merging r41018 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41018 into '.': G . --- Merging r41019 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41019 into '.': G . --- Merging r41020 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41020 into '.': G . --- Merging r41028 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41028 into '.': G . --- Merging r41029 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41029 into '.': G . --- Merging r41030 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41030 into '.': G . --- Merging r41031 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41031 into '.': G . --- Merging r41032 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41032 into '.': G . --- Merging r41033 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41033 into '.': G . --- Merging r41034 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41034 into '.': G . --- Merging r41035 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41035 into '.': G . --- Merging r41036 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41036 into '.': G . --- Merging r41037 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41037 into '.': G . --- Merging r41038 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41038 into '.': G . --- Merging r41039 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41039 into '.': G . --- Merging r41040 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41040 into '.': G . --- Merging r41041 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41041 into '.': G . --- Merging r41042 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41042 into '.': G . --- Merging r41043 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41043 into '.': G . --- Merging r41044 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41044 into '.': G . --- Merging r41045 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41045 into '.': G . --- Merging r41048 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41048 into '.': G . --- Merging r41049 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41049 into '.': G . --- Merging r41050 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41050 into '.': G . --- Merging r41051 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41051 into '.': G . --- Merging r41052 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41052 into '.': G . --- Merging r41053 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41053 into '.': G . --- Merging r41054 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41054 into '.': G . --- Merging r41055 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41055 into '.': G . --- Merging r41056 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41056 into '.': G . --- Merging r41057 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r41057 into '.': G . --- Merging r41071 into '.': U packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41071 into '.': G . --- Merging r41072 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41072 into '.': G . --- Merging r41073 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41073 into '.': G . --- Merging r41097 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41097 into '.': G . --- Merging r41098 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41098 into '.': G . --- Merging r41099 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41099 into '.': G . --- Merging r41100 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41100 into '.': G . --- Merging r41101 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41101 into '.': G . --- Merging r41102 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41102 into '.': G . --- Merging r41103 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41103 into '.': G . --- Merging r41107 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41107 into '.': G . --- Merging r41108 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41108 into '.': G . --- Merging r41109 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41109 into '.': G . --- Merging r41110 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41110 into '.': G . --- Merging r41111 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41111 into '.': G . --- Merging r41112 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41112 into '.': G . --- Merging r41113 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41113 into '.': G . --- Merging r41114 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41114 into '.': G . --- Merging r41115 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41115 into '.': G . --- Merging r41116 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41116 into '.': G . --- Merging r41117 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41117 into '.': G . --- Merging r41118 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41118 into '.': G . --- Merging r41143 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41143 into '.': G . --- Merging r41146 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41146 into '.': G . --- Merging r41153 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r41153 into '.': G . # revisions: 40956,40957,40958,40959,40960,40961,40962,40964,40965,40966,40967,40968,40969,40970,40971,40972,40973,40974,40975,40976,40977,40978,40980,40981,40982,40983,40984,40985,40986,40987,40988,40989,40990,40991,40992,40993,40994,40996,40997,40998,40999,41000,41001,41002,41003,41004,41005,41006,41007,41009,41010,41011,41012,41013,41014,41015,41016,41017,41018,41019,41020,41028,41029,41030,41031,41032,41033,41034,41035,41036,41037,41038,41039,41040,41041,41042,41043,41044,41045,41048,41049,41050,41051,41052,41053,41054,41055,41056,41057,41071,41072,41073,41097,41098,41099,41100,41101,41102,41103,41107,41108,41109,41110,41111,41112,41113,41114,41115,41116,41117,41118,41143,41146,41153 r40956 | nickysn | 2019-01-21 14:40:41 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed commented out code from DirectPutPixel320 r40957 | nickysn | 2019-01-21 14:42:59 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * only load the low byte of CurrentColor in the asm version of DirectPutPixel320 r40958 | nickysn | 2019-01-21 14:51:40 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + implemented all the write modes in the asm version of DirectPutPixel320 r40959 | nickysn | 2019-01-21 14:52:08 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * 8086/8088 support in the asm version of DirectPutPixel320 r40960 | nickysn | 2019-01-21 15:09:25 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + enabled the asm version of DirectPutPixel320 r40961 | nickysn | 2019-01-21 15:10:41 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed comment saying that and/or/not put is not implemented, because it is implemented now r40962 | nickysn | 2019-01-21 15:12:17 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * ignore VideoOfs entirely in mode 13h, since it doesn't support video pages r40964 | nickysn | 2019-01-21 15:47:48 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/fills.inc * added check to ensure the memory allocation for DrawnList inside FloodFill hasn't returned nil r40965 | nickysn | 2019-01-21 15:50:26 +0100 (Mon, 21 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/inc/fills.inc * moved the check in FloodFill whether x,y are within the current viewport in the beginning, before any heap memory allocations, to avoid memory leaks when FloodFill is invoked with a point that is outside the current viewport r40966 | nickysn | 2019-01-21 16:16:16 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * fixed return of result in the asm version of GetPixel320 r40967 | nickysn | 2019-01-21 16:18:51 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use the si register instead of di in the asm version of GetPixel320 r40968 | nickysn | 2019-01-21 16:28:22 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use lodsb with a segment override prefix instead of mov in the asm version of GetPixel320 r40969 | nickysn | 2019-01-21 16:30:58 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use 'cwd' instead of 'xor dx, dx' in the asm version GetPixel320 r40970 | nickysn | 2019-01-21 16:43:31 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use 'cbw' and 'cwd' instead of 'xor reg, reg' in the asm version of GetPixel16 r40971 | nickysn | 2019-01-21 16:46:34 +0100 (Mon, 21 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/inc/fills.inc * moved the s1,s2,s3 scanline memory allocation in FloodFill before changing CurrentColor, so it doesn't get changed if the function exits prematurely due to out of memory r40972 | nickysn | 2019-01-21 17:08:38 +0100 (Mon, 21 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/inc/fills.inc * store the size of the s1,s2 and s3 buffers, used inside FloodFill in a variable, so memory allocation and disposal becomes easier, with less ifdefs r40973 | nickysn | 2019-01-21 17:09:13 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * read the planes in reverse order, so that less shift instructions are required in GetPixel16 r40974 | nickysn | 2019-01-21 17:22:11 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/fills.inc * unified the out of memory check in FloodFill and perform proper cleanup, so no memory leaks arise r40975 | nickysn | 2019-01-21 17:24:46 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/fills.inc * size of the DrawnList buffer moved to a local variable, to avoid repeated code and repeated calculations r40976 | nickysn | 2019-01-21 17:47:30 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * converted InitModeX to a pure asm routine r40977 | nickysn | 2019-01-21 18:43:57 +0100 (Mon, 21 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use 'cmp mem,const' to check DontClearGraphMemory, instead of first loading it into a register in InitModeX. This saves 1 byte of code from an initialization routine. Hurrah! :) r40978 | nickysn | 2019-01-21 19:06:07 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * another byte saved in the InitModeX routine :) r40980 | nickysn | 2019-01-21 23:50:50 +0100 (Mon, 21 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + added pascal version of InitModeX r40981 | nickysn | 2019-01-21 23:54:08 +0100 (Mon, 21 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge memory model fixes in InitModeX r40982 | nickysn | 2019-01-22 00:07:51 +0100 (Tue, 22 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * reenabled the asm version of InitModeX r40983 | nickysn | 2019-01-22 00:09:58 +0100 (Tue, 22 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * save another 2 bytes from the InitModeX code :) r40984 | nickysn | 2019-01-22 02:29:02 +0100 (Tue, 22 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * some optimizations in GetPixel16 r40985 | nickysn | 2019-01-22 10:07:37 +0100 (Tue, 22 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + enabled the true color support in ptcgraph r40986 | nickysn | 2019-01-22 13:58:02 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * some more optimizations in GetPixel16 r40987 | nickysn | 2019-01-22 15:27:48 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * replaced the slow mul instruction in GetPixel16 with faster shifts and adds r40988 | nickysn | 2019-01-22 15:28:46 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * moved the ES register initialization in GetPixel16 to the beginning of the function r40989 | nickysn | 2019-01-22 15:30:18 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * swapped di and ax in the beginning of GetPixel16 r40990 | nickysn | 2019-01-22 15:32:01 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * moved the initial GC port output to the beginning of GetPixel16 r40991 | nickysn | 2019-01-22 15:33:41 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use xchg ax,cx instead of mov in GetPixel16 r40992 | nickysn | 2019-01-22 15:34:47 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * replaced bl with al in the final bit read in GetPixel16 r40993 | nickysn | 2019-01-22 15:35:32 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * replaced 'mov al,es:[si]' with 'seges lodsb' in GetPixel16 r40994 | nickysn | 2019-01-22 15:49:18 +0100 (Tue, 22 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * swap AL and AH in the last 'or' instruction in GetPixel16, so the result is combined directly into AL and a 'mov al, ah' instruction is removed r40996 | nickysn | 2019-01-22 16:32:44 +0100 (Tue, 22 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * GetScanLine16 changed so that it reads video memory in 16-bit words, instead of 32-bit longints, because 16-bit generates more efficient code on the i8086 r40997 | nickysn | 2019-01-22 16:50:31 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * some minor optimizations in PutPixel16 (more efficient register usage, resulting in less mov instructions) r40998 | nickysn | 2019-01-22 17:04:08 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * optimizations in PutPixel16 that remove the slow 'mul' instruction r40999 | nickysn | 2019-01-22 17:05:29 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use stosb instead of mov for writing a byte (the value doesn't matter) into EGA/VGA memory in PutPixel16 r41000 | nickysn | 2019-01-22 17:07:51 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * yet another mov eliminated by using different registers in GetPixel16 r41001 | nickysn | 2019-01-22 17:10:37 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * moved the loading of the X and Y coordinates to registers in the front of the asm block in PutPixel16 r41002 | nickysn | 2019-01-22 17:11:41 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * perform the viewport adjustment in asm instead of pascal in PutPixel16 r41003 | nickysn | 2019-01-22 17:23:47 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * implement the clipping in assembly instead of pascal in PutPixel16 r41004 | nickysn | 2019-01-22 17:40:51 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * PutPixel16 converted to pure asm routine r41005 | nickysn | 2019-01-22 17:56:16 +0100 (Tue, 22 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * perform the clipping before initializing ES in PutPixel320, so it runs faster when the pixel happens to be outside the viewport r41006 | nickysn | 2019-01-22 18:20:38 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * optimizations in DirectPutPixel16 to avoid the mul instruction r41007 | nickysn | 2019-01-22 18:22:06 +0100 (Tue, 22 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use stosb instead of mov in DirectPutPixel16 r41009 | nickysn | 2019-01-23 13:05:21 +0100 (Wed, 23 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/inc/graph.inc * all procedures and functions that call NotInGraphicsMode marked 'noreturn' to avoid warnings about function result not being set, etc. r41010 | nickysn | 2019-01-23 13:09:08 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * SetVisual200 and SetVisual350 combined into one procedure, because they share the same code r41011 | nickysn | 2019-01-23 13:10:11 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * only load the low byte from the page parameter in SetVisual200_350 r41012 | nickysn | 2019-01-23 13:20:54 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * factored out the repeating code for setting a BIOS graphics mode into a common procedure InitInt10hMode r41013 | nickysn | 2019-01-23 14:23:29 +0100 (Wed, 23 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use SegB000 instead of the $B000 constant in InitHGC720. This will make the code compatible with 16-bit protected mode DOS targets, when they get implemented. r41014 | nickysn | 2019-01-23 14:31:43 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + also save/restore DS before/after the int 10h call inside SetCGAPalette and SetCGABorder r41015 | nickysn | 2019-01-23 14:37:06 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * split GetPixelX into strictly pascal and strictly asm version r41016 | nickysn | 2019-01-23 16:00:03 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge model fixes in asm GetPixelX r41017 | nickysn | 2019-01-23 16:02:38 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use only 8086/8088-compatible instructions in the asm GetPixelX r41018 | nickysn | 2019-01-23 16:22:20 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * viewport adjustment converted to asm in the asm version of GetPixelX r41019 | nickysn | 2019-01-23 16:23:48 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * asm version of GetPixelX converted to pure asm r41020 | nickysn | 2019-01-23 16:24:32 +0100 (Wed, 23 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * FPC_GRAPH_SUPPORTS_TRUECOLOR support in the asm GetPixelX r41028 | nickysn | 2019-01-24 14:41:10 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * fixed and enabled the asm version of GetPixelX r41029 | nickysn | 2019-01-24 14:43:34 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use SI instead of DI in the asm GetPixelX r41030 | nickysn | 2019-01-24 14:45:23 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use lodsb instead of mov in GetPixelX r41031 | nickysn | 2019-01-24 14:52:00 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * fix register in comment r41032 | nickysn | 2019-01-24 16:13:02 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * PutPixelX split into pure pascal and asm version r41033 | nickysn | 2019-01-24 16:18:30 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use 8086/8088-compatible instructions in the asm version of PutPixelX r41034 | nickysn | 2019-01-24 16:21:05 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * perform the viewport adjustment in asm instead of pascal in PutPixelX r41035 | nickysn | 2019-01-24 16:23:13 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - remove the XorPut support from PutPixelX, since it is not supposed to support different write modes r41036 | nickysn | 2019-01-24 16:25:34 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * swapped ax and cx in PutPixelX r41037 | nickysn | 2019-01-24 16:27:05 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * moved the loading of X and Y coordinates to the beginning of the asm block in PutPixelX r41038 | nickysn | 2019-01-24 16:30:15 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * perform the clipping in asm in PutPixelX r41039 | nickysn | 2019-01-24 16:31:54 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + enabled the asm version of PutPixelX r41040 | nickysn | 2019-01-24 16:32:46 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * moved the ES segment register initialization earlier in PutPixelX r41041 | nickysn | 2019-01-24 16:33:54 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge model safe initialization of ES in PutPixelX r41042 | nickysn | 2019-01-24 16:37:37 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * PutPixelX converted to a pure assembler routine r41043 | nickysn | 2019-01-24 16:39:26 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - don't save/restore registers that don't need to be preserved by the pascal calling convention r41044 | nickysn | 2019-01-24 16:43:43 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * only load the low byte of the color in PutPixelX r41045 | nickysn | 2019-01-24 16:45:52 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use stosb instead of mov in PutPixelX r41048 | nickysn | 2019-01-24 17:04:46 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * DirectPutPixelX split into pascal and asm version r41049 | nickysn | 2019-01-24 17:06:05 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed the unnecessary for the pascal calling convention register save/restores in DirectPutPixelX r41050 | nickysn | 2019-01-24 17:06:53 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed the regcall ifdefs in DirectPutPixelX r41051 | nickysn | 2019-01-24 17:11:33 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use only 8086/8088 compatible instructions in DirectPutPixelX r41052 | nickysn | 2019-01-24 17:12:58 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge model safe initialization of ES in DirectPutPixelX r41053 | nickysn | 2019-01-24 17:13:40 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * fixed register in comment r41054 | nickysn | 2019-01-24 17:14:01 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * fixed register in comment r41055 | nickysn | 2019-01-24 17:18:07 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * load only the low byte of CurrentColor in DirectPutPixelX r41056 | nickysn | 2019-01-24 17:27:20 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + implemented all the write modes in the asm version of DirectPutPixelX r41057 | nickysn | 2019-01-24 17:27:59 +0100 (Thu, 24 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + enabled the asm version of DirectPutPixelX r41071 | nickysn | 2019-01-25 16:26:21 +0100 (Fri, 25 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp + introduce the InitInt10hMode helper routine in the go32v2 graph unit as well r41072 | nickysn | 2019-01-25 17:14:07 +0100 (Fri, 25 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - removed destroyed register lists from pure asm routines r41073 | nickysn | 2019-01-25 17:15:31 +0100 (Fri, 25 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - removed 'ifndef tp' directives r41097 | nickysn | 2019-01-28 18:11:34 +0100 (Mon, 28 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * converted seg_xorword, seg_orword and seg_andword to pure asm routines r41098 | nickysn | 2019-01-28 18:15:27 +0100 (Mon, 28 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp + added comment in the beginning of seg_bytemove, containing the parameter locations r41099 | nickysn | 2019-01-28 18:18:37 +0100 (Mon, 28 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp + added comment to CallInt10 with the parameter location - removed the 'ifndef REGCALL' section from CallInt10 r41100 | nickysn | 2019-01-28 18:22:25 +0100 (Mon, 28 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp + added comments with the parameter locations in SetCGAPalette and SetCGABorder - removed 'ifndef REGCALL' r41101 | nickysn | 2019-01-28 18:25:24 +0100 (Mon, 28 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - removed the unnecessary code from SetVisual200 (the start address that is being read isn't written anywhere and is not used) r41102 | nickysn | 2019-01-28 18:28:10 +0100 (Mon, 28 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * SetVisual200 and SetVisual350 combined into one routine SetVisual200_350, because they share the same code r41103 | nickysn | 2019-01-28 18:32:14 +0100 (Mon, 28 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * declare all registers as clobbered by int 10h in the asm block in SetVisual200_350 and leave it to fpc to preserve what is necessary r41107 | nickysn | 2019-01-29 13:58:52 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp + added comment to PutPixel320 with the parameter locations r41108 | nickysn | 2019-01-29 14:00:24 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - removed the REGCALL ifdefs from PutPixel320 r41109 | nickysn | 2019-01-29 14:01:32 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - removed the commented out video page code from PutPixel320 r41110 | nickysn | 2019-01-29 14:05:12 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - don't save/restore eax and ecx in PutPixel320, because they don't need to be preserved by the register calling convention r41111 | nickysn | 2019-01-29 14:09:00 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * use different registers to avoid a mov instruction in PutPixel320 r41112 | nickysn | 2019-01-29 14:13:56 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp + comment in GetPixel320 with the parameter locations r41113 | nickysn | 2019-01-29 14:14:33 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - removed the REGCALL ifdefs from GetPixel320 r41114 | nickysn | 2019-01-29 14:15:14 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - removed commented out video page code from GetPixel320 r41115 | nickysn | 2019-01-29 14:16:14 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - don't preserve edx and ecx in GetPixel320, because they don't need to be preserved in GetPixel320 r41116 | nickysn | 2019-01-29 14:17:22 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * moved the assembler declaration in PutPixel320 and GetPixel320 to be on the same line as the procedure/function declaration r41117 | nickysn | 2019-01-29 14:19:31 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp - ignore VideoOfs completely in the mode 13h routines (this mode has no video page support) r41118 | nickysn | 2019-01-29 14:39:40 +0100 (Tue, 29 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * use eax instead of edi in GetPixel320, to avoid saving/restoring edi r41143 | nickysn | 2019-01-30 13:56:17 +0100 (Wed, 30 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * optimizations in SetActive200 and SetActive350 r41146 | nickysn | 2019-01-30 16:49:00 +0100 (Wed, 30 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * optimizations in SetVisualX and SetActiveX by using a table, instead of a case statement r41153 | nickysn | 2019-01-31 16:19:45 +0100 (Thu, 31 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * split the routines with asm versions into strict pascal and strict asm versions git-svn-id: branches/fixes_3_2@41498 -	2019-02-26 20:47:51 +00:00
marco	f91e313eef	--- Merging r40805 into '.': ... U packages/graph/src/inc/graph.inc U packages/graph/src/inc/fills.inc U packages/graph/src/inc/graphh.inc --- Recording mergeinfo for merge of r40805 into '.': U . --- Merging r40836 into '.': G packages/graph/src/inc/graphh.inc --- Recording mergeinfo for merge of r40836 into '.': G . --- Merging r40837 into '.': U packages/graph/src/msdos/graph.pp U packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r40837 into '.': G . --- Merging r40852 into '.': U packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40852 into '.': G . --- Merging r40853 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40853 into '.': G . --- Merging r40861 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r40861 into '.': G . --- Merging r40862 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40862 into '.': G . --- Merging r40863 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40863 into '.': G . --- Merging r40864 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp G packages/graph/src/inc/graph.inc --- Recording mergeinfo for merge of r40864 into '.': G . --- Merging r40865 into '.': U packages/graph/src/inc/modes.inc --- Recording mergeinfo for merge of r40865 into '.': G . --- Merging r40866 into '.': G packages/graph/src/inc/graph.inc --- Recording mergeinfo for merge of r40866 into '.': G . --- Merging r40867 into '.': G packages/graph/src/inc/fills.inc --- Recording mergeinfo for merge of r40867 into '.': G . --- Merging r40868 into '.': G packages/graph/src/inc/graph.inc --- Recording mergeinfo for merge of r40868 into '.': G . --- Merging r40873 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40873 into '.': G . --- Merging r40875 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40875 into '.': G . --- Merging r40876 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40876 into '.': G . --- Merging r40877 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40877 into '.': G . --- Merging r40878 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40878 into '.': G . --- Merging r40879 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40879 into '.': G . --- Merging r40880 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40880 into '.': G . --- Merging r40887 into '.': U packages/graph/src/go32v2/vesa.inc --- Recording mergeinfo for merge of r40887 into '.': G . --- Merging r40888 into '.': G packages/graph/src/go32v2/vesa.inc G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r40888 into '.': G . --- Merging r40889 into '.': G packages/graph/src/go32v2/graph.pp G packages/graph/src/go32v2/vesa.inc --- Recording mergeinfo for merge of r40889 into '.': G . --- Merging r40890 into '.': G packages/graph/src/msdos/graph.pp U packages/graph/src/msdos/vesa.inc --- Recording mergeinfo for merge of r40890 into '.': G . --- Merging r40891 into '.': G packages/graph/src/msdos/vesa.inc G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40891 into '.': G . --- Merging r40892 into '.': G packages/graph/src/msdos/graph.pp G packages/graph/src/msdos/vesa.inc --- Recording mergeinfo for merge of r40892 into '.': G . --- Merging r40893 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40893 into '.': G . --- Merging r40894 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40894 into '.': G . --- Merging r40895 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40895 into '.': G . --- Merging r40896 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40896 into '.': G . --- Merging r40897 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40897 into '.': G . --- Merging r40898 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40898 into '.': G . --- Merging r40900 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40900 into '.': G . --- Merging r40901 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40901 into '.': G . --- Merging r40902 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40902 into '.': G . --- Merging r40903 into '.': G packages/graph/src/inc/graphh.inc G packages/graph/src/inc/graph.inc --- Recording mergeinfo for merge of r40903 into '.': G . --- Merging r40904 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40904 into '.': G . --- Merging r40906 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40906 into '.': G . --- Merging r40907 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40907 into '.': G . --- Merging r40909 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40909 into '.': G . --- Merging r40910 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40910 into '.': G . --- Merging r40911 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40911 into '.': G . --- Merging r40913 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40913 into '.': G . --- Merging r40914 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40914 into '.': G . --- Merging r40915 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40915 into '.': G . --- Merging r40916 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40916 into '.': G . --- Merging r40917 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40917 into '.': G . --- Merging r40918 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40918 into '.': G . --- Merging r40919 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40919 into '.': G . --- Merging r40922 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40922 into '.': G . --- Merging r40923 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40923 into '.': G . --- Merging r40924 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40924 into '.': G . --- Merging r40954 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40954 into '.': G . --- Merging r40955 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40955 into '.': G . # revisions: 40805,40836,40837,40852,40853,40861,40862,40863,40864,40865,40866,40867,40868,40873,40875,40876,40877,40878,40879,40880,40887,40888,40889,40890,40891,40892,40893,40894,40895,40896,40897,40898,40900,40901,40902,40903,40904,40906,40907,40909,40910,40911,40913,40914,40915,40916,40917,40918,40919,40922,40923,40924,40954,40955 r40805 | nickysn | 2019-01-08 09:50:44 +0100 (Tue, 08 Jan 2019) | 5 lines Changed paths: M /trunk/packages/graph/src/inc/fills.inc M /trunk/packages/graph/src/inc/graph.inc M /trunk/packages/graph/src/inc/graphh.inc + introduced the ColorType (=word) to the graph unit. This is the type, used to represent a color. This is intended to make it easier to add support for 24-bit and 32-bit color to the graph unit on platforms that support it. r40836 | nickysn | 2019-01-10 16:56:53 +0100 (Thu, 10 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/graphh.inc * define ColorType as LongWord if FPC_GRAPH_SUPPORTS_TRUECOLOR is defined r40837 | nickysn | 2019-01-10 17:09:34 +0100 (Thu, 10 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp M /trunk/packages/graph/src/msdos/graph.pp + added the 24-bit color modes, as defined by VBE 1.x, behind ifdef FPC_GRAPH_SUPPORTS_TRUECOLOR (not enabled yet) r40852 | nickysn | 2019-01-13 11:34:06 +0100 (Sun, 13 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added the 24-bit color modes, as defined by VBE 1.x, behind ifdef FPC_GRAPH_SUPPORTS_TRUECOLOR (not enabled yet) r40853 | nickysn | 2019-01-13 12:25:58 +0100 (Sun, 13 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * factored out the common VESA mode initialization for each screen resolution to a separate procedure r40861 | nickysn | 2019-01-14 13:56:15 +0100 (Mon, 14 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * factored out the common VESA mode initialization for each screen resolution to a separate procedure (same change as r40853, but for go32v2) r40862 | nickysn | 2019-01-14 15:09:21 +0100 (Mon, 14 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp * factored out the common VESA mode initialization for each screen resolution to a separate procedure (same change as r40853, but for ptcgraph) r40863 | nickysn | 2019-01-14 15:59:58 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + initial implementation of 32bpp support (not enabled yet) r40864 | nickysn | 2019-01-14 16:20:59 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/graph.inc M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp * 32bpp (True Color) compilation fixes r40865 | nickysn | 2019-01-14 17:23:42 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/modes.inc * 24-bit color support in modes.inc:res2mode r40866 | nickysn | 2019-01-14 18:12:14 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/graph.inc + True Color fixes in GetScanlineDefault (returns 32 bits per pixel, but only in modes with >16bit color) r40867 | nickysn | 2019-01-14 18:13:07 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/fills.inc + True Color fixes in FloodFill r40868 | nickysn | 2019-01-14 18:33:53 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/graph.inc + True Color fixes in DefaultGetImage, DefaultPutImage and DefaultImageSize r40873 | nickysn | 2019-01-16 14:52:07 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added fast 32bpp hline and vline drawing routines r40875 | nickysn | 2019-01-16 15:34:29 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added fast 32bpp GetScanLine routine r40876 | nickysn | 2019-01-16 15:54:53 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added fast 32bpp GetImage routine r40877 | nickysn | 2019-01-16 16:04:38 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added fast 32bpp PutImage routine r40878 | nickysn | 2019-01-16 17:00:31 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added an accelerated 8bpp pattern line drawing routine r40879 | nickysn | 2019-01-16 17:14:07 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added an accelerated 16bpp pattern line routine r40880 | nickysn | 2019-01-16 17:24:07 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added a 32bpp accelerated pattern line drawing routine r40887 | nickysn | 2019-01-17 15:47:39 +0100 (Thu, 17 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/vesa.inc + added a 16bpp linear framebuffer horizontal line drawing routine r40888 | nickysn | 2019-01-17 17:00:02 +0100 (Thu, 17 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp M /trunk/packages/graph/src/go32v2/vesa.inc + accelerated xor/and/orput hline routines for the 16bpp linear framebuffer modes r40889 | nickysn | 2019-01-17 18:07:54 +0100 (Thu, 17 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp M /trunk/packages/graph/src/go32v2/vesa.inc - removed all the 'ifdef fpc'/'ifndef fpc' from the go32v2 graph unit to make it easier to maintain and because its TP7 compatibility hasn't been maintained for a very long time r40890 | nickysn | 2019-01-18 13:32:00 +0100 (Fri, 18 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp M /trunk/packages/graph/src/msdos/vesa.inc * only save BP and DS when calling int 10h; mark the other registers as volatile in the asm blocks - removed the 'ifdef FPC' around the register saving code around the int 10h calls r40891 | nickysn | 2019-01-18 13:52:22 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp M /trunk/packages/graph/src/msdos/vesa.inc - removed all the '{$ifndef fpc}far;{$endif fpc}' declarations from the i8086-msdos graph unit r40892 | nickysn | 2019-01-18 14:22:18 +0100 (Fri, 18 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp M /trunk/packages/graph/src/msdos/vesa.inc + use the ColorType type in the i8086-msdos graph unit, so that it compiles with FPC_GRAPH_SUPPORTS_TRUECOLOR (not enabled yet) r40893 | nickysn | 2019-01-18 14:32:45 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - get rid of the '{$ifdef fpc}@{$endif}' from the i8086-msdos graph unit r40894 | nickysn | 2019-01-18 14:46:47 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * fixed result of GetPixel320 when FPC_GRAPH_SUPPORTS_TRUECOLOR is defined r40895 | nickysn | 2019-01-18 14:49:05 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed commented out code from PutPixel320 and GetPixel320 r40896 | nickysn | 2019-01-18 16:17:43 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * cleaned up, fixed, optimized a little and enabled the assembler version of PutPixel16 r40897 | nickysn | 2019-01-18 16:48:09 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * cleaned up, fixed, optimized a little and enabled the assembler version of GetPixel16 r40898 | nickysn | 2019-01-18 20:57:51 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * refactored DirectPutPixel16, so it is strictly split into pascal and asm version; asm version not enabled yet r40900 | nickysn | 2019-01-19 11:58:18 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use huge memory model compatible initialization of es=SegA000 in the asm version of DirectPutPixel16 r40901 | nickysn | 2019-01-19 12:18:39 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed the pascal case code before the asm block in the asm version of DirectPutPixel16 r40902 | nickysn | 2019-01-19 13:54:47 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * cleaned up, optimized a little, added support for all write modes (and/or/xor/not) and enabled the asm version of the DirectPutPixel16 routine r40903 | nickysn | 2019-01-19 16:16:49 +0100 (Sat, 19 Jan 2019) | 6 lines Changed paths: M /trunk/packages/graph/src/inc/graph.inc M /trunk/packages/graph/src/inc/graphh.inc + introduced SetWriteModeEx to the Graph unit. Unlike SetWriteMode, it allows setting the current write mode to any mode, such as NormalPut/CopyPut, XorPut, OrPut, AndPut or NotPut. For comparison, SetWriteMode only allows NormalPut/ CopyPut and XorPut. Fixes Mantis #30773. r40904 | nickysn | 2019-01-19 16:59:42 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * handle the NotPut write mode in asm instead of pascal in the asm version of DirectPutPixel16 r40906 | nickysn | 2019-01-19 17:11:03 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * the asm version of DirectPutPixel16 convert to pure inline asm routine r40907 | nickysn | 2019-01-19 17:20:21 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed unused asm code from SetVisual200 r40909 | nickysn | 2019-01-19 17:36:54 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + added pure pascal version of the routine PutPixel320 r40910 | nickysn | 2019-01-19 17:38:44 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge memory model fix for the asm version of PutPixel320 r40911 | nickysn | 2019-01-19 17:46:30 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + enabled the asm version of PutPixel320 r40913 | nickysn | 2019-01-19 17:55:34 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + pure pascal implementation of GetPixel320 r40914 | nickysn | 2019-01-19 17:56:13 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge memory model fix for the asm version of the GetPixel320 routine r40915 | nickysn | 2019-01-19 17:56:49 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + enabled the asm version of GetPixel320 r40916 | nickysn | 2019-01-19 17:59:15 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * do the view port adjustment in asm instead of pascal in the asm version of GetPixel320 r40917 | nickysn | 2019-01-19 18:02:54 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * GetPixel320 converted to a pure assembler routine r40918 | nickysn | 2019-01-19 18:24:24 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * implemented the viewport adjustment in asm instead of pascal in the asm version of the PutPixel320 routine r40919 | nickysn | 2019-01-19 19:03:51 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * perform clipping in assembly in the PutPixel320 asm routine r40922 | nickysn | 2019-01-19 22:27:16 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * only read the low byte of the pixel color in the asm version of PutPixel320 r40923 | nickysn | 2019-01-19 22:33:26 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use stosb instead of mov to draw the pixel inside the asm version of PutPixel320 r40924 | nickysn | 2019-01-19 23:07:03 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * PutPixel320 converted to pure assembler routine r40954 | nickysn | 2019-01-21 14:39:14 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed the 32-bit asm code from the asm version of DirectPutPixel320 r40955 | nickysn | 2019-01-21 14:40:04 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge memory model fix for the asm version of DirectPutPixel320 git-svn-id: branches/fixes_3_2@41497 -	2019-02-26 20:36:23 +00:00
marco	ad69839b34	--- Merging r41264 into '.': ... U packages/winunits-base/src/activex.pp --- Recording mergeinfo for merge of r41264 into '.': U . --- Merging r41265 into '.': U rtl/win/wininc/defines.inc --- Recording mergeinfo for merge of r41265 into '.': G . --- Merging r41266 into '.': G rtl/win/wininc/defines.inc --- Recording mergeinfo for merge of r41266 into '.': G . --- Merging r41269 into '.': U rtl/win/wininc/base.inc --- Recording mergeinfo for merge of r41269 into '.': G . # revisions: 41264,41265,41266,41269 r41264 | marco | 2019-02-09 14:29:14 +0100 (Sat, 09 Feb 2019) | 2 lines Changed paths: M /trunk/packages/winunits-base/src/activex.pp * regcls constants from MSDN r41265 | marco | 2019-02-09 14:34:52 +0100 (Sat, 09 Feb 2019) | 2 lines Changed paths: M /trunk/rtl/win/wininc/defines.inc * some _E_ and _S_ constants from winerror.h used in activex patch. r41266 | marco | 2019-02-09 14:41:22 +0100 (Sat, 09 Feb 2019) | 1 line Changed paths: M /trunk/rtl/win/wininc/defines.inc * _S_ and _E_ first and last were already there, just in an unexpected winerror. Found after testing ->revert all but the last line. r41269 | marco | 2019-02-09 18:53:05 +0100 (Sat, 09 Feb 2019) | 2 lines Changed paths: M /trunk/rtl/win/wininc/base.inc * makerop to dword mantis #34712 git-svn-id: branches/fixes_3_2@41296 -	2019-02-11 10:15:49 +00:00
marco	7d336b1638	--- Merging r40496 into '.': ... U packages/amunits/src/coreunits/serial.pas --- Recording mergeinfo for merge of r40496 into '.': U . --- Merging r40497 into '.': A packages/arosunits/src/serial.pas U packages/arosunits/src/exec.pas U packages/arosunits/fpmake.pp A packages/os4units/src/serial.pas U packages/os4units/src/exec.pas U packages/os4units/fpmake.pp U packages/morphunits/fpmake.pp A packages/morphunits/src/serial.pas U packages/morphunits/src/exec.pas --- Recording mergeinfo for merge of r40497 into '.': G . --- Merging r40653 into '.': U packages/amunits/src/coreunits/amigados.pas --- Recording mergeinfo for merge of r40653 into '.': G . # revisions: 40496,40497,40653 git-svn-id: branches/fixes_3_2@41260 -	2019-02-09 11:38:56 +00:00
Jonas Maebe	3ac703506c	* rest of the previous accidental partial commit ... git-svn-id: branches/fixes_3_2@41250 -	2019-02-07 19:56:21 +00:00
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 -	2019-02-03 16:51:17 +00:00
pierre	163a3918e2	------------------------------------------------------------------------ ... r39826 | pierre | 2018-09-27 07:01:58 +0000 (Thu, 27 Sep 2018) | 1 line Update Makefile.fpc to pacakages location ------------------------------------------------------------------------ --- Merging r39826 into '.': U packages/ide/fakegdb/Makefile.fpc --- Recording mergeinfo for merge of r39826 into '.': U . git-svn-id: branches/fixes_3_2@41187 -	2019-02-03 16:03:59 +00:00
pierre	e85a99b1f8	Merge of commit 40952. ... ------------------------------------------------------------------------ r40952 | michael | 2019-01-21 08:16:13 +0000 (Mon, 21 Jan 2019) | 1 line * Add Unicode/Widestring overload on windows for ResolveRelativeURI ------------------------------------------------------------------------ --- Merging r40952 into '.': U packages/fcl-base/src/uriparser.pp --- Recording mergeinfo for merge of r40952 into '.': U . git-svn-id: branches/fixes_3_2@40953 -	2019-01-21 11:17:43 +00:00
michael	081900de7c	* Merging revisions 40927,40930,40935,40936,40939,40940,40942,40944 from trunk: ... ------------------------------------------------------------------------ r40927 | michael | 2019-01-20 12:12:49 +0100 (Sun, 20 Jan 2019) | 1 line * Widestring -> unicodestring ------------------------------------------------------------------------ r40930 | michael | 2019-01-20 13:32:01 +0100 (Sun, 20 Jan 2019) | 1 line * Fix syntax error ------------------------------------------------------------------------ r40935 | michael | 2019-01-20 14:04:15 +0100 (Sun, 20 Jan 2019) | 1 line * Remove debug statement ------------------------------------------------------------------------ r40936 | michael | 2019-01-20 14:04:28 +0100 (Sun, 20 Jan 2019) | 1 line * Add in operator ------------------------------------------------------------------------ r40939 | michael | 2019-01-20 17:45:31 +0100 (Sun, 20 Jan 2019) | 1 line * Parse type constraints in generics ------------------------------------------------------------------------ r40940 | michael | 2019-01-20 17:52:09 +0100 (Sun, 20 Jan 2019) | 1 line * Fix compilation ------------------------------------------------------------------------ r40942 | michael | 2019-01-20 18:10:16 +0100 (Sun, 20 Jan 2019) | 1 line * Generic templates can be separated by semicolon (used in fgl unit) ------------------------------------------------------------------------ r40944 | michael | 2019-01-20 18:55:15 +0100 (Sun, 20 Jan 2019) | 1 line * Defaults are not to add default identifiers (fpdoc) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@40947 -	2019-01-20 18:01:23 +00:00
marco	01d6e8fba8	--- Merging r40745 into '.': ... U packages/winunits-base/src/activex.pp --- Recording mergeinfo for merge of r40745 into '.': U . # revisions: 40745 git-svn-id: branches/fixes_3_2@40790 -	2019-01-07 10:18:39 +00:00
marco	f6e52ff1de	--- Merging r40510 into '.': ... U packages/graph/src/win32/graph.pp --- Recording mergeinfo for merge of r40510 into '.': U . --- Merging r40511 into '.': U packages/graph/src/inc/graphh.inc --- Recording mergeinfo for merge of r40511 into '.': G . # revisions: 40510,40511 git-svn-id: branches/fixes_3_2@40741 -	2019-01-01 22:20:20 +00:00
marco	5826dfa53d	--- Merging r40608 into '.': ... A packages/sqlite/src/sqlite3ext.pp U packages/sqlite/fpmake.pp --- Recording mergeinfo for merge of r40608 into '.': U . --- Merging r40609 into '.': A packages/sqlite/examples/myext.pp A packages/sqlite/examples/myext.lpi --- Recording mergeinfo for merge of r40609 into '.': G . # revisions: 40608,40609 git-svn-id: branches/fixes_3_2@40728 -	2019-01-01 14:51:19 +00:00
marco	49f4652c23	--- Merging r40615 into '.': ... U packages/chm/src/chmcmd.lpr --- Recording mergeinfo for merge of r40615 into '.': U . # revisions: 40615 git-svn-id: branches/fixes_3_2@40725 -	2019-01-01 14:41:03 +00:00
marco	bb89a4dca0	--- Merging r39842 into '.': ... U packages/fcl-pdf/src/fppdf.pp U packages/fcl-pdf/examples/testfppdf.lpr --- Recording mergeinfo for merge of r39842 into '.': U . --- Merging r40054 into '.': U packages/fcl-pdf/src/fpparsettf.pp --- Recording mergeinfo for merge of r40054 into '.': G . # revisions: 39842,40054 git-svn-id: branches/fixes_3_2@40723 -	2019-01-01 13:14:13 +00:00
marco	e680d94fe1	--- Merging r40191 into '.': ... U packages/fcl-js/src/jsbase.pp U packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40191 into '.': U . --- Merging r40195 into '.': U packages/fcl-web/examples/simpleserver/simpleserver.pas --- Recording mergeinfo for merge of r40195 into '.': G . --- Merging r40203 into '.': U packages/fcl-js/src/jsscanner.pp --- Recording mergeinfo for merge of r40203 into '.': G . --- Merging r40364 into '.': U packages/fcl-web/src/base/fphttpstatus.pas U packages/fcl-web/fpmake.pp --- Recording mergeinfo for merge of r40364 into '.': G . --- Merging r40366 into '.': G packages/fcl-web/examples/simpleserver/simpleserver.pas U packages/fcl-web/examples/simpleserver/simpleserver.lpi --- Recording mergeinfo for merge of r40366 into '.': G . --- Merging r40393 into '.': U packages/fcl-web/src/base/httproute.pp --- Recording mergeinfo for merge of r40393 into '.': G . --- Merging r40395 into '.': U packages/fcl-web/src/base/fphttpclient.pp --- Recording mergeinfo for merge of r40395 into '.': G . --- Merging r40592 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40592 into '.': G . --- Merging r40707 into '.': U packages/fcl-js/tests/tcwriter.pp G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40707 into '.': G . # revisions: 40191,40195,40203,40364,40366,40393,40395,40592,40707 git-svn-id: branches/fixes_3_2@40719 -	2018-12-31 16:46:05 +00:00
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 -	2018-12-31 16:37:10 +00:00
marco	4873692ce5	--- Merging r40063 into '.': ... U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp --- Recording mergeinfo for merge of r40063 into '.': U . --- Merging r40240 into '.': U packages/fcl-db/tests/testsqldb.pas U packages/fcl-db/src/sqldb/sqldb.pp --- Recording mergeinfo for merge of r40240 into '.': G . --- Merging r40396 into '.': U packages/fcl-db/src/sqldb/postgres/pqeventmonitor.pp --- Recording mergeinfo for merge of r40396 into '.': G . --- Merging r40607 into '.': G packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp --- Recording mergeinfo for merge of r40607 into '.': G . --- Merging r40610 into '.': A packages/fcl-db/examples/myext.pp A packages/fcl-db/examples/sqlite3extdemo.pp --- Recording mergeinfo for merge of r40610 into '.': G . # revisions: 40063,40240,40396,40607,40610 git-svn-id: branches/fixes_3_2@40713 -	2018-12-31 11:16:38 +00:00
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 -	2018-12-30 15:42:04 +00:00
pierre	d8b0ded10c	Marge of more trunk fixes into fixes branch. ... ------------------------------------------------------------------------ r39725 | pierre | 2018-09-10 13:28:33 +0000 (Mon, 10 Sep 2018) | 1 line Add branches for 3.2.0, 3.2.1 and 3.3.1 versions ------------------------------------------------------------------------ --- Merging r39725 into '.': U tests/utils/testsuite/utests.pp --- Recording mergeinfo for merge of r39725 into '.': U . ------------------------------------------------------------------------ r39733 | pierre | 2018-09-11 08:16:56 +0000 (Tue, 11 Sep 2018) | 1 line sparc64-linux objects recompiled with GCC 7.3.0 ------------------------------------------------------------------------ --- Merging r39733 into '.': U tests/test/cg/obj/readme.txt U tests/test/cg/obj/linux/sparc64/ctest.o U tests/test/cg/obj/linux/sparc64/cpptcl1.o U tests/test/cg/obj/linux/sparc64/cpptcl2.o U tests/test/cg/obj/linux/sparc64/tcext3.o U tests/test/cg/obj/linux/sparc64/tcext4.o U tests/test/cg/obj/linux/sparc64/tcext5.o U tests/test/cg/obj/linux/sparc64/tcext6.o --- Recording mergeinfo for merge of r39733 into '.': G . ------------------------------------------------------------------------ r39808 | pierre | 2018-09-26 09:29:33 +0000 (Wed, 26 Sep 2018) | 1 line Disable libraries not compiling for jvm-java or jvm-android targets ------------------------------------------------------------------------ --- Merging r39808 into '.': U packages/fppkg/fpmake.pp U packages/fcl-base/fpmake.pp U packages/rtl-extra/fpmake.pp U packages/hermes/fpmake.pp U packages/fcl-extra/fpmake.pp U packages/fcl-db/fpmake.pp U packages/unzip/fpmake.pp U packages/odbc/fpmake.pp U packages/gdbm/fpmake.pp U packages/pthreads/fpmake.pp U packages/fcl-json/fpmake.pp U packages/pcap/fpmake.pp U packages/numlib/fpmake.pp U packages/rtl-generics/fpmake.pp U packages/zlib/fpmake.pp U packages/paszlib/fpmake.pp U packages/webidl/fpmake.pp U packages/regexpr/fpmake.pp U packages/libgd/fpmake.pp U packages/fcl-net/fpmake.pp U packages/fcl-res/fpmake.pp U packages/libpng/fpmake.pp U packages/dblib/fpmake.pp U packages/tcl/fpmake.pp U packages/openssl/fpmake.pp U packages/ibase/fpmake.pp U packages/bzip2/fpmake.pp U packages/fcl-sdo/fpmake.pp U packages/fcl-sound/fpmake.pp U packages/fcl-passrc/fpmake.pp U packages/fcl-stl/fpmake.pp U packages/libmicrohttpd/fpmake.pp U packages/mysql/fpmake.pp U packages/postgres/fpmake.pp U packages/httpd22/fpmake.pp U packages/httpd24/fpmake.pp U packages/rtl-console/fpmake.pp U packages/sqlite/fpmake.pp U packages/fftw/fpmake.pp U packages/fcl-pdf/fpmake.pp U packages/rtl-objpas/fpmake.pp U packages/fcl-image/fpmake.pp U packages/pasjpeg/fpmake.pp U packages/chm/fpmake.pp U packages/fcl-registry/fpmake.pp U packages/libtar/fpmake.pp U packages/symbolic/fpmake.pp U packages/libenet/fpmake.pp U packages/imagemagick/fpmake.pp U packages/fcl-xml/fpmake.pp U packages/oracle/fpmake.pp U packages/fcl-fpcunit/fpmake.pp U packages/fcl-js/fpmake.pp U packages/fcl-async/fpmake.pp U packages/fcl-process/fpmake.pp U packages/pastojs/fpmake.pp U packages/hash/fpmake.pp U packages/rtl-unicode/fpmake.pp U packages/fpmkunit/fpmake.pp --- Recording mergeinfo for merge of r39808 into '.': G . ------------------------------------------------------------------------ r40027 | pierre | 2018-10-24 21:37:54 +0000 (Wed, 24 Oct 2018) | 1 line Fix compilation of RTL for watcom target ------------------------------------------------------------------------ --- Merging r40027 into '.': U compiler/x86/agx86int.pas --- Recording mergeinfo for merge of r40027 into '.': G . ------------------------------------------------------------------------ r40028 | pierre | 2018-10-25 06:39:42 +0000 (Thu, 25 Oct 2018) | 1 line Try to fix compilation error after commit #40027 ------------------------------------------------------------------------ --- Merging r40028 into '.': G compiler/x86/agx86int.pas --- Recording mergeinfo for merge of r40028 into '.': G . ------------------------------------------------------------------------ r40102 | pierre | 2018-10-31 09:07:57 +0000 (Wed, 31 Oct 2018) | 1 line Replace aint (which is a compiler specific type) by ptruint type, which is defined in system unit ------------------------------------------------------------------------ --- Merging r40102 into '.': U tests/test/tarray5.pp --- Recording mergeinfo for merge of r40102 into '.': G . ------------------------------------------------------------------------ r40103 | pierre | 2018-10-31 09:59:45 +0000 (Wed, 31 Oct 2018) | 1 line Use pdword to avoid range check erro in tentryfile.getdword method ------------------------------------------------------------------------ --- Merging r40103 into '.': U compiler/entfile.pas --- Recording mergeinfo for merge of r40103 into '.': G . ------------------------------------------------------------------------ r40104 | pierre | 2018-10-31 10:21:51 +0000 (Wed, 31 Oct 2018) | 1 line Use longint type instead of AWord for Initial parameter in CalcExecutionWeigths (to avoid range error for avr compiler) ------------------------------------------------------------------------ @@ begin Result:=fen_false; n.allocoptinfo; <<<<<<< MINE (select with 'mc') (367) Weight:=PAWord(arg)^; ||||||| ORIGINAL (367) Weight:=max(PAWord(arg)^,1); ======= Weight:=max(plongint(arg)^,1); >>>>>>> THEIRS (select with 'tc') (367) case n.nodetype of casen: begin --- Merging r40104 into '.': C compiler/optutils.pas --- Recording mergeinfo for merge of r40104 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40110 | pierre | 2018-10-31 14:51:23 +0000 (Wed, 31 Oct 2018) | 1 line Avoid range check error in MaskLength evaluation ------------------------------------------------------------------------ --- Merging r40110 into '.': U compiler/x86/aoptx86.pas --- Recording mergeinfo for merge of r40110 into '.': G . ------------------------------------------------------------------------ r40111 | pierre | 2018-10-31 15:47:53 +0000 (Wed, 31 Oct 2018) | 1 line Complement commit 40104, by changing type of executionweight in toptinfo record and adapt pass_2 code ------------------------------------------------------------------------ --- Merging r40111 into '.': U compiler/pass_2.pas U compiler/optbase.pas --- Recording mergeinfo for merge of r40111 into '.': G . ------------------------------------------------------------------------ r40112 | pierre | 2018-10-31 15:48:32 +0000 (Wed, 31 Oct 2018) | 1 line Disable range check completely in arm/cgcpu unit ------------------------------------------------------------------------ --- Merging r40112 into '.': U compiler/arm/cgcpu.pas --- Recording mergeinfo for merge of r40112 into '.': G . ------------------------------------------------------------------------ r40113 | pierre | 2018-10-31 15:49:14 +0000 (Wed, 31 Oct 2018) | 1 line Avoid overflow in code ------------------------------------------------------------------------ --- Merging r40113 into '.': U compiler/symdef.pas --- Recording mergeinfo for merge of r40113 into '.': G . ------------------------------------------------------------------------ r40114 | pierre | 2018-10-31 15:50:26 +0000 (Wed, 31 Oct 2018) | 1 line Add explicit rtlclean/rtl targets in fullcycle rule if DOWPOCYCLE is set ------------------------------------------------------------------------ --- Merging r40114 into '.': U compiler/Makefile.fpc U compiler/Makefile --- Recording mergeinfo for merge of r40114 into '.': G . ------------------------------------------------------------------------ r40120 | pierre | 2018-10-31 23:15:22 +0000 (Wed, 31 Oct 2018) | 1 line Change RemoveCurrentP parameter type to tai, because GetNextInstruction does not always return a taicpu, adapt code in avr/aoptcpu unit ------------------------------------------------------------------------ --- Merging r40120 into '.': U compiler/aoptobj.pas U compiler/avr/aoptcpu.pas --- Recording mergeinfo for merge of r40120 into '.': G . ------------------------------------------------------------------------ r40121 | pierre | 2018-10-31 23:16:51 +0000 (Wed, 31 Oct 2018) | 1 line Add check about tloadnode.symtableentry type before typecast ------------------------------------------------------------------------ --- Merging r40121 into '.': U compiler/ncal.pas --- Recording mergeinfo for merge of r40121 into '.': G . ------------------------------------------------------------------------ r40122 | pierre | 2018-10-31 23:18:09 +0000 (Wed, 31 Oct 2018) | 1 line Fix typecast in FindRegDeAlloc call ------------------------------------------------------------------------ --- Merging r40122 into '.': U compiler/arm/aoptcpu.pas --- Recording mergeinfo for merge of r40122 into '.': G . ------------------------------------------------------------------------ r40123 | pierre | 2018-10-31 23:19:39 +0000 (Wed, 31 Oct 2018) | 1 line Remove unneeded typecasts in TryTOptimizeMove ------------------------------------------------------------------------ --- Merging r40123 into '.': U compiler/m68k/aoptcpu.pas --- Recording mergeinfo for merge of r40123 into '.': G . ------------------------------------------------------------------------ r40124 | pierre | 2018-10-31 23:20:29 +0000 (Wed, 31 Oct 2018) | 1 line Add global range check disable for i8086 cgcpu and x86 nx86add units ------------------------------------------------------------------------ --- Merging r40124 into '.': U compiler/i8086/cgcpu.pas U compiler/x86/nx86add.pas --- Recording mergeinfo for merge of r40124 into '.': G . ------------------------------------------------------------------------ r40131 | pierre | 2018-11-01 07:01:02 +0000 (Thu, 01 Nov 2018) | 1 line Remove another wrong typecast when testing that a tai is an instruction ------------------------------------------------------------------------ --- Merging r40131 into '.': G compiler/m68k/aoptcpu.pas --- Recording mergeinfo for merge of r40131 into '.': G . ------------------------------------------------------------------------ r40236 | pierre | 2018-11-06 07:40:31 +0000 (Tue, 06 Nov 2018) | 1 line Really change extension of hs1 local variable in get_exepath ------------------------------------------------------------------------ --- Merging r40236 into '.': U compiler/globals.pas --- Recording mergeinfo for merge of r40236 into '.': G . ------------------------------------------------------------------------ r40237 | pierre | 2018-11-06 07:41:15 +0000 (Tue, 06 Nov 2018) | 1 line Disable range checking in rax86int unit ------------------------------------------------------------------------ --- Merging r40237 into '.': U compiler/x86/rax86int.pas --- Recording mergeinfo for merge of r40237 into '.': G . ------------------------------------------------------------------------ r40278 | pierre | 2018-11-08 20:19:54 +0000 (Thu, 08 Nov 2018) | 1 line Downgrade EXTDEBUG warning to note about zero size temp, as it is used for empty sets ------------------------------------------------------------------------ --- Merging r40278 into '.': U compiler/tgobj.pas --- Recording mergeinfo for merge of r40278 into '.': G . git-svn-id: branches/fixes_3_2@40624 -	2018-12-23 22:27:05 +00:00
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 -	2018-12-23 14:44:32 +00:00
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 -	2018-12-22 23:17:59 +00:00