Menu
▾
▴
[JVCL-Checkins] SF.net SVN: jvcl: [11324] branches/JVCL3_32_PREPARATION
|
From: <ob...@us...> - 2007-06-17 13:43:17
|
Revision: 11324
http://svn.sourceforge.net/jvcl/?rev=11324&view=rev
Author: obones
Date: 2007-06-17 06:43:09 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
Changes for CBuilder 2007 support.
Modified Paths:
--------------
branches/JVCL3_32_PREPARATION/common/JvWin32.pas
branches/JVCL3_32_PREPARATION/common/SetupApi.pas
branches/JVCL3_32_PREPARATION/common/jvcl.inc
branches/JVCL3_32_PREPARATION/install/JVCLInstall/Compile.pas
branches/JVCL3_32_PREPARATION/install/JVCLInstall/DelphiData.pas
branches/JVCL3_32_PREPARATION/install/JVCLInstall/JVCLData.pas
branches/JVCL3_32_PREPARATION/install/release/announce.txt
branches/JVCL3_32_PREPARATION/install/release/announce_fr.txt
branches/JVCL3_32_PREPARATION/packages/d11/JvHMID11R.dpk
branches/JVCL3_32_PREPARATION/packages/d11/JvMMD11R.dpk
branches/JVCL3_32_PREPARATION/run/JVCLVer.pas
Modified: branches/JVCL3_32_PREPARATION/common/JvWin32.pas
===================================================================
--- branches/JVCL3_32_PREPARATION/common/JvWin32.pas 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/common/JvWin32.pas 2007-06-17 13:43:09 UTC (rev 11324)
@@ -75,6 +75,9 @@
{$ENDIF !COMPILER7_UP}
CS_DROPSHADOW = $00020000;
+ {$IFDEF DELPHI11_UP}
+ {$EXTERNALSYM CS_DROPSHADOW}
+ {$ENDIF DELPHI11_UP}
//==========================================================================
{$IFDEF VCL}
Modified: branches/JVCL3_32_PREPARATION/common/SetupApi.pas
===================================================================
--- branches/JVCL3_32_PREPARATION/common/SetupApi.pas 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/common/SetupApi.pas 2007-06-17 13:43:09 UTC (rev 11324)
@@ -445,11 +445,18 @@
SPFILENOTIFY_STARTREGISTRATION = $00000019;
SPFILENOTIFY_ENDREGISTRATION = $00000020;
+ {$IFDEF COMPILER11_UP}
+ {$EXTERNALSYM SPFILENOTIFY_STARTREGISTRATION}
+ {$EXTERNALSYM SPFILENOTIFY_ENDREGISTRATION}
+ {$ENDIF COMPILER11_UP}
//
// Extended notification for SetupScanFileQueue(Flags=SPQ_SCAN_USE_CALLBACK_SIGNERINFO)
//
SPFILENOTIFY_QUEUESCAN_SIGNERINFO = $00000040;
+ {$IFDEF COMPILER11_UP}
+ {$EXTERNALSYM SPFILENOTIFY_QUEUESCAN_SIGNERINFO}
+ {$ENDIF COMPILER11_UP}
//
// Copy notification. These are bit flags that may be combined.
@@ -1300,6 +1307,10 @@
end;
{$EXTERNALSYM SP_MOVEDEV_PARAMS}
TSPMoveDevParams = SP_MOVEDEV_PARAMS;
+ {$IFDEF COMPILER11_UP}
+ {$EXTERNALSYM PSPMoveDevParams}
+ {$EXTERNALSYM TSPMoveDevParams}
+ {$ENDIF COMPILER11_UP}
//
// Values indicating a change in a device's state
@@ -2484,6 +2495,9 @@
// Flags used by SetupUninstallOEMInf
//
SUOI_FORCEDELETE = $00000001;
+ {$IFDEF COMPILER11_UP}
+ {$EXTERNALSYM SUOI_FORCEDELETE}
+ {$ENDIF COMPILER11_UP}
//
// Flags for SetupCreateDiskSpaceList
//
@@ -2538,7 +2552,7 @@
FLG_ADDREG_KEYONLY_COMMON = $00002000; // same as FLG_ADDREG_KEYONLY but also works for DELREG
{$EXTERNALSYM FLG_ADDREG_KEYONLY_COMMON}
FLG_ADDREG_32BITKEY = $00004000; // make this change in the 32 bit registry.
- {$EXTERNALSYM FLG_ADDREG_OVERWRITEONLY}
+ {$EXTERNALSYM FLG_ADDREG_32BITKEY}
//
// The INF may supply any arbitrary data type ordinal in the highword except
// for the following: REG_NONE, REG_SZ, REG_EXPAND_SZ, REG_MULTI_SZ. If this
Modified: branches/JVCL3_32_PREPARATION/common/jvcl.inc
===================================================================
--- branches/JVCL3_32_PREPARATION/common/jvcl.inc 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/common/jvcl.inc 2007-06-17 13:43:09 UTC (rev 11324)
@@ -117,12 +117,12 @@
{$ENDIF BCB6}
{-----------------------------------------------------------------------------}
{$IFDEF BCB10}
- {$I jvclc10.inc}
+ {$I jvcld10.inc} // same include file for BDS based C++
{$DEFINE JVCL_CONFIGURED}
{$ENDIF BCB10}
{-----------------------------------------------------------------------------}
{$IFDEF BCB11}
- {$I jvclc11.inc}
+ {$I jvcld11.inc} // same include file for BDS based C++
{$DEFINE JVCL_CONFIGURED}
{$ENDIF BCB11}
{-----------------------------------------------------------------------------}
Modified: branches/JVCL3_32_PREPARATION/install/JVCLInstall/Compile.pas
===================================================================
--- branches/JVCL3_32_PREPARATION/install/JVCLInstall/Compile.pas 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/install/JVCLInstall/Compile.pas 2007-06-17 13:43:09 UTC (rev 11324)
@@ -1588,7 +1588,7 @@
Project := ProjectOrder[i];
CaptureLinePackageCompilation('[Compiling: ' + Project.TargetName + ']', FAborted);
- if TargetConfig.Target.IsBCB then
+ if TargetConfig.Target.IsBCB and not TargetConfig.Target.IsBDS then
begin
if CompileCppPackage(TargetConfig, Project, DccOpt, '', '', DebugUnits) <> 0 then
begin
Modified: branches/JVCL3_32_PREPARATION/install/JVCLInstall/DelphiData.pas
===================================================================
--- branches/JVCL3_32_PREPARATION/install/JVCLInstall/DelphiData.pas 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/install/JVCLInstall/DelphiData.pas 2007-06-17 13:43:09 UTC (rev 11324)
@@ -111,6 +111,7 @@
FInstalledPersonalities: TStrings;
FGlobalIncludePaths: TStringList;
FGlobalCppSearchPaths: TStringList;
+ FGlobalCppLibraryPaths: TStringList;
FOrgEnvVars: TStrings;
FEnvVars: TStrings;
@@ -219,6 +220,7 @@
property DebugDcuPaths: TStringList read FDebugDcuPaths; // with macros
property GlobalIncludePaths: TStringList read FGlobalIncludePaths; // BDS only, with macros
property GlobalCppSearchPaths: TStringList read FGlobalCppSearchPaths; // BDS only, with macros
+ property GlobalCppLibraryPaths: TStringList read FGlobalCppLibraryPaths; // BDS v5 and upper only, with macros
property BDSProjectsDir: string read GetBDSProjectsDir;
property CommonProjectsDir: string read GetCommonProjectsDir;
@@ -505,6 +507,7 @@
FDebugDcuPaths := TStringList.Create;
FGlobalIncludePaths := TStringList.Create;
FGlobalCppSearchPaths := TStringList.Create;
+ FGlobalCppLibraryPaths := TStringList.Create;
FBrowsingPaths.Duplicates := dupIgnore;
FPackageSearchPaths.Duplicates := dupIgnore;
@@ -512,6 +515,7 @@
FDebugDcuPaths.Duplicates := dupIgnore;
FGlobalIncludePaths.Duplicates := dupIgnore;
FGlobalCppSearchPaths.Duplicates := dupIgnore;
+ FGlobalCppLibraryPaths.Duplicates := dupIgnore;
FDisabledPackages := TDelphiPackageList.Create;
FKnownIDEPackages := TDelphiPackageList.Create;
@@ -533,6 +537,7 @@
FDebugDcuPaths.Free;
FGlobalIncludePaths.Free;
FGlobalCppSearchPaths.Free;
+ FGlobalCppLibraryPaths.Free;
FDisabledPackages.Free;
FKnownIDEPackages.Free;
@@ -801,6 +806,22 @@
Reg.CloseKey;
end;}
+ // Must read personalities before using library paths.
+ if IsBDS and Reg.OpenKeyReadOnly(RegistryKey + '\Personalities') then
+ begin
+ Reg.GetValueNames(FInstalledPersonalities);
+ Reg.CloseKey;
+ end;
+
+ // IDE Version 5 comes in two flavors:
+ // - Delphi only (Spacely)
+ // - C++ Builder only (Cogswell)
+ // In the second case the product name is "C++ Builder" and not "Delphi"
+ // Right now, the name of an installation of Cogswell on top of Spacely
+ // is not yet known and a way to detect it will have to be thought of.
+ if (IDEVersion = 5) and SupportsPersonalities([persBCB]) then
+ FName := 'Codegear C++ Builder for Win32';
+
// get library paths
if IsBDS and (IDEVersion >= 5) then
begin
@@ -816,7 +837,10 @@
PropertyNode := PropertyGroupNode.Items.ItemNamed['Win32DCPOutput']; // do not localize
if Assigned(PropertyNode) then
FDCPOutputDir := ExcludeTrailingPathDelimiter(PropertyNode.Value);
- PropertyNode := PropertyGroupNode.Items.ItemNamed['Win32DLLOutputPath']; // do not localize
+ if (IDEVersion = 5) and SupportsPersonalities([persBCB]) then
+ PropertyNode := PropertyGroupNode.Items.ItemNamed['CBuilderBPLOutputPath'] // do not localize
+ else
+ PropertyNode := PropertyGroupNode.Items.ItemNamed['Win32DLLOutputPath']; // do not localize
if Assigned(PropertyNode) then
FBPLOutputDir := ExcludeTrailingPathDelimiter(PropertyNode.Value);
PropertyNode := PropertyGroupNode.Items.ItemNamed['Win32BrowsingPath']; // do not localize
@@ -831,6 +855,20 @@
PropertyNode := PropertyGroupNode.Items.ItemNamed['Win32DebugDCUPath']; // do not localize
if Assigned(PropertyNode) then
ConvertPathList(PropertyNode.Value, FDebugDcuPaths);
+
+
+ if (IDEVersion = 5) and SupportsPersonalities([persBCB]) then
+ begin
+ PropertyNode := PropertyGroupNode.Items.ItemNamed['CBuilderIncludePath']; // do not localize
+ if Assigned(PropertyNode) then
+ ConvertPathList(PropertyNode.Value, FGlobalIncludePaths); // do not localize
+ PropertyNode := PropertyGroupNode.Items.ItemNamed['Win32LibraryPath']; // do not localize
+ if Assigned(PropertyNode) then
+ ConvertPathList(PropertyNode.Value, FGlobalCppSearchPaths); // do not localize
+ PropertyNode := PropertyGroupNode.Items.ItemNamed['CBuilderLibraryPath']; // do not localize
+ if Assigned(PropertyNode) then
+ ConvertPathList(PropertyNode.Value, FGlobalCppLibraryPaths); // do not localize
+ end;
end;
finally
EnvOptions.Free;
@@ -855,18 +893,14 @@
ConvertPathList(Reg.ReadString('Debug DCUs Path'), FDebugDcuPaths); // do not localize
Reg.CloseKey;
end;
- if IsBDS and Reg.OpenKeyReadOnly(RegistryKey + '\CppPaths') then // do not localize
+ if IsBDS and Reg.OpenKeyReadOnly(RegistryKey + '\CppPaths') then // do not localize
begin
ConvertPathList(Reg.ReadString('IncludePath'), FGlobalIncludePaths); // do not localize
ConvertPathList(Reg.ReadString('SearchPath'), FGlobalCppSearchPaths); // do not localize
+
Reg.CloseKey;
end;
end;
- if IsBDS and Reg.OpenKeyReadOnly(RegistryKey + '\Personalities') then
- begin
- Reg.GetValueNames(FInstalledPersonalities);
- Reg.CloseKey;
- end;
finally
Reg.Free;
end;
@@ -990,6 +1024,12 @@
PropertyGroupNode.Items.ItemNamed['Win32LibraryPath'].Value := ConvertPathList(FSearchPaths); // do not localize
PropertyGroupNode.Items.ItemNamed['Win32DebugDCUPath'].Value := ConvertPathList(FDebugDcuPaths); // do not localize
+ if (IDEVersion = 5) and SupportsPersonalities([persBCB]) then
+ begin
+ PropertyGroupNode.Items.ItemNamed['CBuilderIncludePath'].Value := ConvertPathList(FGlobalIncludePaths); // do not localize
+ PropertyGroupNode.Items.ItemNamed['CBuilderLibraryPath'].Value := ConvertPathList(FGlobalCppLibraryPaths); // do not localize
+ end;
+
EnvOptions.SaveToFile(GetEnvOptionsFileName);
finally
EnvOptions.Free;
@@ -1014,7 +1054,9 @@
Reg.WriteString('Debug DCUs Path', S); // do not localize
Reg.CloseKey;
end;
- if IsBDS and Reg.OpenKey(RegistryKey + '\CppPaths', False) then // meight not exist
+ if IsBDS and
+ (((IDEVersion >= 5) and Reg.OpenKey(RegistryKey + '\C++\Paths', False)) or // might not exist // do not localize
+ Reg.OpenKey(RegistryKey + '\CppPaths', False)) then // might not exist // do not localize
begin
S := ConvertPathList(FGlobalIncludePaths);
if not Reg.ValueExists('IncludePath') or (S <> Reg.ReadString('IncludePath')) then
@@ -1022,6 +1064,9 @@
S := ConvertPathList(FGlobalCppSearchPaths);
if not Reg.ValueExists('SearchPath') or (S <> Reg.ReadString('SearchPath')) then
Reg.WriteString('SearchPath', S);
+ S := ConvertPathList(FGlobalCppLibraryPaths);
+ if not Reg.ValueExists('LibraryPath') or (S <> Reg.ReadString('LibraryPath')) then
+ Reg.WriteString('LibraryPath', S);
Reg.CloseKey;
end;
@@ -1087,7 +1132,7 @@
begin
if IsBDS then
begin
- if SupportsPersonalities([persDelphi]) then
+ if SupportsPersonalities([persDelphi]) or (Version >= 4) then // Versions 4 and upper support dual mode packages
Result := 'D' // do not localize
else
if SupportsPersonalities([persBCB]) then
Modified: branches/JVCL3_32_PREPARATION/install/JVCLInstall/JVCLData.pas
===================================================================
--- branches/JVCL3_32_PREPARATION/install/JVCLInstall/JVCLData.pas 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/install/JVCLInstall/JVCLData.pas 2007-06-17 13:43:09 UTC (rev 11324)
@@ -1452,6 +1452,8 @@
[Target.InsertDirMacros(HppDir)]);
AddPaths(Target.GlobalCppSearchPaths, True, Owner.JVCLDir,
['Resources', Target.InsertDirMacros(UnitOutDir)]); // do not localize
+ AddPaths(Target.GlobalCppLibraryPaths, True, Owner.JVCLDir,
+ [Target.InsertDirMacros(UnitOutDir)]); // do not localize
end;
// add
@@ -1621,6 +1623,8 @@
[Target.InsertDirMacros(HppDir)]);
AddPaths(Target.GlobalCppSearchPaths, False, Owner.JVCLDir,
['Resources', Target.InsertDirMacros(UnitOutDir)]); // do not localize
+ AddPaths(Target.GlobalCppLibraryPaths, False, Owner.JVCLDir,
+ [Target.InsertDirMacros(UnitOutDir)]); // do not localize
end;
Target.SavePaths;
Modified: branches/JVCL3_32_PREPARATION/install/release/announce.txt
===================================================================
--- branches/JVCL3_32_PREPARATION/install/release/announce.txt 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/install/release/announce.txt 2007-06-17 13:43:09 UTC (rev 11324)
@@ -9,13 +9,13 @@
www.devarchive.com (needs username/password)
Subject:
-ANN: JVCL 3.31 Released!
+ANN: JVCL 3.32 Released!
Body:
-The JVCL Team is proud to announce that the stable release of JVCL 3.31 is available for download.
+The JVCL Team is proud to announce that the stable release of JVCL 3.32 is available for download.
-JVCL is a library of more than 600 visual and non-visual components for Delphi 5, 6, 7, 2005, 2006 and 2007; C++Builder 5, 6 and 2006 (Borland Developer Studio). JVCL is distributed subject to the Mozilla Public License Version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html) and is completely free for all developers (open source, shareware or commercial) and includes the full source to all components.
+JVCL is a library of more than 600 visual and non-visual components for Delphi 5, 6, 7, 2005, 2006 and 2007; C++Builder 5, 6, 2006 and 2007. JVCL is distributed subject to the Mozilla Public License Version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html) and is completely free for all developers (open source, shareware or commercial) and includes the full source to all components.
-This release brings official support for Delphi 2007.
+This release brings official support for C++Builder 2007.
This release is available in four different flavors:
- Full install + latest JCL
@@ -23,7 +23,7 @@
- Source and examples only
- Source only
-The current version is JVCL 3.31.
+The current version is JVCL 3.32.
The JVCL Team
Modified: branches/JVCL3_32_PREPARATION/install/release/announce_fr.txt
===================================================================
--- branches/JVCL3_32_PREPARATION/install/release/announce_fr.txt 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/install/release/announce_fr.txt 2007-06-17 13:43:09 UTC (rev 11324)
@@ -5,13 +5,13 @@
Sujet:
-ANN: JVCL 3.31 est disponible
+ANN: JVCL 3.32 est disponible
Corps:
-L'\xE9quipe JVCL est fi\xE8re d'annoncer la sortie de la version stable de la biblioth\xE8que de composants JVCL version 3.31.
+L'\xE9quipe JVCL est fi\xE8re d'annoncer la sortie de la version stable de la biblioth\xE8que de composants JVCL version 3.32.
-La JVCL est une biblioth\xE8que comprenant environ 600 composants visuels et non-visuels pour Delphi 5, 6, 7, 2005, 2006 et 2007; C++Builder 5, 6 et 2006 (Borland Developper Studio). La JVCL est distribu\xE9 sous licence Mozilla Public License Version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html), est enti\xE8rement gratuite pour toute utilisation (open source, shareware ou commerciale) et inclus le code source de tous les composants.
+La JVCL est une biblioth\xE8que comprenant environ 600 composants visuels et non-visuels pour Delphi 5, 6, 7, 2005, 2006 et 2007; C++Builder 5, 6, 2006 et 2007. La JVCL est distribu\xE9 sous licence Mozilla Public License Version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html), est enti\xE8rement gratuite pour toute utilisation (open source, shareware ou commerciale) et inclus le code source de tous les composants.
-Cette version apport le support de Delphi 2007
+Cette version apport le support de C++Builder 2007
Cette sortie est disponible en quatre distributions :
- Installation compl\xE8te + derni\xE8re JCL
@@ -19,7 +19,7 @@
- Source et exemples
- Source uniquement
-La version actuelle est JVCL 3.31.
+La version actuelle est JVCL 3.32.
Modified: branches/JVCL3_32_PREPARATION/packages/d11/JvHMID11R.dpk
===================================================================
--- branches/JVCL3_32_PREPARATION/packages/d11/JvHMID11R.dpk 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/packages/d11/JvHMID11R.dpk 2007-06-17 13:43:09 UTC (rev 11324)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JvHMI-R.xml)
- Last generated: 15-04-2007 11:00:14 UTC
+ Last generated: 30-05-2007 20:38:51 UTC
-----------------------------------------------------------------------------
}
@@ -37,7 +37,6 @@
{$I JVCL.INC}
requires
- Jv3rdD11R,
JvCoreD11R,
JCL,
JCLVCL,
Modified: branches/JVCL3_32_PREPARATION/packages/d11/JvMMD11R.dpk
===================================================================
--- branches/JVCL3_32_PREPARATION/packages/d11/JvMMD11R.dpk 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/packages/d11/JvMMD11R.dpk 2007-06-17 13:43:09 UTC (rev 11324)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JvMM-R.xml)
- Last generated: 15-04-2007 11:00:14 UTC
+ Last generated: 30-05-2007 20:38:51 UTC
-----------------------------------------------------------------------------
}
@@ -37,7 +37,6 @@
{$I JVCL.INC}
requires
- Jv3rdD11R,
JvCoreD11R,
JvCtrlsD11R,
JvSystemD11R,
Modified: branches/JVCL3_32_PREPARATION/run/JVCLVer.pas
===================================================================
--- branches/JVCL3_32_PREPARATION/run/JVCLVer.pas 2007-06-17 13:01:38 UTC (rev 11323)
+++ branches/JVCL3_32_PREPARATION/run/JVCLVer.pas 2007-06-17 13:43:09 UTC (rev 11324)
@@ -46,9 +46,9 @@
{$ENDIF UNITVERSIONING}
const
- sJVCLVersion = '3.31';
+ sJVCLVersion = '3.32';
JVCLVersionMajor = 3; // 0=pre-release|beta/1, 2, ...=final
- JVCLVersionMinor = 31; // minor release
+ JVCLVersionMinor = 32; // minor release
JVCLVersionRelease = 0; // 0: pre-release|beta/>=1: release
JVCLVersionBuild = 0; // build number, days since march 1, 2006
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|