From 853f9ec0a63e48420bd67f3b37cacc279e788748 Mon Sep 17 00:00:00 2001 From: evgenyk Date: Wed, 16 Apr 2014 13:09:14 +0300 Subject: [PATCH] XE6 support was added --- .../DataAbstract_Scripting_D20.dpk | 43 ++++ .../DataAbstract_Scripting_D20.dproj | 169 +++++++++++++++ .../DataAbstract_Scripting_D20.res | Bin 0 -> 588 bytes Addon/RemObjects SDK/PascalScript_RO_D20.dpk | 48 ++++ .../RemObjects SDK/PascalScript_RO_D20.dproj | 172 +++++++++++++++ Addon/RemObjects SDK/PascalScript_RO_D20.res | Bin 0 -> 680 bytes Source/PascalScript_Core_D20.dpk | 79 +++++++ Source/PascalScript_Core_D20.dproj | 205 ++++++++++++++++++ Source/PascalScript_Core_D20.res | Bin 0 -> 684 bytes Source/eDefines.inc | 112 +++++++--- 10 files changed, 795 insertions(+), 33 deletions(-) create mode 100644 Addon/DataAbstract/DataAbstract_Scripting_D20.dpk create mode 100644 Addon/DataAbstract/DataAbstract_Scripting_D20.dproj create mode 100644 Addon/DataAbstract/DataAbstract_Scripting_D20.res create mode 100644 Addon/RemObjects SDK/PascalScript_RO_D20.dpk create mode 100644 Addon/RemObjects SDK/PascalScript_RO_D20.dproj create mode 100644 Addon/RemObjects SDK/PascalScript_RO_D20.res create mode 100644 Source/PascalScript_Core_D20.dpk create mode 100644 Source/PascalScript_Core_D20.dproj create mode 100644 Source/PascalScript_Core_D20.res diff --git a/Addon/DataAbstract/DataAbstract_Scripting_D20.dpk b/Addon/DataAbstract/DataAbstract_Scripting_D20.dpk new file mode 100644 index 0000000..829e4d1 --- /dev/null +++ b/Addon/DataAbstract/DataAbstract_Scripting_D20.dpk @@ -0,0 +1,43 @@ +package DataAbstract_Scripting_D20; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO ON} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'RemObjects Data Abstract - Scripting Integration Library'} +{$IMPLICITBUILD OFF} + +requires + rtl, + vcl, + RemObjects_Core_D20, + DataAbstract_Core_D20, + PascalScript_Core_D20; + +contains + uDAPascalScript in 'uDAPascalScript.pas', + uDAPSScriptingProvider in 'uDAPSScriptingProvider.pas', + DataAbstract_Scripting_Reg in 'DataAbstract_Scripting_Reg.pas'; + +end. diff --git a/Addon/DataAbstract/DataAbstract_Scripting_D20.dproj b/Addon/DataAbstract/DataAbstract_Scripting_D20.dproj new file mode 100644 index 0000000..33d1458 --- /dev/null +++ b/Addon/DataAbstract/DataAbstract_Scripting_D20.dproj @@ -0,0 +1,169 @@ + + + {0B9555CA-264E-4A91-A0D1-C431C84E617F} + DataAbstract_Scripting_D20.dpk + True + Debug + DCC32 + 14.2 + VCL + Win32 + Package + 3 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) + rtl;$(DCC_UsePackage) + true + CompanyName=RemObjects Software;FileDescription=;FileVersion=3.0.1.361;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=RemObjects SDK;ProductVersion=1.0.0.0;Comments= + 1033 + 361 + 1 + 3 + true + true + RemObjects Data Abstract - Scripting Integration Library + 00400000 + false + false + true + true + false + false + false + + + ..\..\Dcu\D20\win64 + ..\..\Dcu\D20\win64;$(DCC_UnitSearchPath) + ..\..\Dcu\D20\win64 + ..\..\Dcu\D20\win64 + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + vcl;$(DCC_UsePackage) + + + ..\..\Dcu\D20\win32 + ..\..\Dcu\D20\win32;$(DCC_UnitSearchPath) + ..\..\Dcu\D20\win32 + ..\..\Dcu\D20\win32 + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + vcl;DataAbstract_Scripting_D20;PascalScript_Core_D20;$(DCC_UsePackage) + + + false + RELEASE;$(DCC_Define) + 0 + false + + + DEBUG;$(DCC_Define) + false + true + + + true + + + + MainSource + + + + + + + + + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + + Delphi.Personality.12 + Package + + + + DataAbstract_Scripting_D20.dpk + + + + True + False + 3 + 0 + 1 + 361 + False + False + False + False + False + 1033 + 1252 + + + RemObjects Software + + 3.0.1.361 + + + + + RemObjects SDK + 1.0.0.0 + + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + True + True + + + 12 + + + diff --git a/Addon/DataAbstract/DataAbstract_Scripting_D20.res b/Addon/DataAbstract/DataAbstract_Scripting_D20.res new file mode 100644 index 0000000000000000000000000000000000000000..854028b29b9366d58ee41ef0c8ca6b036f70f1da GIT binary patch literal 588 zcma))%}T>S6ot>US+w2g!UyQWrIbp8Ac#_|KgC~S=vJauiP%KaiuiE8K_A1tZ(#gp zhERVty>MslojLd1lRJ^5HeQzA34ht#RQIc3NU*M&K?RzdkZ`0cU9%o2A{y#K=j21y zLt<<1!RMD`>+4F5-96Wyy~He`KXIvBHaIZw%~U8=rU%$kJ!uScrhDa}8V=J{h^lQo zM1xgytTk%)!A$h51pFIn60))5j@Tz?yU`=jEj^}c(<_H}rdN=KLxyU>Q}rEjR)9>w zWsaw(4qZFi#CzIemv*&6%_YcOcY1N`%k&=T#Bqjd{Hy=l+4i%2y-Ncs4KHAIS85ki zlGfdXV{Yv%rc5#6I~U*43_gMy96NYfworenzGC-&k + + {5DF52809-FD88-4459-9EE6-7D9C833B66C6} + PascalScript_RO_D20.dpk + True + Debug + DCC32 + 13.4 + none + Win32 + Package + 3 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) + true + 1033 + CompanyName=RemObjects Software;FileDescription=;FileVersion=3.0.6.442;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=Pascal Script;ProductVersion=3.0.0.0;Comments=;CompileDate=Tuesday, March 21, 2006 1:32 PM + 3 + 6 + 442 + true + 00400000 + true + RemObjects Pascal Script - RemObjects SDK 5.0 Integration + true + false + true + false + false + false + false + + + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + + + ..\..\Dcu\D20\win32;..\..\RemObjects SDK for Delphi\Dcu\D20\win32;$(DCC_UnitSearchPath) + ..\..\Dcu\D20\win32 + ..\..\Dcu\D20\win32 + ..\..\Dcu\D20\win32 + + + false + RELEASE;$(DCC_Define) + 0 + false + + + DEBUG;$(DCC_Define) + false + true + + + true + + + RemObjects Pascal Script - RemObjects SDK Integration + + + + MainSource + + + + + + + + + + + + + + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + + Delphi.Personality.12 + Package + + + + PascalScript_RO_D20.dpk + + + + True + False + 3 + 0 + 6 + 442 + False + False + False + False + False + 1033 + 1252 + + + RemObjects Software + + 3.0.6.442 + + + + + Pascal Script + 3.0.0.0 + + Tuesday, March 21, 2006 1:32 PM + + + + True + True + + + 12 + + + diff --git a/Addon/RemObjects SDK/PascalScript_RO_D20.res b/Addon/RemObjects SDK/PascalScript_RO_D20.res new file mode 100644 index 0000000000000000000000000000000000000000..1ea58a1c5d57b91aeec4cd154823f672fcb293e3 GIT binary patch literal 680 zcmZXS%}T>S6opUPAhru};R9shq6;ap4T2(wSbqvuOAOs=ZK77}4{3|^4SXiSw{h^d{d?BYp6%q`g&0U^H2{Ofr>50 zS0G>e%zzwBMi<&5_5{p8V|BsL$)?LLvD_j50lD4l8LNlJL>^irc&B;=nObC^GCa9% z2VV-Z4{m6A>Z+nz)gCk8tKmJ=1~F}rBgL9o_EqgR>=V3QYB8EUTi+O6!La@>_OEKL zX>@&J?qFHgnsulF`_xt-MdXm67~`932XqT7MfVB2rd{i+!R1qj$NoTd{2n#5;BPP; zZr8-*omk$0v~6!M;?(qcLRCh4*`t#C>GF)|i+N*ZSTA) + + {EA463298-00FA-42B3-87EB-DD289B924EA0} + PascalScript_Core_D20.dpk + True + Debug + DCC32 + 14.2 + VCL + Win32 + Package + 3 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + rtl;dbrtl;$(DCC_UsePackage) + 673 + CompanyName=RemObjects Software;FileDescription=;FileVersion=3.0.29.673;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=Pascal Script;ProductVersion=3.0.0.0;Comments=;CompileDate=Friday, March 21, 2008 1:24 PM + 1033 + 3 + System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;Winapi;$(DCC_Namespace) + true + 29 + 00400000 + true + true + RemObjects Pascal Script - Core Package + true + false + true + false + false + false + false + + + ..\Dcu\D20\win64 + ..\Dcu\D20\win64;$(DCC_UnitSearchPath) + ..\Dcu\D20\win64 + ..\Dcu\D20\win64 + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + vcl;$(DCC_UsePackage) + + + System.Win;$(DCC_Namespace) + ..\Dcu\D20\win32 + ..\Dcu\D20\win32;$(DCC_UnitSearchPath) + ..\Dcu\D20\win32 + ..\Dcu\D20\win32 + vcl;PascalScript_Core_D20;$(DCC_UsePackage) + + + false + RELEASE;$(DCC_Define) + 0 + false + + + DEBUG;$(DCC_Define) + false + true + + + true + + + + MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + + Delphi.Personality.12 + Package + + + + PascalScript_Core_D20.dpk + + + + True + False + 3 + 0 + 29 + 673 + False + False + False + False + False + 1033 + 1252 + + + RemObjects Software + + 3.0.29.673 + + + + + Pascal Script + 3.0.0.0 + + Friday, March 21, 2008 1:24 PM + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + True + True + + + 12 + + + diff --git a/Source/PascalScript_Core_D20.res b/Source/PascalScript_Core_D20.res new file mode 100644 index 0000000000000000000000000000000000000000..cbd3d2c8b29011386d89a5bf7ecc6a3dfcdccdff GIT binary patch literal 684 zcmZXS%T5A85JfLA3(>^5aBF1YazX}};3Fi4fDaN8f`p|8c_>C688C)l@Gtxj|Hi$4 z;CQ+x6Hq&;?&|7W_jXmcBxSHLj12eJaFg-*4w!^J^OSaCkel>zJG#*w^O;(BH8ph2 zzQ%lxZ^no7^(~qFl-`qjb~W)+GcgQd#BR5CdLxj4Z=paVP4ocUNY5I;Jkd~7P(zFH z;jBs;EO1Y`mmx@|vKh>g&ZStm`*Xm=o<%kJ0Vf8fR#W`)~Zq z{i_`78f}l9TkWsa8+EA)`@&WsDlk3l6Isedv5ps@`iP%b&c^aEc{(DJ(+N=@uL;tO zDwg1dO;+5E)hkE`_66IVnqJST%4o0ply*KHzLH8<7;eIQrLx*^HTW}iyfW(ruh*s< K(OCayDMCNpBwGvs literal 0 HcmV?d00001 diff --git a/Source/eDefines.inc b/Source/eDefines.inc index 12adb9e..1d50714 100644 --- a/Source/eDefines.inc +++ b/Source/eDefines.inc @@ -432,14 +432,12 @@ {$DEFINE DELPHI15UP} {$DEFINE DELPHIXE} - {$DEFINE DELPHIXEUP} - {$DEFINE DELPHI2011} {$DEFINE DELPHI2005UP} {$DEFINE DELPHI2006UP} {$DEFINE DELPHI2007UP} {$DEFINE DELPHI2009UP} {$DEFINE DELPHI2010UP} - {$DEFINE DELPHI2011UP} + {$DEFINE DELPHIXEUP} {$DEFINE BDS} {$DEFINE BDS8} {$DEFINE BDS3UP} @@ -474,16 +472,14 @@ {$DEFINE DELPHI16UP} {$DEFINE DELPHIXE2} - {$DEFINE DELPHIXEUP} - {$DEFINE DELPHIXE2UP} - {$DEFINE DELPHI2012} {$DEFINE DELPHI2005UP} {$DEFINE DELPHI2006UP} {$DEFINE DELPHI2007UP} {$DEFINE DELPHI2009UP} {$DEFINE DELPHI2010UP} - {$DEFINE DELPHI2011UP} - {$DEFINE DELPHI2012UP} + {$DEFINE DELPHIXEUP} + {$DEFINE DELPHIXE2UP} + {$DEFINE BDS} {$DEFINE BDS9} {$DEFINE BDS3UP} @@ -526,18 +522,15 @@ {$DEFINE DELPHI17UP} {$DEFINE DELPHIXE3} - {$DEFINE DELPHIXEUP} - {$DEFINE DELPHIXE2UP} - {$DEFINE DELPHIXE3UP} - {$DEFINE DELPHI2013} {$DEFINE DELPHI2005UP} {$DEFINE DELPHI2006UP} {$DEFINE DELPHI2007UP} {$DEFINE DELPHI2009UP} {$DEFINE DELPHI2010UP} - {$DEFINE DELPHI2011UP} - {$DEFINE DELPHI2012UP} - {$DEFINE DELPHI2013UP} + {$DEFINE DELPHIXEUP} + {$DEFINE DELPHIXE2UP} + {$DEFINE DELPHIXE3UP} + {$DEFINE BDS} {$DEFINE BDS10} {$DEFINE BDS3UP} @@ -581,20 +574,16 @@ {$DEFINE DELPHI18UP} {$DEFINE DELPHIXE4} - {$DEFINE DELPHIXEUP} - {$DEFINE DELPHIXE2UP} - {$DEFINE DELPHIXE3UP} - {$DEFINE DELPHIXE4UP} - {$DEFINE DELPHI2014} {$DEFINE DELPHI2005UP} {$DEFINE DELPHI2006UP} {$DEFINE DELPHI2007UP} {$DEFINE DELPHI2009UP} {$DEFINE DELPHI2010UP} - {$DEFINE DELPHI2011UP} - {$DEFINE DELPHI2012UP} - {$DEFINE DELPHI2013UP} - {$DEFINE DELPHI2014UP} + {$DEFINE DELPHIXEUP} + {$DEFINE DELPHIXE2UP} + {$DEFINE DELPHIXE3UP} + {$DEFINE DELPHIXE4UP} + {$DEFINE BDS} {$DEFINE BDS11} {$DEFINE BDS3UP} @@ -640,20 +629,17 @@ {$DEFINE DELPHI19UP} {$DEFINE DELPHIXE5} - {$DEFINE DELPHIXEUP} - {$DEFINE DELPHIXE2UP} - {$DEFINE DELPHIXE3UP} - {$DEFINE DELPHIXE4UP} - {$DEFINE DELPHIXE5UP} {$DEFINE DELPHI2005UP} {$DEFINE DELPHI2006UP} {$DEFINE DELPHI2007UP} {$DEFINE DELPHI2009UP} {$DEFINE DELPHI2010UP} - {$DEFINE DELPHI2011UP} - {$DEFINE DELPHI2012UP} - {$DEFINE DELPHI2013UP} - {$DEFINE DELPHI2014UP} + {$DEFINE DELPHIXEUP} + {$DEFINE DELPHIXE2UP} + {$DEFINE DELPHIXE3UP} + {$DEFINE DELPHIXE4UP} + {$DEFINE DELPHIXE5UP} + {$DEFINE BDS} {$DEFINE BDS12} @@ -676,6 +662,66 @@ {$ENDIF} {$ENDIF} +{ defines for Delphi XE6 } +{$IFDEF VER270} + {$DEFINE VER140UP} + {$DEFINE DELPHI} + + {$DEFINE DELPHI20} + {$DEFINE DELPHI1UP} + {$DEFINE DELPHI2UP} + {$DEFINE DELPHI3UP} + {$DEFINE DELPHI4UP} + {$DEFINE DELPHI5UP} + {$DEFINE DELPHI6UP} + {$DEFINE DELPHI7UP} + {$DEFINE DELPHI9UP} + {$DEFINE DELPHI10UP} + {$DEFINE DELPHI11UP} + {$DEFINE DELPHI12UP} + {$DEFINE DELPHI14UP} + {$DEFINE DELPHI15UP} + {$DEFINE DELPHI16UP} + {$DEFINE DELPHI17UP} + {$DEFINE DELPHI18UP} + {$DEFINE DELPHI19UP} + {$DEFINE DELPHI20UP} + + {$DEFINE DELPHIXE6} + {$DEFINE DELPHI2005UP} + {$DEFINE DELPHI2006UP} + {$DEFINE DELPHI2007UP} + {$DEFINE DELPHI2009UP} + {$DEFINE DELPHI2010UP} + {$DEFINE DELPHIXEUP} + {$DEFINE DELPHIXE2UP} + {$DEFINE DELPHIXE3UP} + {$DEFINE DELPHIXE4UP} + {$DEFINE DELPHIXE5UP} + {$DEFINE DELPHIXE6UP} + + {$DEFINE BDS} + {$DEFINE BDS14} + {$DEFINE BDS3UP} + {$DEFINE BDS4UP} + {$DEFINE BDS5UP} + {$DEFINE BDS6UP} + {$DEFINE BDS7UP} + {$DEFINE BDS8UP} + {$DEFINE BDS9UP} + {$DEFINE BDS10UP} + {$DEFINE BDS11UP} + {$DEFINE BDS12UP} + {$DEFINE BDS14UP} + {$IFDEF CPUX64} + {$DEFINE 64BIT} + {$DEFINE CPU64} + {$ELSE} + {$DEFINE 32BIT} + {$DEFINE CPU32} + {$ENDIF} +{$ENDIF} + { defines for "Delphi for .NET" } {$IFDEF CLR}