From: <ah...@us...> - 2008-11-03 22:47:27
|
Revision: 12032 http://jvcl.svn.sourceforge.net/jvcl/?rev=12032&view=rev Author: ahuser Date: 2008-11-03 22:47:18 +0000 (Mon, 03 Nov 2008) Log Message: ----------- - Removed Jv3rd-R package, file(s) moved to JvCore-R - Added JVCLInstallStarter as workaround for Vista's behavior that sends the Installer to the back instead of the front. - Added default jvcld12.inc - Added SVN properties to lib\d12, lib\d12\debug - Installer now allows to compile even if the packages are loaded - Installer now allows to delete removed package/unit before the compilation - Removed CLX support from the installer - Compile dialog now stays on top of the main form Modified Paths: -------------- trunk/jvcl/install/JVCLInstall/Compile.pas trunk/jvcl/install/JVCLInstall/Frames/FrmInstall.pas trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.dfm trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.pas trunk/jvcl/install/JVCLInstall/InstallerConsts.pas trunk/jvcl/install/JVCLInstall/Intf.pas trunk/jvcl/install/JVCLInstall/JVCLData.pas trunk/jvcl/install/JVCLInstall/PackageUtils.pas trunk/jvcl/install/JVCLInstall/Pages/PgSummary.pas trunk/jvcl/install.bat trunk/jvcl/packages/c5/JvCoreC5R.bpk trunk/jvcl/packages/c5/JvCoreC5R.cpp trunk/jvcl/packages/c5/JvCoreC5R.dpk trunk/jvcl/packages/c5std/JvCoreC5R.bpk trunk/jvcl/packages/c5std/JvCoreC5R.cpp trunk/jvcl/packages/c5std/JvCoreC5R.dpk trunk/jvcl/packages/c6/JvCoreC6R.bpk trunk/jvcl/packages/c6/JvCoreC6R.dpk trunk/jvcl/packages/c6per/JvCoreC6R.bpk trunk/jvcl/packages/c6per/JvCoreC6R.dpk trunk/jvcl/packages/d10/JvCoreD10R.dpk trunk/jvcl/packages/d10per/JvCoreD10R.dpk trunk/jvcl/packages/d11/JvCoreD11R.dpk trunk/jvcl/packages/d12/JvCoreD12R.dpk trunk/jvcl/packages/d5/JvCoreD5R.dpk trunk/jvcl/packages/d5std/JvCoreD5R.dpk trunk/jvcl/packages/d6/JvCoreD6R.dpk trunk/jvcl/packages/d6per/JvCoreD6R.dpk trunk/jvcl/packages/d7/JvCoreD7R.dpk trunk/jvcl/packages/d7per/JvCoreD7R.dpk trunk/jvcl/packages/d9/JvCoreD9R.dpk trunk/jvcl/packages/d9per/JvCoreD9R.dpk trunk/jvcl/packages/xml/JvCore-R.xml Added Paths: ----------- trunk/jvcl/common/jvcld12.inc Removed Paths: ------------- trunk/jvcl/packages/c5/Jv3rdC5R.bpk trunk/jvcl/packages/c5/Jv3rdC5R.cpp trunk/jvcl/packages/c5/Jv3rdC5R.dpk trunk/jvcl/packages/c5/Jv3rdC5R.rc trunk/jvcl/packages/c5/Jv3rdC5R.res trunk/jvcl/packages/c6/Jv3rdC6R.bpk trunk/jvcl/packages/c6/Jv3rdC6R.cpp trunk/jvcl/packages/c6/Jv3rdC6R.dpk trunk/jvcl/packages/c6/Jv3rdC6R.rc trunk/jvcl/packages/c6/Jv3rdC6R.res trunk/jvcl/packages/d10/Jv3rdD10R.bdsproj trunk/jvcl/packages/d10/Jv3rdD10R.dof trunk/jvcl/packages/d10/Jv3rdD10R.dpk trunk/jvcl/packages/d10/Jv3rdD10R.rc trunk/jvcl/packages/d10/Jv3rdD10R.res trunk/jvcl/packages/d11/Jv3rdD11R.dpk trunk/jvcl/packages/d11/Jv3rdD11R.dproj trunk/jvcl/packages/d11/Jv3rdD11R.rc trunk/jvcl/packages/d11/Jv3rdD11R.res trunk/jvcl/packages/d12/Jv3rdD12R.dpk trunk/jvcl/packages/d12/Jv3rdD12R.dproj trunk/jvcl/packages/d12/Jv3rdD12R.rc trunk/jvcl/packages/d12/Jv3rdD12R.res trunk/jvcl/packages/d5/Jv3rdD5R.dof trunk/jvcl/packages/d5/Jv3rdD5R.dpk trunk/jvcl/packages/d5/Jv3rdD5R.rc trunk/jvcl/packages/d5/Jv3rdD5R.res trunk/jvcl/packages/d6/Jv3rdD6R.dof trunk/jvcl/packages/d6/Jv3rdD6R.dpk trunk/jvcl/packages/d6/Jv3rdD6R.rc trunk/jvcl/packages/d6/Jv3rdD6R.res trunk/jvcl/packages/d7/Jv3rdD7R.dof trunk/jvcl/packages/d7/Jv3rdD7R.dpk trunk/jvcl/packages/d7/Jv3rdD7R.rc trunk/jvcl/packages/d7/Jv3rdD7R.res trunk/jvcl/packages/d9/Jv3rdD9R.bdsproj trunk/jvcl/packages/d9/Jv3rdD9R.dof trunk/jvcl/packages/d9/Jv3rdD9R.dpk trunk/jvcl/packages/d9/Jv3rdD9R.rc trunk/jvcl/packages/d9/Jv3rdD9R.res trunk/jvcl/packages/xml/Jv3rd-R.xml Property Changed: ---------------- trunk/jvcl/lib/d12/ trunk/jvcl/lib/d12/debug/ Added: trunk/jvcl/common/jvcld12.inc =================================================================== --- trunk/jvcl/common/jvcld12.inc (rev 0) +++ trunk/jvcl/common/jvcld12.inc 2008-11-03 22:47:18 UTC (rev 12032) @@ -0,0 +1,152 @@ +{----------------------------------------------------------------------------- +The contents of this file are subject to the Mozilla Public License +Version 1.1 (the "License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/MPL-1.1.html + +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either expressed or implied. See the License for +the specific language governing rights and limitations under the License. + +The Original Code is: JVCL.INC, released on 2004-12-22. + +Last Modified: 2004-12-22 + +You may retrieve the latest version of this file at the Project JEDI's JVCL home page, +located at http://jvcl.sourceforge.net + +Known Issues: +-----------------------------------------------------------------------------} + +{------------------------------------------------------------------------------} +{ This file contains the default JVCL configuration. } +{------------------------------------------------------------------------------} + +{%hidden%} +{ Activate this define if you are using Delphi 5 Standard or one of the D6/D7 Personal Editions. } +{.$DEFINE DelphiPersonalEdition} + +{ Some new libraries and packages (currently JvUIB, JvWizard and JvTimeFrameWork) can be +installed either in "stand-alone" mode or in "JVCL" mode. These packages use the +USEJVCL define to determine whether they are installed in JVCL mode or not. +By default, this define is enabled. +NOTE: if you undefine USEJVCL, you can/should remove JvCoreXXX.dcp from the +requires node in the affected package(s). } +{$DEFINE USEJVCL} + +{ Enable this define if you have the dxgettext (http://dxgettext.sourceforge.net) +translation tool installed and want to use it with the JVCL. } +{.$DEFINE USE_DXGETTEXT} + +{ Enable this define if you use/have QuickReport } +{.$DEFINE JVCL_UseQuickReport} + +{ Enable this define if you have QReport 4 installed. This will require qr4rund7 instead +of qrpt. NB! JVCL_UseQuickReport must also be defined} +{.$DEFINE QREPORT4} + +{ Enable this define if you have installed the Internet Components with the Delphi installer } +{.$DEFINE INTERNET_COMPONENTS} + +{ Activate this define if you have Mike Lischke's Theme Manager +(http://www.lischke-online.de) installed and available and +you are using D6/BCB6 or below. The ThemeManager package must +be compiled as "never-build package". } +{$DEFINE JVCLThemesEnabled} + +{ Activates MIDAS components (DBRemoteLogin). +NOTE: if you activate this, you must also manually add JvDlgsXXX.dcp to +the requires node of JvDBXXX.bpk !!! } +{.$DEFINE Jv_MIDAS} + +{ This define enables GIF image support. Deactivate this define +if you are using another GIF image support library. } +{$DEFINE USE_JV_GIF} + +{ Activate this define if you do not want to use TGauge Borland sample +component in TDBProgress component and FileUtil routines. In this case +TProgressBar component will be used. } +{$DEFINE USE_PROGRESSBAR} + +{ This define controls whether FourDigitYear variable is used to control +date format in TDateEdit, TDBDateEdit components. When this define is not +active the ShortDateFormat variable is used instead. } +{$DEFINE USE_FOUR_DIGIT_YEAR} + +{ This define controls whether a popup calendar is used as default +instead of a modal dialog in TDateEdit, TDBDateEdit components. } +{$DEFINE DEFAULT_POPUP_CALENDAR} + +{ This define controls whether JvInterpreter handles +OLE automation calls (for VCL only). } +{$DEFINE JvInterpreter_OLEAUTO} + +{ Used by JvTimeFrameWork, see JvTFDays.pas for more info on time blocks. } +{$DEFINE Jv_TIMEBLOCKS} + +{ This activates the unit versioning system where each JVCL unit gets a record that defines +which revision, date and filename the unit has. } +{.$DEFINE UNITVERSIONING} + +// ********************************************************************* +// Start Definition of Third Party Components +// ********************************************************************* + +{ Activates SM-Export Wrapper Components (in DBActions) +For further informations have a look at http://www.scalabium.com +ATTENTION : +BEFORE YOU ACTIVATE THIS OPTION YOU MUST CHANGE THE +SMEXPORT PACKAGE FROM AUTOMATIC COMPILE NO MANUAL COMPILE } +{.$DEFINE USE_3RDPARTY_SMEXPORT} + +{ Activates SM-Import Wrapper Components (in DBActions) +For further informations have a look at http://www.scalabium.com +ATTENTION : +BEFORE YOU ACTIVATE THIS OPTION YOU MUST CHANGE THE +SMIMPORT PACKAGE FROM AUTOMATIC COMPILE NO MANUAL COMPILE } +{.$DEFINE USE_3RDPARTY_SMIMPORT} + +{ Activates Support for the DevExpress cxEditor-Controls +For further informations have a look at http://www.devexpress.com } +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXEDITOR} + +{ Activates Support for the DevExpress cxGrid-Controls +For further informations have a look at http://www.devexpress.com } +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXGRID} + +{ Activates Support for the DevExpress cxVerticalGrid-Controls +For further informations have a look at http://www.devexpress.com } +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID} + +{ Activates Support for the DevExpress cxPivotGrid-Controls +For further informations have a look at http://www.devexpress.com } +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID} + +{ Activates Support for the DevExpress cxTreeList-Controls +For further informations have a look at http://www.devexpress.com } +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXTREELIST} + +{ Activates the Internet Direct (Indy)-Components +For further informations have a look at http://www.indyproject.org } +{.$DEFINE USE_3RDPARTY_INDY} + +{ Activates the Internet Direct (Indy)-Components version 10. +You MUST also activate $DEFINE USE_3RDPARTY_INDY for the compilation to work +For further informations have a look at http://www.indyproject.org } +{.$DEFINE USE_3RDPARTY_INDY10} + +{ Activates Support for the ICS-Components (Internet component suite +For further informations have a look at http://www.overbyte.be/ +ATTENTION : +BEFORE YOU ACTIVATE THIS OPTION YOU MUST CHANGE THE +ICS* PACKAGE FROM AUTOMATIC COMPILE TO MANUAL COMPILE } +{.$DEFINE USE_3RDPARTY_ICS} + +{ Activates Support for Direct Oracle Access Components +For further informations have a look at http://www.allroundautomations.com } +{.$DEFINE USE_3RDPARTY_DOA} + +{ Activates Support for the CoreLabs VCL Oracle Data Access Components +For further informations have a look at http://www.crlab.com } +{.$DEFINE USE_3RDPARTY_CORELAB_ODAC} + Modified: trunk/jvcl/install/JVCLInstall/Compile.pas =================================================================== --- trunk/jvcl/install/JVCLInstall/Compile.pas 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install/JVCLInstall/Compile.pas 2008-11-03 22:47:18 UTC (rev 12032) @@ -34,7 +34,8 @@ uses Windows, SysUtils, Classes, CapExec, JVCLData, DelphiData, GenerateUtils, PackageUtils, Intf, PackageInformation, ConditionParser, - JclBase, JvVCL5Utils, JVCLVer; + JclBase, JclSysInfo, + JvVCL5Utils, JVCLVer; type TProgressKind = ( @@ -136,6 +137,7 @@ function GeneratePackages(const Group, Targets, PackagesPath: string): Boolean; overload; function GenerateAllPackages: Boolean; overload; function CompileTarget(TargetConfig: TTargetConfig; PackageGroupKind: TPackageGroupKind): Boolean; + procedure DeleteRemovedFiles(TargetConfig: TTargetConfig); //procedure AlterHppFiles(TargetConfig: ITargetConfig; Project: TPackageTarget); public @@ -437,6 +439,7 @@ SearchPaths, S: string; i: Integer; OutDirs: TOutputDirs; + Target: TCompileTarget; begin OutDirs := TargetConfig.GetOutputDirs(DebugUnits); @@ -461,18 +464,18 @@ // search paths SearchPaths := ''; - with TargetConfig do - for i := 0 to TargetConfig.Target.SearchPaths.Count - 1 do + Target := TargetConfig.Target; + for i := 0 to Target.SearchPaths.Count - 1 do + begin + S := ExcludeTrailingPathDelimiter(Target.ExpandDirMacros(Target.SearchPaths[i])); + if DirectoryExists(S) then begin - S := ExcludeTrailingPathDelimiter(Target.ExpandDirMacros(Target.SearchPaths[i])); - if DirectoryExists(S) then - begin - if SearchPaths <> '' then - SearchPaths := SearchPaths + ';' + S - else - SearchPaths := S; - end; + if SearchPaths <> '' then + SearchPaths := SearchPaths + ';' + S + else + SearchPaths := S; end; + end; Lines.Add('-U"' + SearchPaths + '"'); Lines.Add('-I"' + SearchPaths + '"'); Lines.Add('-R"' + SearchPaths + '"'); @@ -514,8 +517,9 @@ MaxCmdLineLength = 2048 - 1; var Dcc32Cfg, PrjFilename: string; - Filename, Args, CmdLine, S: string; + BplFilename, BplBakFilename, Filename, Args, CmdLine, S: string; OutDirs: TOutputDirs; + ExistingBplRenamed: Boolean; begin OutDirs := TargetConfig.GetOutputDirs(DebugUnits); PrjFilename := Project.SourceDir + PathDelim + ExtractFileName(Project.SourceName); @@ -562,14 +566,42 @@ CaptureLinePackageCompilation(#1 + CmdLine, FAborted); end; - if TargetConfig.Target.Version <= 9 then - Result := CaptureExecute('"' + TargetConfig.Target.Dcc32 + '"', Args, - ExtractFileDir(PrjFilename), CaptureLinePackageCompilation, DoIdle, - False, TargetConfig.GetPathEnvVar, Dcc32SpeedInjection) - else - Result := CaptureExecute('"' + TargetConfig.Target.Dcc32 + '"', Args, - ExtractFileDir(PrjFilename), CaptureLinePackageCompilation, DoIdle, - False, TargetConfig.GetPathEnvVar, nil); + { Get the target file out of the way, in case it is still used by the IDE or + an application. } + BplFilename := OutDirs.BplDir + PathDelim + Project.TargetName; + BplBakFilename := BplFilename + '.bak'; + ExistingBplRenamed := False; + if FileExists(BplFilename) then + begin + if SetFileAttributes(PChar(BplBakFilename), FILE_ATTRIBUTE_NORMAL) then + DeleteFile(BplBakFilename); + ExistingBplRenamed := RenameFile(BplFilename, BplBakFilename); + end; + Result := -1; + try + { Compile the project } + if TargetConfig.Target.Version <= 9 then + Result := CaptureExecute('"' + TargetConfig.Target.Dcc32 + '"', Args, + ExtractFileDir(PrjFilename), CaptureLinePackageCompilation, DoIdle, + False, TargetConfig.GetPathEnvVar, Dcc32SpeedInjection) + else + Result := CaptureExecute('"' + TargetConfig.Target.Dcc32 + '"', Args, + ExtractFileDir(PrjFilename), CaptureLinePackageCompilation, DoIdle, + False, TargetConfig.GetPathEnvVar, nil); + finally + { Restore original file if there was an error or an exception } + if ExistingBplRenamed then + begin + if Result <> 0 then + RenameFile(BplBakFilename, BplFilename); + if FileExists(BplBakFilename) then + begin + SetFileAttributes(PChar(BplBakFilename), FILE_ATTRIBUTE_NORMAL); + if not DeleteFile(BplBakFilename) then + MoveFileEx(PChar(BplBakFilename), nil, MOVEFILE_DELAY_UNTIL_REBOOT); + end; + end; + end; if Result <> 0 then Break; end; @@ -579,9 +611,7 @@ end; if Result < 0 then // command not found - MessageBox(0, PChar(Format(RsCommandNotFound, - [CmdLine, - ExtractFileDir(PrjFilename)])), + MessageBox(0, PChar(Format(RsCommandNotFound, [CmdLine, ExtractFileDir(PrjFilename)])), 'JVCL Installer', MB_OK or MB_ICONERROR); end; @@ -1184,7 +1214,7 @@ end; /// <summary> -/// Compile() prepares for compiling and decides if the VCL or CLX framework +/// Compile() prepares for compiling and decides if the VCL framework /// should be compiled. /// </summary> function TCompiler.Compile: Boolean; @@ -1197,30 +1227,7 @@ Result := True; FAborted := False; - SysInfo := ''; - case Win32Platform of - VER_PLATFORM_WIN32_WINDOWS: - begin - case Win32MinorVersion of - 0..9: SysInfo := 'Windows 95'; - 10..89: SysInfo := 'Windows 98'; - 90: SysInfo := 'Windows ME'; - end; - end; - VER_PLATFORM_WIN32_NT: - begin - case Win32MajorVersion of - 4: SysInfo := 'Windows NT4'; - 5: - begin - case Win32MinorVersion of - 0: SysInfo := 'Windows 2000'; - 1: SysInfo := 'Windows XP'; - end; - end; - end; - end; - end; + SysInfo := GetWindowsProductString; if SysInfo <> '' then begin @@ -1230,8 +1237,8 @@ CaptureLine(SysInfo, FAborted); CaptureLine('', FAborted); end; - CaptureLine(Format('JVCL %d.%d.%d.%d', - [JVCLVersionMajor, JVCLVersionMinor, JVCLVersionRelease, JVCLVersionBuild]), + CaptureLine(Format('JVCL %d.%d.%d.%d', + [JVCLVersionMajor, JVCLVersionMinor, JVCLVersionRelease, JVCLVersionBuild]), FAborted); CaptureLine('', FAborted); @@ -1248,8 +1255,6 @@ Inc(Count); if pkVCL in Data.TargetConfig[i].InstallMode then Inc(Frameworks); - if pkCLX in Data.TargetConfig[i].InstallMode then - Inc(Frameworks); end; end; SetLength(TargetConfigs, Count); @@ -1267,15 +1272,98 @@ Inc(Index); end; DoTargetProgress(TargetConfigs[i], Index, Frameworks); - if pkClx in TargetConfigs[i].InstallMode then + end; +end; + +/// <summary> +/// DeleteRemovedFiles deletes the removed packages and units from the output directories. +/// </summary> +procedure TCompiler.DeleteRemovedFiles(TargetConfig: TTargetConfig); +var + I: Integer; + Filename, Path: string; +begin + { Delete removed package files .dcp, .lib, .bpi, .dcu, .hpp file } + for I := 0 to High(sRemovedPackages) do + begin + { Release } + Filename := TargetConfig.VersionedJVCLXmlDcp(sRemovedPackages[I]); + Path := IncludeTrailingPathDelimiter(TargetConfig.DcpDir); + if Path = '' then + IncludeTrailingPathDelimiter(TargetConfig.Target.DcpDir); + if FileExists(Path + Filename) then begin - Result := CompileTarget(TargetConfigs[i], pkCLX); - if not Result then - Break; - Inc(Index); + DeleteFile(Path + Filename); + DeleteFile(Path + ChangeFileExt(Filename, '.dcu')); + DeleteFile(Path + ChangeFileExt(Filename, '.lib')); + DeleteFile(Path + ChangeFileExt(Filename, '.bpi')); + DeleteFile(Path + ChangeFileExt(Filename, '.hpp')); + if TargetConfig.HppDir <> '' then + Path := IncludeTrailingPathDelimiter(TargetConfig.HppDir); + DeleteFile(Path + ChangeFileExt(Filename, '.hpp')); end; - DoTargetProgress(TargetConfigs[i], Index, Frameworks); + + { Debug } + Filename := TargetConfig.VersionedJVCLXmlDcp(sRemovedPackages[I]); + Path := IncludeTrailingPathDelimiter(TargetConfig.DebugDcpDir); + if Path = '' then + IncludeTrailingPathDelimiter(TargetConfig.Target.DcpDir); + if FileExists(Path + Filename) then + begin + DeleteFile(Path + Filename); + DeleteFile(Path + ChangeFileExt(Filename, '.dcu')); + DeleteFile(Path + ChangeFileExt(Filename, '.lib')); + DeleteFile(Path + ChangeFileExt(Filename, '.bpi')); + DeleteFile(Path + ChangeFileExt(Filename, '.hpp')); + if TargetConfig.DebugHppDir <> '' then + Path := IncludeTrailingPathDelimiter(TargetConfig.DebugHppDir); + DeleteFile(Path + ChangeFileExt(Filename, '.hpp')); + end; + + { Delete package .bpl } + Filename := TargetConfig.VersionedJVCLXmlBpl(sRemovedPackages[I]); + Path := IncludeTrailingPathDelimiter(TargetConfig.BplDir); + if Path = '' then + Path := IncludeTrailingPathDelimiter(TargetConfig.Target.BplDir); + DeleteFile(Path + Filename); end; + + + { Delete removed unit files .dcu, .dfm, .hpp } + for I := 0 to High(sRemovedUnits) do + begin + { Release } + Path := IncludeTrailingPathDelimiter(TargetConfig.UnitOutDir); + if Path <> '' then + begin + Filename := sRemovedUnits[I] + '.dcu'; + if FileExists(Path + Filename) then + begin + DeleteFile(Path + Filename); + DeleteFile(Path + ChangeFileExt(Filename, '.dfm')); + DeleteFile(Path + ChangeFileExt(Filename, '.hpp')); + if TargetConfig.HppDir <> '' then + Path := IncludeTrailingPathDelimiter(TargetConfig.HppDir); + DeleteFile(Path + ChangeFileExt(Filename, '.hpp')); + end; + end; + + { Debug } + Path := IncludeTrailingPathDelimiter(TargetConfig.DebugUnitOutDir); + if Path <> '' then + begin + Filename := sRemovedUnits[I] + '.dcu'; + if FileExists(Path + Filename) then + begin + DeleteFile(Path + Filename); + DeleteFile(Path + ChangeFileExt(Filename, '.dfm')); + DeleteFile(Path + ChangeFileExt(Filename, '.hpp')); + if TargetConfig.DebugHppDir <> '' then + Path := IncludeTrailingPathDelimiter(TargetConfig.DebugHppDir); + DeleteFile(Path + ChangeFileExt(Filename, '.hpp')); + end; + end; + end; end; /// <summary> @@ -1284,18 +1372,16 @@ /// </summary> function TCompiler.CompileTarget(TargetConfig: TTargetConfig; PackageGroupKind: TPackageGroupKind): Boolean; var - //ObjFiles: TStrings; - //i: Integer; Aborted: Boolean; - DoClx: Boolean; begin - DoClx := PackageGroupKind = pkClx; Result := True; Aborted := False; FOutput.Clear; + DeleteRemovedFiles(TargetConfig); + // VCL - if Result and (pkVCL in TargetConfig.InstallMode) and not DoClx then + if Result and (pkVCL in TargetConfig.InstallMode) then begin if not TargetConfig.DeveloperInstall then begin @@ -1307,41 +1393,15 @@ end; if Result then + begin // compile Result := CompileProjectGroup( TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkVCL], False); + end; if Result then CaptureLine('[Finished JVCL for VCL installation]', Aborted); // do not localize end; - - // CLX - if Result and (pkClx in TargetConfig.InstallMode) and DoClx then - begin - if not FileExists(TargetConfig.BplDir + '\clxdesigner.dcp') then - begin - // Delphi 7 has no clxdesigner.dcp so we compile it from Delphi's property - // editor source. - CaptureExecute(Data.JVCLPackagesDir + '\bin\MakeClxDesigner.bat', '', - Data.JVCLPackagesDir + '\bin', CaptureLine, nil, False); - end; - - if not TargetConfig.DeveloperInstall then - begin - // debug units - if TargetConfig.Target.SupportsPersonalities([persDelphi]) and TargetConfig.DebugUnits then - Result := CompileProjectGroup( - TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkClx], True); - end; - - if Result then - // compile - Result := CompileProjectGroup( - TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkClx], False); - - if Result then - CaptureLine('[Finished JVCL for CLX installation]', Aborted); // do not localize - end; end; /// <summary> @@ -1421,16 +1481,8 @@ DestDir := ProjectGroup.TargetConfig.UnitOutDir; DebugDestDir := ProjectGroup.TargetConfig.DebugUnitOutDir; - if ProjectGroup.IsVCLX then - begin - Dir := ProjectGroup.TargetConfig.JVCLDir + PathDelim + 'qrun'; - FindFiles(Dir, '*.xfm', False, Files, ['.xfm']); - end - else - begin - Dir := ProjectGroup.TargetConfig.JVCLDir + PathDelim + 'run'; - FindFiles(Dir, '*.dfm', False, Files, ['.dfm']); - end; + Dir := ProjectGroup.TargetConfig.JVCLDir + PathDelim + 'run'; + FindFiles(Dir, '*.dfm', False, Files, ['.dfm']); CaptureLine(RsCopyingFiles, FAborted); for i := 0 to Files.Count - 1 do @@ -1454,18 +1506,6 @@ end; end; -function GetWindowsDir: string; -begin - SetLength(Result, MAX_PATH); - SetLength(Result, GetWindowsDirectory(PChar(Result), Length(Result))); -end; - -function GetSystemDir: string; -begin - SetLength(Result, MAX_PATH); - SetLength(Result, GetSystemDirectory(PChar(Result), Length(Result))); -end; - procedure TCompiler.SortProjectGroup(Group: TProjectGroup; List: TList); procedure SortProject(Project: TPackageTarget; var ProjectIndex: Integer); @@ -1580,8 +1620,6 @@ FPkgIndex := 0; Edition := TargetConfig.TargetSymbol; - if ProjectGroup.IsVCLX then - Edition := Edition + 'clx'; JVCLPackagesDir := TargetConfig.JVCLPackagesDir; DccOpt := '-M'; // make modified units, output 'never build' DCPs @@ -1794,7 +1832,7 @@ end; /// <summary> -/// AlterHppFiles corrects the *.hpp files that the dcc32.exe compiler generated. +/// AlterHppFiles corrects the *.hpp files that the dcc32.exe compiler has generated. /// - Converts every '#define constant "string"' to "static const char /// </summary> (*procedure TCompiler.AlterHppFiles(TargetConfig: ITargetConfig; Project: TPackageTarget); Modified: trunk/jvcl/install/JVCLInstall/Frames/FrmInstall.pas =================================================================== --- trunk/jvcl/install/JVCLInstall/Frames/FrmInstall.pas 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install/JVCLInstall/Frames/FrmInstall.pas 2008-11-03 22:47:18 UTC (rev 12032) @@ -149,8 +149,7 @@ Application.ProcessMessages; end; -procedure TFrameInstall.EvCaptureLine(const Text: string; - var AAborted: Boolean); +procedure TFrameInstall.EvCaptureLine(const Text: string; var AAborted: Boolean); var Line: string; @@ -344,6 +343,7 @@ FormCompileMessages.Top := ParentForm.BoundsRect.Bottom; FormCompileMessages.Left := ParentForm.Left + (ParentForm.Width - FormCompileMessages.Width) div 2; + SetWindowLong(FormCompile.Handle, GWL_HWNDPARENT, ParentForm.Handle); FormCompile.CompileMessages := FormCompileMessages; {$IFDEF USE_DXGETTEXT} @@ -361,7 +361,6 @@ finally Compiler.Free; end; - SetWindowLong(FormCompile.Handle, GWL_HWNDPARENT, 0); if Success and Installer.Data.IgnoreMakeErrors then Success := FormCompileMessages.Count = 0; @@ -393,7 +392,7 @@ // register packages into IDE with Installer do for i := 0 to SelTargetCount - 1 do - if SelTargets[i].InstallJVCL and (not SelTargets[i].CompileOnly) then + if SelTargets[i].InstallJVCL and not SelTargets[i].CompileOnly then begin if SelTargets[i].CleanPalettes then SelTargets[i].CleanJVCLPalette(False); Modified: trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.dfm =================================================================== --- trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.dfm 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.dfm 2008-11-03 22:47:18 UTC (rev 12032) @@ -22,7 +22,7 @@ object LblIDEs: TLabel Left = 8 Top = 8 - Width = 69 + Width = 68 Height = 13 Caption = '&Available IDEs' FocusControl = ListViewTargetIDEs @@ -31,15 +31,15 @@ object LblFrameworks: TLabel Left = 356 Top = 49 - Width = 60 + Width = 62 Height = 13 Caption = '&Frameworks:' FocusControl = CheckListBoxFrameworks end object LblShowMode: TLabel - Left = 322 + Left = 324 Top = 101 - Width = 80 + Width = 78 Height = 13 Alignment = taRightJustify Caption = '&Show packages:' Modified: trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.pas =================================================================== --- trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.pas 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.pas 2008-11-03 22:47:18 UTC (rev 12032) @@ -233,8 +233,6 @@ CheckListBoxFrameworks.ItemIndex := -1; for Kind := pkFirst to pkLast do begin - if (Kind = pkCLX) and not CLXSupport then - Continue; // find first selected item Group := TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, Kind]; if Group <> nil then @@ -640,11 +638,9 @@ inherited Create(AOwner); FOrgWndProc := CheckListBoxPackages.WindowProc; CheckListBoxPackages.WindowProc := HookWndProc; - if not CLXSupport then - begin - LblFrameworks.Visible := False; - CheckListBoxFrameworks.Visible := False; - end; + + LblFrameworks.Visible := False; + CheckListBoxFrameworks.Visible := False; {$IFDEF COMPILER12_UP} CheckListBoxPackages.ParentDoubleBuffered := False; CheckListBoxFrameworks.ParentDoubleBuffered := False; Modified: trunk/jvcl/install/JVCLInstall/InstallerConsts.pas =================================================================== --- trunk/jvcl/install/JVCLInstall/InstallerConsts.pas 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install/JVCLInstall/InstallerConsts.pas 2008-11-03 22:47:18 UTC (rev 12032) @@ -33,7 +33,6 @@ sJVCLMacroCommonDir = '$(JVCL)\common'; // do not localize sJVCLMacroRunDir = '$(JVCL)\run'; // do not localize sJVCLMacroResourcesDir = '$(JVCL)\Resources'; // do not localize - sJVCLMacroClxDirs = '$(JVCL)\qcommon;$(JVCL)\qrun;$(JVCL)\Resources'; // do not localize resourcestring // JVCL3Install.pas Modified: trunk/jvcl/install/JVCLInstall/Intf.pas =================================================================== --- trunk/jvcl/install/JVCLInstall/Intf.pas 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install/JVCLInstall/Intf.pas 2008-11-03 22:47:18 UTC (rev 12032) @@ -34,13 +34,13 @@ SysUtils, Classes, Contnrs, DelphiData, JVCLConfiguration, RegConfig; type - TPackageGroupKind = (pkVcl, pkClx); + TPackageGroupKind = (pkVcl); const pkFirst = Low(TPackageGroupKind); pkLast = High(TPackageGroupKind); PackageGroupKindToStr: array[TPackageGroupKind] of string = ( - 'VCL', 'VisualCLX' + 'VCL' ); type Modified: trunk/jvcl/install/JVCLInstall/JVCLData.pas =================================================================== --- trunk/jvcl/install/JVCLInstall/JVCLData.pas 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install/JVCLInstall/JVCLData.pas 2008-11-03 22:47:18 UTC (rev 12032) @@ -42,8 +42,14 @@ sJvclIncFile = '%s\common\jvcl.inc'; sBCBIncludeDir = '%s\Include\Vcl'; -const - CLXSupport = False; { Switch this to True if the Installer should support CLX } + { Before any package is compiled these package files and units are deleted from the + output directories. } + sRemovedPackages: array[0..0] of string = ( + 'Jv3rd-R' + ); + sRemovedUnits: array[0..0] of string = ( + 'JvgMailSlots' + ); type TJVCLData = class; @@ -718,21 +724,8 @@ Include(FInstallMode, pkVCL); FInstalledJVCLVersion := 3; end; - if Target.FindPackageEx('JvQCore') <> nil then // CLX // do not localize - begin - Include(FInstallMode, pkCLX); - FInstalledJVCLVersion := 3; - end; - if not CLXSupport then - begin - Exclude(FInstallMode, pkCLX); - Include(FInstallMode, pkVCL); - end - else - if FInstallMode = [] then // if no VCL and no CLX than it is VCL - Include(FInstallMode, pkVCL); + Include(FInstallMode, pkVCL); - // find JCL by looking into the (new) JEDI Registry key FOutdatedJcl := False; FMissingJCL := True; @@ -839,7 +832,7 @@ /// </summary> function TTargetConfig.GetBpgFilename(Personal: Boolean; Kind: TPackageGroupKind): string; var - Pers, Clx: string; + Pers: string; begin if Personal then begin @@ -849,22 +842,19 @@ Pers := 'Per'; // do not localize end; - if Kind = pkClx then - Clx := 'Clx'; - if Target.IsBDS then begin if Target.Version >= 11 then // Delphi 2007 and upper use groupproj files - Result := Owner.JVCLPackagesDir + Format('\%s%d%s%s Packages.groupproj', // do not localize - [Target.TargetType, Target.Version, Pers, Clx]) + Result := Owner.JVCLPackagesDir + Format('\%s%d%s Packages.groupproj', // do not localize + [Target.TargetType, Target.Version, Pers]) else - Result := Owner.JVCLPackagesDir + Format('\%s%d%s%s Packages.bdsgroup', // do not localize - [Target.TargetType, Target.Version, Pers, Clx]); + Result := Owner.JVCLPackagesDir + Format('\%s%d%s Packages.bdsgroup', // do not localize + [Target.TargetType, Target.Version, Pers]); end else begin - Result := Owner.JVCLPackagesDir + Format('\%s%d%s%s Packages.bpg', // do not localize - [Target.TargetType, Target.Version, Pers, Clx]); + Result := Owner.JVCLPackagesDir + Format('\%s%d%s Packages.bpg', // do not localize + [Target.TargetType, Target.Version, Pers]); end; end; @@ -1053,8 +1043,6 @@ begin if Value <> FInstallMode then begin - if not CLXSupport then - Exclude(Value, pkCLX); if Value = [] then FInstallMode := [pkVcl] else @@ -1498,13 +1486,6 @@ AddPaths(Target.SearchPaths, {Add:=}DeveloperInstall, Owner.JVCLDir, ['run']); // do not localize end; - if pkCLX in InstallMode then - begin - AddPaths(Target.BrowsingPaths, True, Owner.JVCLDir, - ['qcommon', 'qrun']); // do not localize - AddPaths(Target.SearchPaths, {Add:=}DeveloperInstall, Owner.JVCLDir, - ['qcommon', 'qrun']); // do not localize - end; AllPackages := TProjectGroup.Create(Self, ''); try Modified: trunk/jvcl/install/JVCLInstall/PackageUtils.pas =================================================================== --- trunk/jvcl/install/JVCLInstall/PackageUtils.pas 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install/JVCLInstall/PackageUtils.pas 2008-11-03 22:47:18 UTC (rev 12032) @@ -116,7 +116,6 @@ function GetPackages(Index: Integer): TPackageTarget; function GetTarget: TCompileTarget; protected - function GetIsVCLX: Boolean; override; procedure DoInstallChange; virtual; function GetPackageTargetClass: TBpgPackageTargetClass; override; public @@ -172,10 +171,6 @@ for Kind := pkFirst to pkLast do begin - { Delphi 5 and the Personal Editions do not have CLX support. } - if (Kind = pkClx) and ((TargetConfig.Target.Version < 6) or (TargetConfig.Target.IsPersonal)) then - Continue; - if FileExists(TargetConfig.GetBpgFilename(False, Kind)) then FItems[False, Kind] := TProjectGroup.Create(TargetConfig, TargetConfig.GetBpgFilename(False, Kind)); if FileExists(TargetConfig.GetBpgFilename(True, Kind)) then @@ -233,11 +228,6 @@ Result := Package.Name; end; -function TProjectGroup.GetIsVCLX: Boolean; -begin - Result := Pos('clx', LowerCase(BpgName)) > 0; -end; - function TProjectGroup.GetPackages(Index: Integer): TPackageTarget; begin Result := TPackageTarget(inherited Packages[Index]); Modified: trunk/jvcl/install/JVCLInstall/Pages/PgSummary.pas =================================================================== --- trunk/jvcl/install/JVCLInstall/Pages/PgSummary.pas 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install/JVCLInstall/Pages/PgSummary.pas 2008-11-03 22:47:18 UTC (rev 12032) @@ -133,8 +133,6 @@ S := sJVCLMacroCommonDir; if pkVCL in InstallMode then S := S + ';' + sJVCLMacroRunDir; - if pkClx in InstallMode then - S := S + ';' + sJVCLMacroClxDirs; Add(RsAddToBrowsePath, S); if not DeveloperInstall then S := sJVCLMacroCommonDir; Modified: trunk/jvcl/install.bat =================================================================== --- trunk/jvcl/install.bat 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/install.bat 2008-11-03 22:47:18 UTC (rev 12032) @@ -10,9 +10,12 @@ if EXIST JVCLInstall.cfg del JVCLInstall.cfg ..\..\packages\bin\dcc32ex.exe --runtime-package-rtl --runtime-package-vcl --requires-jcl=%JCLVERSION% -Q -B -DJVCLINSTALLER -DUSE_DXGETTEXT -E..\..\bin -I.;..\..\common -U..\..\common;..\..\run -n..\..\dcu JVCLInstall.dpr if ERRORLEVEL 1 goto Failed +..\..\packages\bin\dcc32ex.exe -Q -B -E..\..\bin JVCLInstallStarter.dpr >NUL +::if ERRORLEVEL 1 goto Failed cd ..\.. :: create mo files, if possible (msgfmt must be in the PATH environment variable) +echo. cd locale msgfmt --help 1> tmp1.txt 2> tmp2.txt if errorlevel 1 goto MsgFmtNotFound @@ -25,6 +28,7 @@ goto CleanLocale :MsgFmtNotFound +echo. echo Warning: msgfmt not found in PATH, no language support in the installer :CleanLocale @@ -32,8 +36,11 @@ cd .. :: start installer +echo. echo [Starting installer...] -start bin\JVCLInstall.exe %2 %3 %4 %5 %6 %7 %8 %9 +echo bin\JVCLInstall.exe %2 %3 %4 %5 %6 %7 %8 %9 +if not exist bin\JVCLInstallStarter.exe goto :FailStart +bin\JVCLInstallStarter.exe bin\JVCLInstall.exe %2 %3 %4 %5 %6 %7 %8 %9 if ERRORLEVEL 1 goto FailStart goto Leave Property changes on: trunk/jvcl/lib/d12 ___________________________________________________________________ Modified: svn:ignore - *.dcu + *.dcpil *.dcuil *.ddp *.bpl *.dcp *.dfm *.xfm *.lib *.bpi *.obj *.dcu *.hpp include Added: bugtraq:url + http://homepages.codegear.com/jedi/issuetracker/view.php?id=%BUGID% Added: bugtraq:message + (Mantis #%BUGID%) Added: tsvn:logminsize + 5 Added: bugtraq:logregex + [Mm]antis #?(\d+)(,? ?#?(\d+))+ (\d+) Property changes on: trunk/jvcl/lib/d12/debug ___________________________________________________________________ Added: bugtraq:url + http://homepages.codegear.com/jedi/issuetracker/view.php?id=%BUGID% Added: bugtraq:message + (Mantis #%BUGID%) Added: svn:ignore + *.dcpil *.dcuil *.ddp *.bpl *.dcp *.dfm *.xfm *.lib *.bpi *.obj *.dcu *.hpp include Added: tsvn:logminsize + 5 Added: bugtraq:logregex + [Mm]antis #?(\d+)(,? ?#?(\d+))+ (\d+) Deleted: trunk/jvcl/packages/c5/Jv3rdC5R.bpk =================================================================== --- trunk/jvcl/packages/c5/Jv3rdC5R.bpk 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5/Jv3rdC5R.bpk 2008-11-03 22:47:18 UTC (rev 12032) @@ -1,89 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!-- C++Builder XML Project --> -<!-- -***************************************************************************** - DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR - ALWAYS EDIT THE RELATED XML FILE (Jv3rd-R.xml) - - Last generated: 21-02-2007 14:20:01 UTC -***************************************************************************** ---> -<PROJECT> - <MACROS> - <VERSION value="BCB.05.03"/> - <PROJECT value="Jv3rdC5R.bpl"/> - <OBJFILES value=" - ..\..\lib\c5\Jv3rdC5R.obj - ..\..\lib\c5\JvGnugettext.obj - ..\..\lib\c5\JvGnugettextD5.obj - "/> - <RESFILES value="Jv3rdC5R.res"/> - <IDLFILES value=""/> - <IDLGENFILES value=""/> - <DEFFILE value=""/> - <RESDEPEN value="$(RESFILES) - "/> - <LIBFILES value=" - "/> - <LIBRARIES value=""/> - <SPARELIBS value=""/> - <PACKAGES value=" - vcl50.bpi - "/> - <PATHCPP value=".;"/> - <PATHPAS value=".;..\..\common;..\..\run;..\..\design"/> - <PATHRC value=".;"/> - <PATHASM value=".;"/> - <DEBUGLIBPATH value="$(BCB)\lib\debug"/> - <RELEASELIBPATH value="$(BCB)\lib\release"/> - <LINKER value="ilink32"/> - <USERDEFINES value="_DEBUG"/> - <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/> - <MAINSOURCE value="Jv3rdC5R.cpp"/> - <INCLUDEPATH value="..\..\design;..\..\run;..\..\common;$(BCB)\include;$(BCB)\include\vcl"/> - <LIBPATH value="..\..\run;..\..\design;..\..\common;..\..\resources;..\..\lib\c5;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/> - <WARNINGS value="-w-par"/> - <OTHERFILES value=""/> - </MACROS> - <OPTIONS> - <IDLCFLAGS value="-I..\..\design -I..\..\run -I..\..\common - -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_DEBUG -boa"/> - <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c - -tWM"/> - <PFLAGS value="-N2..\..\lib\c5 -N0..\..\lib\c5 -$YD -$W -$O- -$A8 -v -JPHNE -M - -U$(BCB)\Lib\Obj - -LUvcl50 - -U$(BCB)\Projects\Bpl - -R..\..\Resources - "/> - <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-I..\..\lib\c5 -L$(BCB)\Projects\Lib -L$(BCB)\Projects\Bpl - -b:0x49000000 -D"JVCL 3rd party Runtime Package" - -aa -Tpp -Gpr -x -Gn -Gl -Gi -v"/> - <OTHERFILES value=""/> - </OPTIONS> - <LINKER> - <ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/> - <ALLRES value="$(RESFILES)"/> - <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/> - <OTHERFILES value=""/> - </LINKER> - <BUILDTOOLS> - </BUILDTOOLS> - - <IDEOPTIONS> -[Version Info] -IncludeVerInfo=1 -AutoIncBuild=0 -MajorVer=3 -MinorVer=31 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=1 -Private=0 -DLL=0 - </IDEOPTIONS> -</PROJECT> Deleted: trunk/jvcl/packages/c5/Jv3rdC5R.cpp =================================================================== --- trunk/jvcl/packages/c5/Jv3rdC5R.cpp 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5/Jv3rdC5R.cpp 2008-11-03 22:47:18 UTC (rev 12032) @@ -1,31 +0,0 @@ -//--------------------------------------------------------------------------- -/* ------------------------------------------------------------------------------ - DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR - ALWAYS EDIT THE RELATED XML FILE (Jv3rd-R.xml) - - Last generated: 17-07-2008 16:01:16 UTC ------------------------------------------------------------------------------ -*/ - -#include <vcl.h> -#pragma hdrstop -USERES("Jv3rdC5R.res"); -USEUNIT("..\..\run\JvGnugettext.pas"); -USEUNIT("..\..\run\JvGnugettextD5.pas"); -USEPACKAGE("vcl50.bpi"); - -//--------------------------------------------------------------------------- -#pragma package(smart_init) -//--------------------------------------------------------------------------- - -// Package source. -//--------------------------------------------------------------------------- - -#pragma argsused -int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*) -{ - return 1; -} -//--------------------------------------------------------------------------- - Deleted: trunk/jvcl/packages/c5/Jv3rdC5R.dpk =================================================================== --- trunk/jvcl/packages/c5/Jv3rdC5R.dpk 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5/Jv3rdC5R.dpk 2008-11-03 22:47:18 UTC (rev 12032) @@ -1,48 +0,0 @@ -package Jv3rdC5R; -{ ------------------------------------------------------------------------------ - DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR - ALWAYS EDIT THE RELATED XML FILE (Jv3rd-R.xml) - - Last generated: 17-07-2008 16:01:16 UTC ------------------------------------------------------------------------------ -} - -{$R *.res} -{$ALIGN ON} -{$ASSERTIONS OFF} -{$BOOLEVAL OFF} -{$DEBUGINFO OFF} -{$EXTENDEDSYNTAX ON} -{$IMPORTEDDATA ON} -{$IOCHECKS ON} -{$LOCALSYMBOLS OFF} -{$LONGSTRINGS ON} -{$OPENSTRINGS ON} -{$OPTIMIZATION ON} -{$OVERFLOWCHECKS OFF} -{$RANGECHECKS ON} -{$REFERENCEINFO OFF} -{$SAFEDIVIDE OFF} -{$STACKFRAMES OFF} -{$TYPEDADDRESS OFF} -{$VARSTRINGCHECKS ON} -{$WRITEABLECONST OFF} -{$MINENUMSIZE 1} -{$IMAGEBASE $49000000} -{$DESCRIPTION 'JVCL 3rd party Runtime Package'} -{$RUNONLY} -{$IMPLICITBUILD OFF} - -{$I jvcl.inc} - -requires - vcl50 - ; - -contains - JvGnugettext in '..\..\run\JvGnugettext.pas' , - JvGnugettextD5 in '..\..\run\JvGnugettextD5.pas' - ; - -end. Deleted: trunk/jvcl/packages/c5/Jv3rdC5R.rc =================================================================== --- trunk/jvcl/packages/c5/Jv3rdC5R.rc 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5/Jv3rdC5R.rc 2008-11-03 22:47:18 UTC (rev 12032) @@ -1,32 +0,0 @@ -VS_VERSION_INFO VERSIONINFO -FILEVERSION 3,31,0,0 -PRODUCTVERSION 3,31,0,0 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" - BEGIN - VALUE "CompanyName", "Project JEDI\0" - VALUE "FileDescription", "JVCL 3rd party Runtime Package\0" - VALUE "FileVersion", "3.31.0.0\0" - VALUE "InternalName", "Jv3rdC5R\0" - VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0" - VALUE "OriginalFilename", "Jv3rdC5R.bpl\0" - VALUE "ProductName", "JEDI Visual Component Library\0" - VALUE "ProductVersion", "3.31 Build 0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 1252 - END -END Deleted: trunk/jvcl/packages/c5/Jv3rdC5R.res =================================================================== (Binary files differ) Modified: trunk/jvcl/packages/c5/JvCoreC5R.bpk =================================================================== --- trunk/jvcl/packages/c5/JvCoreC5R.bpk 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5/JvCoreC5R.bpk 2008-11-03 22:47:18 UTC (rev 12032) @@ -5,7 +5,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JvCore-R.xml) - Last generated: 02-11-2008 19:28:30 UTC + Last generated: 03-11-2008 19:56:09 UTC ***************************************************************************** --> <PROJECT> @@ -14,6 +14,8 @@ <PROJECT value="JvCoreC5R.bpl"/> <OBJFILES value=" ..\..\lib\c5\JvCoreC5R.obj + ..\..\lib\c5\JvGnugettext.obj + ..\..\lib\c5\JvGnugettextD5.obj ..\..\lib\c5\JvExButtons.obj ..\..\lib\c5\JvExCheckLst.obj ..\..\lib\c5\JvExComCtrls.obj Modified: trunk/jvcl/packages/c5/JvCoreC5R.cpp =================================================================== --- trunk/jvcl/packages/c5/JvCoreC5R.cpp 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5/JvCoreC5R.cpp 2008-11-03 22:47:18 UTC (rev 12032) @@ -4,13 +4,15 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JvCore-R.xml) - Last generated: 02-11-2008 19:28:31 UTC + Last generated: 03-11-2008 19:56:09 UTC ----------------------------------------------------------------------------- */ #include <vcl.h> #pragma hdrstop USERES("JvCoreC5R.res"); +USEUNIT("..\..\run\JvGnugettext.pas"); +USEUNIT("..\..\run\JvGnugettextD5.pas"); USEUNIT("..\..\run\JvExButtons.pas"); USEUNIT("..\..\run\JvExCheckLst.pas"); USEUNIT("..\..\run\JvExComCtrls.pas"); Modified: trunk/jvcl/packages/c5/JvCoreC5R.dpk =================================================================== --- trunk/jvcl/packages/c5/JvCoreC5R.dpk 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5/JvCoreC5R.dpk 2008-11-03 22:47:18 UTC (rev 12032) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JvCore-R.xml) - Last generated: 02-11-2008 19:28:31 UTC + Last generated: 03-11-2008 19:56:09 UTC ----------------------------------------------------------------------------- } @@ -46,6 +46,8 @@ ; contains + JvGnugettext in '..\..\run\JvGnugettext.pas' , + JvGnugettextD5 in '..\..\run\JvGnugettextD5.pas' , JvExButtons in '..\..\run\JvExButtons.pas' , JvExCheckLst in '..\..\run\JvExCheckLst.pas' , JvExComCtrls in '..\..\run\JvExComCtrls.pas' , Modified: trunk/jvcl/packages/c5std/JvCoreC5R.bpk =================================================================== --- trunk/jvcl/packages/c5std/JvCoreC5R.bpk 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5std/JvCoreC5R.bpk 2008-11-03 22:47:18 UTC (rev 12032) @@ -5,7 +5,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JvCore-R.xml) - Last generated: 02-11-2008 19:28:30 UTC + Last generated: 03-11-2008 19:56:09 UTC ***************************************************************************** --> <PROJECT> @@ -14,6 +14,8 @@ <PROJECT value="JvCoreC5R.bpl"/> <OBJFILES value=" ..\..\lib\c5\JvCoreC5R.obj + ..\..\lib\c5\JvGnugettext.obj + ..\..\lib\c5\JvGnugettextD5.obj ..\..\lib\c5\JvExButtons.obj ..\..\lib\c5\JvExCheckLst.obj ..\..\lib\c5\JvExComCtrls.obj Modified: trunk/jvcl/packages/c5std/JvCoreC5R.cpp =================================================================== --- trunk/jvcl/packages/c5std/JvCoreC5R.cpp 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5std/JvCoreC5R.cpp 2008-11-03 22:47:18 UTC (rev 12032) @@ -4,13 +4,15 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JvCore-R.xml) - Last generated: 02-11-2008 19:28:31 UTC + Last generated: 03-11-2008 19:56:09 UTC ----------------------------------------------------------------------------- */ #include <vcl.h> #pragma hdrstop USERES("JvCoreC5R.res"); +USEUNIT("..\..\run\JvGnugettext.pas"); +USEUNIT("..\..\run\JvGnugettextD5.pas"); USEUNIT("..\..\run\JvExButtons.pas"); USEUNIT("..\..\run\JvExCheckLst.pas"); USEUNIT("..\..\run\JvExComCtrls.pas"); Modified: trunk/jvcl/packages/c5std/JvCoreC5R.dpk =================================================================== --- trunk/jvcl/packages/c5std/JvCoreC5R.dpk 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c5std/JvCoreC5R.dpk 2008-11-03 22:47:18 UTC (rev 12032) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JvCore-R.xml) - Last generated: 02-11-2008 19:28:31 UTC + Last generated: 03-11-2008 19:56:09 UTC ----------------------------------------------------------------------------- } @@ -47,6 +47,8 @@ ; contains + JvGnugettext in '..\..\run\JvGnugettext.pas' , + JvGnugettextD5 in '..\..\run\JvGnugettextD5.pas' , JvExButtons in '..\..\run\JvExButtons.pas' , JvExCheckLst in '..\..\run\JvExCheckLst.pas' , JvExComCtrls in '..\..\run\JvExComCtrls.pas' , Deleted: trunk/jvcl/packages/c6/Jv3rdC6R.bpk =================================================================== --- trunk/jvcl/packages/c6/Jv3rdC6R.bpk 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c6/Jv3rdC6R.bpk 2008-11-03 22:47:18 UTC (rev 12032) @@ -1,93 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!-- C++Builder XML Project --> -<!-- -***************************************************************************** - DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR - ALWAYS EDIT THE RELATED XML FILE (Jv3rd-R.xml) - - Last generated: 17-07-2008 16:01:16 UTC -***************************************************************************** ---> -<PROJECT> - <MACROS> - <VERSION value="BCB.06.00"/> - <PROJECT value="Jv3rdC6R.bpl"/> - <OBJFILES value=" - ..\..\lib\c6\Jv3rdC6R.obj - ..\..\lib\c6\JvGnugettext.obj - "/> - <RESFILES value="Jv3rdC6R.res"/> - <IDLFILES value=""/> - <IDLGENFILES value=""/> - <DEFFILE value=""/> - <RESDEPEN value="$(RESFILES) - "/> - <LIBFILES value=" - "/> - <LIBRARIES value=""/> - <SPARELIBS value=""/> - <PACKAGES value=" - rtl.bpi - "/> - <PATHCPP value=".;"/> - <PATHPAS value=".;..\..\common;..\..\run;..\..\design"/> - <PATHRC value=".;"/> - <PATHASM value=".;"/> - <DEBUGLIBPATH value="$(BCB)\lib\debug"/> - <RELEASELIBPATH value="$(BCB)\lib\release"/> - <LINKER value="ilink32"/> - <USERDEFINES value="_DEBUG"/> - <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/> - <MAINSOURCE value="Jv3rdC6R.cpp"/> - <INCLUDEPATH value="..\..\design;..\..\run;..\..\common;$(BCB)\include;$(BCB)\include\vcl"/> - <LIBPATH value="..\..\run;..\..\design;..\..\common;..\..\resources;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/> - <WARNINGS value="-w-par"/> - <OTHERFILES value=""/> - </MACROS> - <OPTIONS> - <IDLCFLAGS value="-I..\..\design -I..\..\run -I..\..\common - -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_DEBUG -boa"/> - <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c - -tWM"/> - <PFLAGS value="-N2..\..\lib\c6 -N0..\..\lib\c6 -$YD -$W -$O- -$A8 -v -JPHNE -M - - -U$(BCB)\Projects\Bpl - -R..\..\Resources - "/> - <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-I..\..\lib\c6 - -b:0x49000000 -D"JVCL 3rd party Runtime Package" - -aa -Tpp -Gpr -x -Gn -Gl -Gi -v"/> - <OTHERFILES value=""/> - </OPTIONS> - <LINKER> - <ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/> - <ALLRES value="$(RESFILES)"/> - <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/> - <OTHERFILES value=""/> - </LINKER> - <FILELIST> - <FILE FILENAME="Jv3rdC6R.res" FORMNAME="" UNITNAME="Jv3rdC6R.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="Jv3rdC6R.cpp" FORMNAME="" UNITNAME="Jv3rdC6R" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="..\..\run\JvGnugettext.pas" FORMNAME="" UNITNAME="JvGnugettext" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - </FILELIST> - <BUILDTOOLS> - </BUILDTOOLS> - - <IDEOPTIONS> -[Version Info] -IncludeVerInfo=1 -AutoIncBuild=0 -MajorVer=3 -MinorVer=31 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=1 -Private=0 -DLL=0 - </IDEOPTIONS> -</PROJECT> Deleted: trunk/jvcl/packages/c6/Jv3rdC6R.cpp =================================================================== --- trunk/jvcl/packages/c6/Jv3rdC6R.cpp 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c6/Jv3rdC6R.cpp 2008-11-03 22:47:18 UTC (rev 12032) @@ -1,26 +0,0 @@ -//--------------------------------------------------------------------------- -/* ------------------------------------------------------------------------------ - DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR - ALWAYS EDIT THE RELATED XML FILE (Jv3rd-R.xml) - - Last generated: 14-05-2004 10:16:07 UTC ------------------------------------------------------------------------------ -*/ - -#include <basepch.h> -#pragma hdrstop -//--------------------------------------------------------------------------- -#pragma package(smart_init) -//--------------------------------------------------------------------------- - -// Package source. -//--------------------------------------------------------------------------- - -#pragma argsused -int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*) -{ - return 1; -} -//--------------------------------------------------------------------------- - Deleted: trunk/jvcl/packages/c6/Jv3rdC6R.dpk =================================================================== --- trunk/jvcl/packages/c6/Jv3rdC6R.dpk 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c6/Jv3rdC6R.dpk 2008-11-03 22:47:18 UTC (rev 12032) @@ -1,47 +0,0 @@ -package Jv3rdC6R; -{ ------------------------------------------------------------------------------ - DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR - ALWAYS EDIT THE RELATED XML FILE (Jv3rd-R.xml) - - Last generated: 17-07-2008 16:01:16 UTC ------------------------------------------------------------------------------ -} - -{$R *.res} -{$ALIGN 8} -{$ASSERTIONS OFF} -{$BOOLEVAL OFF} -{$DEBUGINFO OFF} -{$EXTENDEDSYNTAX ON} -{$IMPORTEDDATA ON} -{$IOCHECKS ON} -{$LOCALSYMBOLS OFF} -{$LONGSTRINGS ON} -{$OPENSTRINGS ON} -{$OPTIMIZATION ON} -{$OVERFLOWCHECKS OFF} -{$RANGECHECKS ON} -{$REFERENCEINFO OFF} -{$SAFEDIVIDE OFF} -{$STACKFRAMES OFF} -{$TYPEDADDRESS OFF} -{$VARSTRINGCHECKS ON} -{$WRITEABLECONST OFF} -{$MINENUMSIZE 1} -{$IMAGEBASE $49000000} -{$DESCRIPTION 'JVCL 3rd party Runtime Package'} -{$RUNONLY} -{$IMPLICITBUILD OFF} - -{$I jvcl.inc} - -requires - rtl - ; - -contains - JvGnugettext in '..\..\run\JvGnugettext.pas' - ; - -end. Deleted: trunk/jvcl/packages/c6/Jv3rdC6R.rc =================================================================== --- trunk/jvcl/packages/c6/Jv3rdC6R.rc 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c6/Jv3rdC6R.rc 2008-11-03 22:47:18 UTC (rev 12032) @@ -1,32 +0,0 @@ -VS_VERSION_INFO VERSIONINFO -FILEVERSION 3,31,0,0 -PRODUCTVERSION 3,31,0,0 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" - BEGIN - VALUE "CompanyName", "Project JEDI\0" - VALUE "FileDescription", "JVCL 3rd party Runtime Package\0" - VALUE "FileVersion", "3.31.0.0\0" - VALUE "InternalName", "Jv3rdC6R\0" - VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0" - VALUE "OriginalFilename", "Jv3rdC6R.bpl\0" - VALUE "ProductName", "JEDI Visual Component Library\0" - VALUE "ProductVersion", "3.31 Build 0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 1252 - END -END Deleted: trunk/jvcl/packages/c6/Jv3rdC6R.res =================================================================== (Binary files differ) Modified: trunk/jvcl/packages/c6/JvCoreC6R.bpk =================================================================== --- trunk/jvcl/packages/c6/JvCoreC6R.bpk 2008-11-03 20:49:06 UTC (rev 12031) +++ trunk/jvcl/packages/c6/JvCoreC6R.bpk 2008-11-03 22:47:18 UTC (rev 12032) @@ -5,7 +5,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JvCore-R.xml) - Last generated: 02-11-2008 19:28:31 UTC + Last generated: 03-11-2008 19:56:10 UTC ***************************************************************************** --> <PROJECT> @@ -14,6 +14,7 @@ <PROJECT value="JvCoreC6R.bpl"/> <OBJFILES value=" ..\..\lib\c6\JvCoreC6R.obj + ..\..\lib\c6\JvGnugettext.obj ..\..\lib\c6\JvExButtons.obj ..\..\lib\c6\JvExCheckLst.obj ..\..\lib\c6\JvExComCtrls.obj @@ -140,6 +141,7 @@ <FILE FILENAME="vcljpg.bpi" FORMNAME="" UNITNAME="vcljpg" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="dbrtl.bpi" FORMNAME="" UNITNAME="dbrtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="vcldb.bpi" FORMNAME="" UNITNAME="vcldb" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\run\JvGnugettext.pas" FORMNAME="" UNITNAME="JvGnugettext" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\run\JvExButtons.pas" FORMNAME="" UNITNAME="JvExButtons" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\run\JvExCheckLst.pas" FORMNAME="" UNITNAME="JvExCheckLst" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\run\JvExComCtrls.pas" FORMNAME="" UNITNAME="JvExComCtrls" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> Modified: trunk/jvcl/packages/c6/JvCoreC6R.dpk =================================================================... [truncated message content] |