JEDI VCL for Delphi

Update of /cvsroot/jvcl/dev/JVCL3/qrun
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16843/qrun

Modified Files:
	JvQColorCombo.pas 
Log Message:
DropDownWidth is not a property of the class


Index: JvQColorCombo.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQColorCombo.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvQColorCombo.pas	21 Dec 2004 09:49:52 -0000	1.7
--- JvQColorCombo.pas	23 Dec 2004 21:50:28 -0000	1.8
***************
*** 145,149 ****
  
      property Color;
!     property DropDownWidth;
      property DragMode;
      property Enabled;
--- 145,149 ----
  
      property Color;
! //    property DropDownWidth;
      property DragMode;
      property Enabled;

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4032/JVCL3/run

Modified Files:
	JvAppStorage.pas JvPropertyStore.pas 
Log Message:
Added JvCustomPropertyStore.ReadOnly



Index: JvAppStorage.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAppStorage.pas,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** JvAppStorage.pas	18 Dec 2004 07:40:41 -0000	1.68
--- JvAppStorage.pas	23 Dec 2004 18:28:00 -0000	1.69
***************
*** 1230,1236 ****
      Obj := TStrings(List).Objects[Index];
      if Assigned(Obj) then
!       if Obj is TJvCustomPropertyStore then
!         Sender.WritePersistent(ConcatPaths([Path, ItemName + IntToStr(Index), cObject]), TPersistent(Obj),
!           True, TJvCustomPropertyStore(Obj).CombinedIgnoreProperties)
        else
          Sender.WritePersistent(ConcatPaths([Path, ItemName + IntToStr(Index), cObject]), TPersistent(Obj));
--- 1230,1238 ----
      Obj := TStrings(List).Objects[Index];
      if Assigned(Obj) then
!       if (Obj is TJvCustomPropertyStore) then
!         if not TJvCustomPropertyStore(Obj).ReadOnly then
!           Sender.WritePersistent(ConcatPaths([Path, ItemName + IntToStr(Index), cObject]), TPersistent(Obj),
!               True, TJvCustomPropertyStore(Obj).CombinedIgnoreProperties)
!         else
        else
          Sender.WritePersistent(ConcatPaths([Path, ItemName + IntToStr(Index), cObject]), TPersistent(Obj));
***************
*** 1279,1284 ****
      if Assigned(Item) then
        if Item is TJvCustomPropertyStore then
!         Sender.WritePersistent(ConcatPaths([Path, ItemName + IntToStr(Index)]), TPersistent(Item),
!           True, TJvCustomPropertyStore(Item).CombinedIgnoreProperties)
        else
          Sender.WritePersistent(ConcatPaths([Path, ItemName + IntToStr(Index)]), TPersistent(Item));
--- 1281,1288 ----
      if Assigned(Item) then
        if Item is TJvCustomPropertyStore then
!         if not TJvCustomPropertyStore(Item).ReadOnly then
!           Sender.WritePersistent(ConcatPaths([Path, ItemName + IntToStr(Index)]), TPersistent(Item),
!             True, TJvCustomPropertyStore(Item).CombinedIgnoreProperties)
!         else
        else
          Sender.WritePersistent(ConcatPaths([Path, ItemName + IntToStr(Index)]), TPersistent(Item));
***************
*** 2247,2250 ****
--- 2251,2255 ----
            begin
              TJvCustomPropertyStore(SubObj).AppStoragePath := Path;
+             TJvCustomPropertyStore(SubObj).AppStorage := Self;
              TJvCustomPropertyStore(SubObj).LoadProperties;
            end
***************
*** 2408,2412 ****
    const AName: string; const Reading: Boolean): string;
  begin
!   Result := AName;
    if Instance is TJvCustomPropertyStore then
      Result := TJvCustomPropertyStore(Instance).TranslatePropertyName(Result)
--- 2413,2417 ----
    const AName: string; const Reading: Boolean): string;
  begin
!   Result := AName; 
    if Instance is TJvCustomPropertyStore then
      Result := TJvCustomPropertyStore(Instance).TranslatePropertyName(Result)

Index: JvPropertyStore.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPropertyStore.pas,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** JvPropertyStore.pas	18 Dec 2004 07:40:59 -0000	1.45
--- JvPropertyStore.pas	23 Dec 2004 18:28:00 -0000	1.46
***************
*** 36,39 ****
--- 36,44 ----
  
  type
+   TJvIgnorePropertiesStringList = class(TStringList)
+   public
+     procedure AddDelete (iItem : String; iDelete : Boolean);
+   end;
+ 
    TJvCustomPropertyStore = class(TJvComponent)
    private
***************
*** 41,52 ****
      FAppStorage: TJvCustomAppStorage;
      FEnabled: Boolean;
      FDeleteBeforeStore: Boolean;
      FClearBeforeLoad: Boolean;
      FIntIgnoreProperties: TStringList;
!     FIgnoreProperties: TStringList;
      FAutoLoad: Boolean;
      FLastLoadTime: TDateTime;
      FIgnoreLastLoadTime: Boolean;
!     FCombinedIgnoreProperties: TStrings;
      FOnBeforeLoadProperties: TNotifyEvent;
      FOnAfterLoadProperties: TNotifyEvent;
--- 46,58 ----
      FAppStorage: TJvCustomAppStorage;
      FEnabled: Boolean;
+     FReadOnly: Boolean;
      FDeleteBeforeStore: Boolean;
      FClearBeforeLoad: Boolean;
      FIntIgnoreProperties: TStringList;
!     FIgnoreProperties: TJvIgnorePropertiesStringList;
      FAutoLoad: Boolean;
      FLastLoadTime: TDateTime;
      FIgnoreLastLoadTime: Boolean;
!     FCombinedIgnoreProperties: TStringList;
      FOnBeforeLoadProperties: TNotifyEvent;
      FOnAfterLoadProperties: TNotifyEvent;
***************
*** 54,59 ****
      FOnAfterStoreProperties: TNotifyEvent;
      procedure SetAutoLoad(Value: Boolean);
!     function GetIgnoreProperties: TStrings;
!     procedure SetIgnoreProperties(Value: TStrings);
      function GetPropCount(Instance: TPersistent): Integer;
      function GetPropName(Instance: TPersistent; Index: Integer): string;
--- 60,65 ----
      FOnAfterStoreProperties: TNotifyEvent;
      procedure SetAutoLoad(Value: Boolean);
!     function GetIgnoreProperties: TJvIgnorePropertiesStringList;
!     procedure SetIgnoreProperties(Value: TJvIgnorePropertiesStringList);
      function GetPropCount(Instance: TPersistent): Integer;
      function GetPropName(Instance: TPersistent; Index: Integer): string;
***************
*** 69,73 ****
      procedure StoreData; virtual;
      procedure Notification(AComponent: TComponent; Operation: TOperation); override;
!     function GetCombinedIgnoreProperties: TStrings;
    public
      constructor Create(AOwner: TComponent); override;
--- 75,79 ----
      procedure StoreData; virtual;
      procedure Notification(AComponent: TComponent; Operation: TOperation); override;
!     function GetCombinedIgnoreProperties: TStringList;
    public
      constructor Create(AOwner: TComponent); override;
***************
*** 79,87 ****
      function TranslatePropertyName(AName: string): string; virtual;
      property AppStorage: TJvCustomAppStorage read FAppStorage write SetAppStorage;
!     property CombinedIgnoreProperties: TStrings read GetCombinedIgnoreProperties;
!     property IgnoreProperties: TStrings read GetIgnoreProperties write SetIgnoreProperties;
      property AutoLoad: Boolean read FAutoLoad write SetAutoLoad;
      property AppStoragePath: string read FAppStoragePath write SetPath;
      property Enabled: Boolean read FEnabled write FEnabled default True;
      property DeleteBeforeStore: Boolean read FDeleteBeforeStore write FDeleteBeforeStore default False;
      property ClearBeforeLoad: Boolean read FClearBeforeLoad write FClearBeforeLoad default False;
--- 85,94 ----
      function TranslatePropertyName(AName: string): string; virtual;
      property AppStorage: TJvCustomAppStorage read FAppStorage write SetAppStorage;
!     property CombinedIgnoreProperties: TStringList read GetCombinedIgnoreProperties;
!     property IgnoreProperties: TJvIgnorePropertiesStringList read GetIgnoreProperties write SetIgnoreProperties;
      property AutoLoad: Boolean read FAutoLoad write SetAutoLoad;
      property AppStoragePath: string read FAppStoragePath write SetPath;
      property Enabled: Boolean read FEnabled write FEnabled default True;
+     property ReadOnly: Boolean read FEnabled write FEnabled default False;
      property DeleteBeforeStore: Boolean read FDeleteBeforeStore write FDeleteBeforeStore default False;
      property ClearBeforeLoad: Boolean read FClearBeforeLoad write FClearBeforeLoad default False;
***************
*** 156,160 ****
  type
    // Read-only TStrings combining multiple TStrings instances in a single list
!   TCombinedStrings = class(TStrings)
    private
      FList: TList;
--- 163,167 ----
  type
    // Read-only TStrings combining multiple TStrings instances in a single list
!   TCombinedStrings = class(TStringList)
    private
      FList: TList;
***************
*** 258,266 ****
  end;
  
  //=== { TJvCustomPropertyStore } =============================================
  
  constructor TJvCustomPropertyStore.Create(AOwner: TComponent);
  const
!   IgnorePropertyList: array [1..15] of PChar =
     (
      'AboutJVCL',
--- 265,286 ----
  end;
  
+ //=== { TJvIgnorePropertiesStringList } =============================================
+ 
+ procedure TJvIgnorePropertiesStringList.AddDelete (iItem : String; iDelete : Boolean);
+ begin
+   if iDelete then
+     if (IndexOf(iItem) >= 0) then
+       Delete(IndexOf(iitem))
+     else
+   else
+     if (IndexOf(iItem) < 0) then
+       Add(iItem);
+ end;
+ 
  //=== { TJvCustomPropertyStore } =============================================
  
  constructor TJvCustomPropertyStore.Create(AOwner: TComponent);
  const
!   IgnorePropertyList: array [1..16] of PChar =
     (
      'AboutJVCL',
***************
*** 272,275 ****
--- 292,296 ----
      'Tag',
      'Enabled',
+     'ReadOnly',
      'DeleteBeforeStore',
      'IgnoreLastLoadTime',
***************
*** 287,294 ****
    FAppStorage := nil;
    FEnabled := True;
    FDeleteBeforeStore := False;
    FAutoLoad := False;
    FIntIgnoreProperties := TStringList.Create;
!   FIgnoreProperties := TStringList.Create;
    FIgnoreLastLoadTime := False;
    FCombinedIgnoreProperties := TCombinedStrings.Create;
--- 308,316 ----
    FAppStorage := nil;
    FEnabled := True;
+   FReadOnly := False;
    FDeleteBeforeStore := False;
    FAutoLoad := False;
    FIntIgnoreProperties := TStringList.Create;
!   FIgnoreProperties := TJvIgnorePropertiesStringList.Create;
    FIgnoreLastLoadTime := False;
    FCombinedIgnoreProperties := TCombinedStrings.Create;
***************
*** 317,321 ****
  end;
  
! function TJvCustomPropertyStore.GetCombinedIgnoreProperties: TStrings;
  begin
    FCombinedIgnoreProperties.Assign(FIntIgnoreProperties);
--- 339,343 ----
  end;
  
! function TJvCustomPropertyStore.GetCombinedIgnoreProperties: TStringList;
  begin
    FCombinedIgnoreProperties.Assign(FIntIgnoreProperties);
***************
*** 495,504 ****
  end;
  
! function TJvCustomPropertyStore.GetIgnoreProperties: TStrings;
  begin
    Result := FIgnoreProperties;
  end;
  
! procedure TJvCustomPropertyStore.SetIgnoreProperties(Value: TStrings);
  begin
    FIgnoreProperties.Assign(Value);
--- 517,526 ----
  end;
  
! function TJvCustomPropertyStore.GetIgnoreProperties: TJvIgnorePropertiesStringList;
  begin
    Result := FIgnoreProperties;
  end;
  
! procedure TJvCustomPropertyStore.SetIgnoreProperties(Value: TJvIgnorePropertiesStringList);
  begin
    FIgnoreProperties.Assign(Value);
***************
*** 519,523 ****
    end;
  end;
! 
  procedure TJvCustomPropertyStore.LoadProperties;
  begin
--- 541,545 ----
    end;
  end;
!  
  procedure TJvCustomPropertyStore.LoadProperties;
  begin
***************
*** 544,547 ****
--- 566,571 ----
    if not Enabled then
      Exit;
+   if ReadOnly then
+     Exit;
    if not Assigned(AppStorage) then
      Exit;

Update of /cvsroot/jvcl/dev/JVCL3/devtools/ReadPalettes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28407/JVCL3/devtools/ReadPalettes

Modified Files:
	ReadPalettes.pas 
Log Message:
completed, with package names for file names


Index: ReadPalettes.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/ReadPalettes/ReadPalettes.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReadPalettes.pas	23 Dec 2004 07:51:47 -0000	1.4
--- ReadPalettes.pas	23 Dec 2004 15:21:25 -0000	1.5
***************
*** 63,71 ****
  procedure AddPackageNames(List: TStringList);
  var
!   I, J, N: Integer;
    ModSvc: IOTAModuleServices;
    Module: IOTAModule;
!   FileSys: IOTAFileSystem;
!   UnitName, Line: string;
  begin
    ModSvc := (BorlandIDEServices as IOTAModuleServices);
--- 63,73 ----
  procedure AddPackageNames(List: TStringList);
  var
!   I, J, K, N: Integer;
    ModSvc: IOTAModuleServices;
    Module: IOTAModule;
!   ModuleInfo: IOTAModuleInfo;
!   Proj: IOTAProject;
!   UnitName: string;
!   Flag: Boolean;
  begin
    ModSvc := (BorlandIDEServices as IOTAModuleServices);
***************
*** 77,90 ****
      begin
        UnitName := Copy(UnitName, N + 1, Length(UnitName));
-       Line := Copy(List[I], 1, N - 1);
        N := Pos(';', UnitName);
      end;
      UnitName := Copy(UnitName, 2, Length(UnitName) - 2);
!     for J := 0 to ModSvc.ModuleCount - 1 do
      begin
        Module := ModSvc.Modules[J];
!       FileSys := ModSvc.FindFileSystem(Module.FileSystem);
!       if Assigned(FileSys) and FileSys.FileExists(UnitName) then
!         List[I] := Line + ';"' + Module.FileName + '.' + UnitName + '"';
      end;
    end;
--- 79,102 ----
      begin
        UnitName := Copy(UnitName, N + 1, Length(UnitName));
        N := Pos(';', UnitName);
      end;
      UnitName := Copy(UnitName, 2, Length(UnitName) - 2);
!     Flag := False;
!     for J := 1 to ModSvc.ModuleCount - 1 do
      begin
        Module := ModSvc.Modules[J];
!       Proj := Module as IOTAProject;
!       for K := 0 to Proj.GetModuleCount - 1 do
!       begin
!         ModuleInfo := Proj.GetModule(K);
!         if UnitName = ExtractFileName(ModuleInfo.FileName) then
!         begin
!           List[I] := List[I] + ';"' + ChangeFileExt(ExtractFileName(Module.FileName), '') + '"';
!           Flag := True;
!           Break;
!         end;
!       end;
!       if Flag then
!         Break;
      end;
    end;
***************
*** 115,119 ****
  
    N := 1;
!   VisibleComponentList.Add('"ID";"Palette";"Component";"FileName"');
    for I := 0 to PaletteTab.Tabs.Count - 1 do
    begin
--- 127,131 ----
  
    N := 1;
!   VisibleComponentList.Add('"ID";"Palette";"Component";"FileName";"JVCLPackage"');
    for I := 0 to PaletteTab.Tabs.Count - 1 do
    begin
***************
*** 373,388 ****
    AddIDs(RegisterClassList);
  
-   {
    AddPackageNames(CustomModuleList);
    AddPackageNames(NoIconList);
    AddPackageNames(ActionsList);
    AddPackageNames(VisibleComponentList);
-   }
  
    PropertyEditorList.Insert(0, '"ID";"PropertyType_Name";"ComponentClass_ClassName";"PropertyName";"EditorClass_ClassName"');
    ComponentEditorList.Insert(0, '"ID";"ComponentClass_ClassName";"ComponentEditor_ClassName"');
!   CustomModuleList.Insert(0, '"ID";"Group";"ComponentBaseClass_ClassName";"CustomModuleClass_ClassName";"FileName"');
!   NoIconList.Insert(0, '"ID";"ClassName";"FileName"');
!   ActionsList.Insert(0, '"ID";"CategoryName";"ClassName";"Resource_ClassName";"FileName"');
    PackageWizardList.Insert(0, '"ID";"WizardName";"WizardIDString"');
    RegisterClassList.Insert(0, '"ID";"ClassName"');
--- 385,398 ----
    AddIDs(RegisterClassList);
  
    AddPackageNames(CustomModuleList);
    AddPackageNames(NoIconList);
    AddPackageNames(ActionsList);
    AddPackageNames(VisibleComponentList);
  
    PropertyEditorList.Insert(0, '"ID";"PropertyType_Name";"ComponentClass_ClassName";"PropertyName";"EditorClass_ClassName"');
    ComponentEditorList.Insert(0, '"ID";"ComponentClass_ClassName";"ComponentEditor_ClassName"');
!   CustomModuleList.Insert(0, '"ID";"Group";"ComponentBaseClass_ClassName";"CustomModuleClass_ClassName";"FileName";"JVCLPackage"');
!   NoIconList.Insert(0, '"ID";"ClassName";"FileName";"JVCLPackage"');
!   ActionsList.Insert(0, '"ID";"CategoryName";"ClassName";"Resource_ClassName";"FileName";"JVCLPackage"');
    PackageWizardList.Insert(0, '"ID";"WizardName";"WizardIDString"');
    RegisterClassList.Insert(0, '"ID";"ClassName"');

Update of /cvsroot/jvcl/dev/JVCL3/design
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16731/JVCL3/design

Modified Files:
	JvBandObjectDLLWizard.pas JvDsgnConsts.pas JvPluginWizard.pas 
Log Message:
renamed Wizard ID strings


Index: JvPluginWizard.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/design/JvPluginWizard.pas,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** JvPluginWizard.pas	19 Oct 2004 08:11:53 -0000	1.28
--- JvPluginWizard.pas	23 Dec 2004 07:51:47 -0000	1.29
***************
*** 189,193 ****
  function TJvPluginWizard.GetIDString: string;
  begin
!   Result := 'JVCL.PluginWizard';
  end;
  
--- 189,193 ----
  function TJvPluginWizard.GetIDString: string;
  begin
!   Result := RsPluginWizardIDString;
  end;
  

Index: JvBandObjectDLLWizard.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/design/JvBandObjectDLLWizard.pas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** JvBandObjectDLLWizard.pas	22 Jul 2004 07:36:32 -0000	1.16
--- JvBandObjectDLLWizard.pas	23 Dec 2004 07:51:46 -0000	1.17
***************
*** 201,205 ****
  function TJvBandObjectDLLWizard.GetIDString: string;
  begin
!   Result := 'ctZen.JvBandObjectDLLWizard';
  end;
  
--- 201,205 ----
  function TJvBandObjectDLLWizard.GetIDString: string;
  begin
!   Result := RsBandObjectDLLWizardIDString;
  end;
  

Index: JvDsgnConsts.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/design/JvDsgnConsts.pas,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** JvDsgnConsts.pas	15 Dec 2004 07:30:51 -0000	1.49
--- JvDsgnConsts.pas	23 Dec 2004 07:51:47 -0000	1.50
***************
*** 118,121 ****
--- 118,122 ----
    RsCreatesABandObjectDLLProject = 'Creates a Band Object DLL Project.';
    RsBandObjectDLLWizard = 'Band Object DLL Wizard';
+   RsBandObjectDLLWizardIDString = 'JVCL.JvBandObjectDLLWizard';
  
  //=== JvBandObjectDLLWizardForm.pas ==========================================
***************
*** 607,610 ****
--- 608,612 ----
      '// type and the type created must be the same as the declared type above.';
    RsJediPluginWizard = 'JEDI Plugin Wizard';
+   RsPluginWizardIDString = 'JVCL.JvPluginWizard';
  
  //=== JvPreviewReg.pas =======================================================

Update of /cvsroot/jvcl/dev/JVCL3/devtools/ReadPalettes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16731/JVCL3/devtools/ReadPalettes

Modified Files:
	ReadPalettes.pas 
Log Message:
renamed Wizard ID strings


Index: ReadPalettes.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/ReadPalettes/ReadPalettes.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReadPalettes.pas	22 Dec 2004 09:57:44 -0000	1.3
--- ReadPalettes.pas	23 Dec 2004 07:51:47 -0000	1.4
***************
*** 28,31 ****
--- 28,33 ----
    NoIconList: TStringList;
    ActionsList: TStringList;
+   PackageWizardList: TStringList;
+   RegisterClassList: TStringList;
  
    OldSpyRegisterPropertyEditor: TRegisterPropertyEditorProc;
***************
*** 33,38 ****
    OldSpyRegisterCustomModule: TRegisterCustomModuleProc;
    OldSpyRegisterNoIcon: procedure(ComponentClasses: array of TComponentClass);
!   OldSpyRegisterActions: procedure (const CategoryName: string;
!     const AClasses: array of TBasicActionClass; Resource: TComponentClass) = nil;
  
  procedure SaveFile(AFileName: string; List: TStringList);
--- 35,41 ----
    OldSpyRegisterCustomModule: TRegisterCustomModuleProc;
    OldSpyRegisterNoIcon: procedure(ComponentClasses: array of TComponentClass);
!   OldSpyRegisterActions: procedure(const CategoryName: string;
!     const AClasses: array of TBasicActionClass; Resource: TComponentClass);
!   OldSpyRegisterPackageWizard: TWizardRegisterProc;
  
  procedure SaveFile(AFileName: string; List: TStringList);
***************
*** 58,61 ****
--- 61,94 ----
  end;
  
+ procedure AddPackageNames(List: TStringList);
+ var
+   I, J, N: Integer;
+   ModSvc: IOTAModuleServices;
+   Module: IOTAModule;
+   FileSys: IOTAFileSystem;
+   UnitName, Line: string;
+ begin
+   ModSvc := (BorlandIDEServices as IOTAModuleServices);
+   for I := 0 to List.Count - 1 do
+   begin
+     UnitName := List[I];
+     N := Pos(';', UnitName);
+     while N > 0 do
+     begin
+       UnitName := Copy(UnitName, N + 1, Length(UnitName));
+       Line := Copy(List[I], 1, N - 1);
+       N := Pos(';', UnitName);
+     end;
+     UnitName := Copy(UnitName, 2, Length(UnitName) - 2);
+     for J := 0 to ModSvc.ModuleCount - 1 do
+     begin
+       Module := ModSvc.Modules[J];
+       FileSys := ModSvc.FindFileSystem(Module.FileSystem);
+       if Assigned(FileSys) and FileSys.FileExists(UnitName) then
+         List[I] := Line + ';"' + Module.FileName + '.' + UnitName + '"';
+     end;
+   end;
+ end;
+ 
  procedure ReadRegisterComponents;
  var
***************
*** 68,72 ****
    OldPaletteIndex, OldToolIndex: Integer;
    SelectedToolName: string;
!   AClass: TPersistentClass;
    UnitName: string;
  begin
--- 101,105 ----
    OldPaletteIndex, OldToolIndex: Integer;
    SelectedToolName: string;
!   LClass: TPersistentClass;
    UnitName: string;
  begin
***************
*** 95,106 ****
        PropInfo := GetPropInfo(Palette.ClassInfo, 'SelectedToolName');
        SelectedToolName := GetStrProp(Palette, PropInfo);
!       AClass := GetClass(SelectedToolName);
!       if (AClass = nil) or (AClass.ClassInfo = nil) then
!         UnitName := 'Unable to get RTTI'
        else
!         UnitName := GetTypeData(AClass.ClassInfo).UnitName;
!       if (Pos('JV', PaletteTab.Tabs[I]) = 1) or (Pos('Jv', PaletteTab.Tabs[I]) = 1) then
        begin
!         VisibleComponentList.Add(Format('%u;"%s";"%s";"%s.pas"', [N, PaletteTab.Tabs[I], SelectedToolName, UnitName]));
          Inc(N);
        end;
--- 128,139 ----
        PropInfo := GetPropInfo(Palette.ClassInfo, 'SelectedToolName');
        SelectedToolName := GetStrProp(Palette, PropInfo);
!       LClass := GetClass(SelectedToolName);
!       if (LClass = nil) or (LClass.ClassInfo = nil) then
!         UnitName := ''
        else
!         UnitName := GetTypeData(LClass.ClassInfo).UnitName + '.pas';
!       if Pos('Jv', PaletteTab.Tabs[I]) = 1 then
        begin
!         VisibleComponentList.Add(Format('%u;"%s";"%s";"%s"', [N, PaletteTab.Tabs[I], SelectedToolName, UnitName]));
          Inc(N);
        end;
***************
*** 114,117 ****
--- 147,175 ----
  end;
  
+ type
+   TCarrier = class(TObject)
+   public
+     procedure GetClassCallback(AClass: TPersistentClass);
+   end;
+ 
+ procedure TCarrier.GetClassCallback(AClass: TPersistentClass);
+ begin
+   if Pos('TJv', AClass.ClassName) = 1 then
+     RegisterClassList.Add(Format('"%s"', [AClass.ClassName]));
+ end;
+ 
+ procedure ReadRegisterClass;
+ var
+   Carrier: TCarrier;
+ begin
+   Carrier := TCarrier.Create;
+   with TClassFinder.Create(nil, True) do
+   begin
+     GetClasses(Carrier.GetClassCallback);
+     Free;
+   end;
+   Carrier.Free;
+ end;
+ 
  procedure SpyRegisterComponentEditor(ComponentClass: TComponentClass; ComponentEditor: TComponentEditorClass);
  begin
***************
*** 138,148 ****
  procedure SpyRegisterCustomModule(Group: Integer;
    ComponentBaseClass: TComponentClass; CustomModuleClass: TCustomModuleClass);
  begin
-   if Assigned(ComponentBaseClass) and Assigned(CustomModuleClass) then
-     //if (Pos('TJv', ComponentBaseClass.ClassName) = 1) or (Pos('TJv', CustomModuleClass.ClassName) = 1) then
-       CustomModuleList.Add(Format('%u;"%s";"%s"',
-         [Group, ComponentBaseClass.ClassName, CustomModuleClass.ClassName]));
    if Assigned(OldSpyRegisterCustomModule) then
      OldSpyRegisterCustomModule(Group, ComponentBaseClass, CustomModuleClass);
  end;
  
--- 196,213 ----
  procedure SpyRegisterCustomModule(Group: Integer;
    ComponentBaseClass: TComponentClass; CustomModuleClass: TCustomModuleClass);
+ var
+   UnitName: string;
  begin
    if Assigned(OldSpyRegisterCustomModule) then
      OldSpyRegisterCustomModule(Group, ComponentBaseClass, CustomModuleClass);
+   if Assigned(ComponentBaseClass) and Assigned(CustomModuleClass) then
+   begin
+     if ComponentBaseClass.ClassInfo = nil then
+       UnitName := ''
+     else
+       UnitName := GetTypeData(ComponentBaseClass.ClassInfo).UnitName + '.pas';
+     CustomModuleList.Add(Format('%u;"%s";"%s";"%s"',
+       [Group, ComponentBaseClass.ClassName, CustomModuleClass.ClassName, UnitName]));
+   end;
  end;
  
***************
*** 150,158 ****
  var
    I: Integer;
  begin
-   for I := Low(ComponentClasses) to High(ComponentClasses) do
-     NoIconList.Add(Format('"%s"', [ComponentClasses[I].ClassName]));
    if Assigned(OldSpyRegisterNoIcon) then
      OldSpyRegisterNoIcon(ComponentClasses);
  end;
  
--- 215,230 ----
  var
    I: Integer;
+   UnitName: string;
  begin
    if Assigned(OldSpyRegisterNoIcon) then
      OldSpyRegisterNoIcon(ComponentClasses);
+   for I := Low(ComponentClasses) to High(ComponentClasses) do
+   begin
+     if ComponentClasses[I].ClassInfo = nil then
+       UnitName := ''
+     else
+       UnitName := GetTypeData(ComponentClasses[I].ClassInfo).UnitName + '.pas';
+     NoIconList.Add(Format('"%s";"%s"', [ComponentClasses[I].ClassName, UnitName]));
+   end;
  end;
  
***************
*** 161,172 ****
  var
    I: Integer;
  begin
    for I := Low(AClasses) to High(AClasses) do
      if Assigned(Resource) then
!       ActionsList.Add(Format('"%s";"%s";"%s"', [CategoryName, AClasses[I].ClassName, Resource.ClassName]))
      else
!       ActionsList.Add(Format('"%s";"%s";""', [CategoryName, AClasses[I].ClassName]));
!   if Assigned(OldSpyRegisterActions) then
!     OldSpyRegisterActions(CategoryName, AClasses, Resource);
  end;
  
--- 233,251 ----
  var
    I: Integer;
+   UnitName: string;
  begin
+   if Assigned(OldSpyRegisterActions) then
+     OldSpyRegisterActions(CategoryName, AClasses, Resource);
    for I := Low(AClasses) to High(AClasses) do
+   begin
+     if AClasses[I].ClassInfo = nil then
+       UnitName := ''
+     else
+       UnitName := GetTypeData(AClasses[I].ClassInfo).UnitName + '.pas';
      if Assigned(Resource) then
!       ActionsList.Add(Format('"%s";"%s";"%s";"%s"', [CategoryName, AClasses[I].ClassName, Resource.ClassName, UnitName]))
      else
!       ActionsList.Add(Format('"%s";"%s";"";"%s"', [CategoryName, AClasses[I].ClassName, UnitName]));
!   end;
  end;
  
***************
*** 174,178 ****
  var
    I, N: Integer;
!   S: string;
  begin
    for I := 0 to ActionsList.Count - 1 do
--- 253,257 ----
  var
    I, N: Integer;
!   F, S: string;
  begin
    for I := 0 to ActionsList.Count - 1 do
***************
*** 181,216 ****
      S := Copy(ActionsList[I], N + 1, Length(ActionsList[I]));
      N := Pos(';', S);
!     S := Copy(S, 1, N - 1);
!     if NoIconList.Find(S, N) then
        NoIconList.Delete(N);
    end;
  end;
  
! procedure ReadRegisterPackageWizard;
! begin
! end;
! 
! procedure ReadRegisterClass;
! begin
! end;
! 
! {$IFDEF COMPILER7_UP}
! procedure ReadGroupDescendentsWith;
  begin
  end;
- {$ENDIF COMPILER7_UP}
  
! procedure ReadReadRegisterComponentsByToolsAPI;
  var
!   PackageTest: IOTAPackageServices;
    I, J, N: Integer;
  begin
!   PackageTest := (BorlandIDEServices as IOTAPackageServices);
    N := 1;
!   for I := 0 to PackageTest.PackageCount - 1 do
!     if (Pos('jv', PackageTest.PackageNames[I]) = 1) or (Pos('Jv', PackageTest.PackageNames[I]) = 1) then
!       for J := 0 to PackageTest.ComponentCount[I] - 1 do
        begin
!         AllComponentList.Add(Format('%u;"%s";"%s"', [N, PackageTest.PackageNames[I], PackageTest.ComponentNames[I, J]]));
          Inc(N);
        end;
--- 260,296 ----
      S := Copy(ActionsList[I], N + 1, Length(ActionsList[I]));
      N := Pos(';', S);
!     F := Copy(S, 1, N - 1);
!     S := Copy(S, N + 1, Length(S));
!     N := Pos(';', S);
!     S := Copy(S, N + 1, Length(S));
!     N := Pos(';', S);
!     S := Copy(S, N + 1, Length(S));
!     F := F + ';' + S;
!     if NoIconList.Find(F, N) then
        NoIconList.Delete(N);
    end;
  end;
  
! function SpyRegisterPackageWizard(const Wizard: IOTAWizard): Boolean;
  begin
+   Result := False;
+   if Assigned(OldSpyRegisterPackageWizard) then
+     Result := OldSpyRegisterPackageWizard(Wizard);
+   if Pos('JVCL.', Wizard.GetIDString) = 1 then
+     PackageWizardList.Add(Format('"%s";"%s"', [Wizard.GetName, Wizard.GetIDString]));
  end;
  
! procedure ReadReadRegisterComponentsByOTA;
  var
!   Pkg: IOTAPackageServices;
    I, J, N: Integer;
  begin
!   Pkg := (BorlandIDEServices as IOTAPackageServices);
    N := 1;
!   for I := 0 to Pkg.PackageCount - 1 do
!     if (Pos('jv', Pkg.PackageNames[I]) = 1) or (Pos('Jv', Pkg.PackageNames[I]) = 1) then
!       for J := 0 to Pkg.ComponentCount[I] - 1 do
        begin
!         AllComponentList.Add(Format('%u;"%s";"%s"', [N, Pkg.PackageNames[I], Pkg.ComponentNames[I, J]]));
          Inc(N);
        end;
***************
*** 218,229 ****
  end;
  
  procedure Register;
  begin
    ReadRegisterComponents;
-   ReadRegisterPackageWizard;
-   ReadRegisterClass;
-   {$IFDEF COMPILER7_UP}
-   ReadGroupDescendentsWith;
-   {$ENDIF COMPILER7_UP}
  end;
  
--- 298,319 ----
  end;
  
+ procedure ReadModulesByOTA;
+ var
+   I: Integer;
+   ModSvc: IOTAModuleServices;
+   List: TStringList;
+ begin
+   List := TStringList.Create;
+   ModSvc := (BorlandIDEServices as IOTAModuleServices);
+   for I := 0 to ModSvc.ModuleCount - 1 do
+     List.Add(ModSvc.Modules[I].FileName + ' ' + ModSvc.Modules[I].FileSystem);
+ 
+   SaveFile('modules.csv', List);
+   List.Free;
+ end;
+ 
  procedure Register;
  begin
    ReadRegisterComponents;
  end;
  
***************
*** 246,249 ****
--- 336,343 ----
    ActionsList.Duplicates := dupIgnore;
    ActionsList.Sorted := True;
+   PackageWizardList := TStringList.Create;
+   PackageWizardList.Duplicates := dupIgnore;
+   PackageWizardList.Sorted := True;
+   RegisterClassList := TStringList.Create;
  
    OldSpyRegisterPropertyEditor := RegisterPropertyEditorProc;
***************
*** 257,260 ****
--- 351,356 ----
    OldSpyRegisterActions := RegisterActionsProc;
    RegisterActionsProc := SpyRegisterActions;
+   OldSpyRegisterPackageWizard := LibraryWizardProc;
+   LibraryWizardProc := SpyRegisterPackageWizard;
  
  finalization
***************
*** 264,269 ****
--- 360,367 ----
    RegisterNoIconProc := OldSpyRegisterNoIcon;
    RegisterActionsProc := OldSpyRegisterActions;
+   LibraryWizardProc := OldSpyRegisterPackageWizard;
  
    CleanNoIconList;
+   ReadRegisterClass;
  
    AddIDs(PropertyEditorList);
***************
*** 272,281 ****
    AddIDs(NoIconList);
    AddIDs(ActionsList);
  
    PropertyEditorList.Insert(0, '"ID";"PropertyType_Name";"ComponentClass_ClassName";"PropertyName";"EditorClass_ClassName"');
    ComponentEditorList.Insert(0, '"ID";"ComponentClass_ClassName";"ComponentEditor_ClassName"');
!   CustomModuleList.Insert(0, '"ID";"Group";"ComponentBaseClass_ClassName";"CustomModuleClass_ClassName"');
!   NoIconList.Insert(0, '"ID";"ClassName"');
!   ActionsList.Insert(0, '"ID";"CategoryName";"ClassName";"Resource_ClassName"');
    SaveFile('JVCL Visible Components.csv', VisibleComponentList);
    SaveFile('JVCL Property Editors.csv', PropertyEditorList);
--- 370,390 ----
    AddIDs(NoIconList);
    AddIDs(ActionsList);
+   AddIDs(PackageWizardList);
+   AddIDs(RegisterClassList);
+ 
+   {
+   AddPackageNames(CustomModuleList);
+   AddPackageNames(NoIconList);
+   AddPackageNames(ActionsList);
+   AddPackageNames(VisibleComponentList);
+   }
  
    PropertyEditorList.Insert(0, '"ID";"PropertyType_Name";"ComponentClass_ClassName";"PropertyName";"EditorClass_ClassName"');
    ComponentEditorList.Insert(0, '"ID";"ComponentClass_ClassName";"ComponentEditor_ClassName"');
!   CustomModuleList.Insert(0, '"ID";"Group";"ComponentBaseClass_ClassName";"CustomModuleClass_ClassName";"FileName"');
!   NoIconList.Insert(0, '"ID";"ClassName";"FileName"');
!   ActionsList.Insert(0, '"ID";"CategoryName";"ClassName";"Resource_ClassName";"FileName"');
!   PackageWizardList.Insert(0, '"ID";"WizardName";"WizardIDString"');
!   RegisterClassList.Insert(0, '"ID";"ClassName"');
    SaveFile('JVCL Visible Components.csv', VisibleComponentList);
    SaveFile('JVCL Property Editors.csv', PropertyEditorList);
***************
*** 284,287 ****
--- 393,398 ----
    SaveFile('JVCL No Icon Components.csv', NoIconList);
    SaveFile('JVCL Actions.csv', ActionsList);
+   SaveFile('JVCL Package Wizards.csv', PackageWizardList);
+   SaveFile('JVCL Registered Classes.csv', RegisterClassList);
    FreeAndNil(VisibleComponentList);
    FreeAndNil(AllComponentList);
***************
*** 291,294 ****
--- 402,407 ----
    FreeAndNil(NoIconList);
    FreeAndNil(ActionsList);
+   FreeAndNil(PackageWizardList);
+   FreeAndNil(RegisterClassList);
  
  end.

Update of /cvsroot/jvcl/dev/JVCL3/qdesign
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16731/JVCL3/qdesign

Modified Files:
	JvQDsgnConsts.pas 
Log Message:
renamed Wizard ID strings


Index: JvQDsgnConsts.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/qdesign/JvQDsgnConsts.pas,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JvQDsgnConsts.pas	10 Dec 2004 22:42:46 -0000	1.17
--- JvQDsgnConsts.pas	23 Dec 2004 07:51:47 -0000	1.18
***************
*** 121,124 ****
--- 121,125 ----
    RsCreatesABandObjectDLLProject = 'Creates a Band Object DLL Project.';
    RsBandObjectDLLWizard = 'Band Object DLL Wizard';
+   RsBandObjectDLLWizardIDString = 'JVCL.JvBandObjectDLLWizard';
  
  //=== JvBandObjectDLLWizardForm.pas ==========================================
***************
*** 611,614 ****
--- 612,616 ----
      '// type and the type created must be the same as the declared type above.';
    RsJediPluginWizard = 'JEDI Plugin Wizard';
+   RsPluginWizardIDString = 'JVCL.JvPluginWizard';
  
  //=== JvPreviewReg.pas =======================================================

Update of /cvsroot/jvcl/dev/JVCL3/packages/d6
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9702/JVCL3/packages/d6

Modified Files:
	JvGlobusD6D.dpk JvGlobusD6R.dpk JvInterpreterD6R.dpk 
Log Message:
D6 fix for BDE


Index: JvGlobusD6D.dpk
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/packages/d6/JvGlobusD6D.dpk,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** JvGlobusD6D.dpk	6 Nov 2004 20:01:30 -0000	1.28
--- JvGlobusD6D.dpk	23 Dec 2004 06:59:31 -0000	1.29
***************
*** 5,9 ****
              ALWAYS EDIT THE RELATED XML FILE (JvGlobus-D.xml)
  
!      Last generated: 06-11-2004  18:52:03 UTC
  -----------------------------------------------------------------------------
  }
--- 5,9 ----
              ALWAYS EDIT THE RELATED XML FILE (JvGlobus-D.xml)
  
!      Last generated: 23-12-2004  06:33:41 UTC
  -----------------------------------------------------------------------------
  }
***************
*** 46,50 ****
    vclsmp,
    vcldb,
-   qrpt,
    vcljpg,
    vclie
--- 46,49 ----

Index: JvInterpreterD6R.dpk
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/packages/d6/JvInterpreterD6R.dpk,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** JvInterpreterD6R.dpk	6 Nov 2004 20:01:30 -0000	1.15
--- JvInterpreterD6R.dpk	23 Dec 2004 06:59:31 -0000	1.16
***************
*** 5,9 ****
              ALWAYS EDIT THE RELATED XML FILE (JvInterpreter-R.xml)
  
!      Last generated: 06-11-2004  18:52:04 UTC
  -----------------------------------------------------------------------------
  }
--- 5,9 ----
              ALWAYS EDIT THE RELATED XML FILE (JvInterpreter-R.xml)
  
!      Last generated: 23-12-2004  06:33:41 UTC
  -----------------------------------------------------------------------------
  }
***************
*** 43,47 ****
    dbrtl,
    bdertl,
-   qrpt,
    inet,
    vcldb
--- 43,46 ----
***************
*** 70,74 ****
    JvInterpreter_JvUtils in '..\..\run\JvInterpreter_JvUtils.pas' ,
    JvInterpreter_Menus in '..\..\run\JvInterpreter_Menus.pas' ,
-   JvInterpreter_Quickrpt in '..\..\run\JvInterpreter_Quickrpt.pas' ,
    JvInterpreter_StdCtrls in '..\..\run\JvInterpreter_StdCtrls.pas' ,
    JvInterpreter_System in '..\..\run\JvInterpreter_System.pas' ,
--- 69,72 ----

Index: JvGlobusD6R.dpk
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/packages/d6/JvGlobusD6R.dpk,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** JvGlobusD6R.dpk	6 Nov 2004 20:01:30 -0000	1.26
--- JvGlobusD6R.dpk	23 Dec 2004 06:59:31 -0000	1.27
***************
*** 5,9 ****
              ALWAYS EDIT THE RELATED XML FILE (JvGlobus-R.xml)
  
!      Last generated: 06-11-2004  18:52:03 UTC
  -----------------------------------------------------------------------------
  }
--- 5,9 ----
              ALWAYS EDIT THE RELATED XML FILE (JvGlobus-R.xml)
  
!      Last generated: 23-12-2004  06:57:07 UTC
  -----------------------------------------------------------------------------
  }
***************
*** 42,47 ****
    vcldb,
    vclx,
-   qrpt,
    vclie,
    vclsmp,
    JvCoreD6R,
--- 42,47 ----
    vcldb,
    vclx,
    vclie,
+   bdertl,
    vclsmp,
    JvCoreD6R,
***************
*** 120,126 ****
    JvgProcessUtils in '..\..\run\JvgProcessUtils.pas' ,
    JvgProgress in '..\..\run\JvgProgress.pas' ,
-   JvgQPrintPreviewForm in '..\..\run\JvgQPrintPreviewForm.pas' {JvgfPrintPreview},
-   JvgQPrintSetupForm in '..\..\run\JvgQPrintSetupForm.pas' {JvgPrintSetup},
-   JvgQRLabel in '..\..\run\JvgQRLabel.pas' ,
    JvgReport in '..\..\run\JvgReport.pas' ,
    JvgXMLSerializer in '..\..\run\JvgXMLSerializer.pas' ,
--- 120,123 ----

Update of /cvsroot/jvcl/dev/JVCL3/packages/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9702/JVCL3/packages/xml

Modified Files:
	JvGlobus-R.xml 
Log Message:
D6 fix for BDE


Index: JvGlobus-R.xml
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/packages/xml/JvGlobus-R.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JvGlobus-R.xml	22 Dec 2004 09:05:26 -0000	1.17
--- JvGlobus-R.xml	23 Dec 2004 06:59:31 -0000	1.18
***************
*** 28,32 ****
      <Package Name="qr4rund7" Targets="D7" Condition="QREPORT4 & JVCL_UseQuickReport"/>
      <Package Name="vclie" Targets="C6,D6,D7" Condition=""/>
!     <Package Name="bdertl" Targets="C6,D7,D9" Condition=""/>
      <Package Name="vclsmp50" Targets="D5,D5s" Condition=""/>
      <Package Name="vclsmp" Targets="D6,D6p,D7p" Condition=""/>
--- 28,32 ----
      <Package Name="qr4rund7" Targets="D7" Condition="QREPORT4 & JVCL_UseQuickReport"/>
      <Package Name="vclie" Targets="C6,D6,D7" Condition=""/>
!     <Package Name="bdertl" Targets="C6,D6,D7,D9" Condition=""/>
      <Package Name="vclsmp50" Targets="D5,D5s" Condition=""/>
      <Package Name="vclsmp" Targets="D6,D6p,D7p" Condition=""/>

Update of /cvsroot/jvcl/dev/JVCL3/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32633/common

Added Files:
	jvclc5.inc 
Log Message:
New jvcl.inc structure


--- NEW FILE: jvclc5.inc ---
{-----------------------------------------------------------------------------
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}

{ Enable this define if you want to register property and component editors included in
JVCL for non-JVCL components as well. }
{.$DEFINE JVCL_REGISTER_GLOBAL_DESIGNEDITORS}

{ 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}

{ 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}

Update of /cvsroot/jvcl/dev/JVCL3/locale
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32333/locale

Modified Files:
	JVCLInstall.po 
Log Message:
Update


Index: JVCLInstall.po
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/locale/JVCLInstall.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JVCLInstall.po	18 Dec 2004 16:52:29 -0000	1.10
--- JVCLInstall.po	23 Dec 2004 00:54:09 -0000	1.11
***************
*** 3,146 ****
  # This file is distributed under the same license as the JVCL package.
  # JVCL Group <jvcl@...>, 2004.
! #
  msgid ""
  msgstr ""
  "Project-Id-Version: JVCL 3\n"
! "POT-Creation-Date: 2004-12-18 17:51\n"
! "PO-Revision-Date: 2004-12-18 17:51\n"
! "Last-Translator: none <none@..."
  "MIME-Version: 1.0\n"
[...1965 lines suppressed...]
! #. FormCompile..PanelClient..LblWarningsCaption..Caption
! msgid "Warnings:"
  msgstr ""
  
! #. Programmer's name for it: RsWelcomePageSubTitle
! msgid "Welcome to the JVCL 3 installation application"
  msgstr ""
  
! #. Programmer's name for it: RsCompiled
! msgid "compiled."
  msgstr ""
  
! #. FrameConfigPage..GroupBoxJvclInc..CheckBoxDxgettextSupport..Caption
! msgid "dxgettext &support"
  msgstr ""
  
! #. Programmer's name for it: RsInstalledJVCLVersion
! msgid "installed JVCL version: %d"
  msgstr ""
+

Update of /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31735/devtools/PackagesGenerator

Modified Files:
	GenerateUtils.pas 
Log Message:
Fixed AV when xml node does not exist.


Index: GenerateUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator/GenerateUtils.pas,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** GenerateUtils.pas	23 Dec 2004 00:23:58 -0000	1.71
--- GenerateUtils.pas	23 Dec 2004 00:51:26 -0000	1.72
***************
*** 510,514 ****
        ClxReplacementList  := TClxReplacementList.Create(Node.Items.ItemNamed['ClxReplacements']);
  
!       GIncDefFileName   := Node.Properties.ItemNamed['incdeffile'].Value;
        GIncFileName      := Node.Properties.ItemNamed['IncFile'].Value;
        GPackagesLocation := Node.Properties.ItemNamed['packages'].Value;
--- 510,515 ----
        ClxReplacementList  := TClxReplacementList.Create(Node.Items.ItemNamed['ClxReplacements']);
  
!       if Assigned(Node.Properties.ItemNamed['incdeffile']) then
!         GIncDefFileName   := Node.Properties.ItemNamed['incdeffile'].Value;
        GIncFileName      := Node.Properties.ItemNamed['IncFile'].Value;
        GPackagesLocation := Node.Properties.ItemNamed['packages'].Value;

Update of /cvsroot/jvcl/dev/JVCL3/locale/de/LC_MESSAGES
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30915/locale/de/LC_MESSAGES

Modified Files:
	JVCLInstall.po 
Log Message:
Update


Index: JVCLInstall.po
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/locale/de/LC_MESSAGES/JVCLInstall.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JVCLInstall.po	18 Dec 2004 17:07:51 -0000	1.17
--- JVCLInstall.po	23 Dec 2004 00:48:07 -0000	1.18
***************
*** 2,7 ****
  msgstr ""
  "Project-Id-Version: JVCL\n"
! "POT-Creation-Date: 2004-12-18 18:02\n"
! "PO-Revision-Date: 2004-12-17 22:11+0100\n"
  "Last-Translator: Andreas Hausladen <Andreas.Hausladen@..."
  "Language-Team: \n"
--- 2,7 ----
  msgstr ""
  "Project-Id-Version: JVCL\n"
! "POT-Creation-Date: 2004-12-23 01:41\n"
[...3015 lines suppressed...]
! #. Programmer's name for it: RsError
! msgid "%s - Error"
! msgstr "%s - Fehler"
  
! #  FrameConfigPage..GroupBoxJvclInc..Caption
! msgid " JVCL Options  "
! msgstr " JVCL Optionen "
  
! #  FrameConfigPage..GroupBoxInstallOptions..Caption
! #  FrameConfigPage..GroupBoxInstallOptions..Caption
! #  FrameConfigPage..GroupBoxInstallOptions..Caption
! #  FrameConfigPage..GroupBoxInstallOptions..Caption
! msgid " Installation options "
! msgstr " Installationsoptionen "
  
! #  Programmer's name for it: RsErrorCompilingResources
! #. Programmer's name for it: RsErrorCompilingResources
! msgid "Error while compiling resources."
! msgstr "Es trat ein Fehler beim Kompilieren der Resourcedateien auf."

Update of /cvsroot/jvcl/dev/JVCL3/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28995/common

Modified Files:
	jvcl.inc 
Added Files:
	jvclbase.inc jvclc6.inc jvcld5.inc jvcld6.inc jvcld7.inc 
	jvcld9.inc jvclk3.inc 
Log Message:
New jvcl.inc structure


--- NEW FILE: jvcld6.inc ---
{-----------------------------------------------------------------------------
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}

{ Enable this define if you want to register property and component editors included in
JVCL for non-JVCL components as well. }
{.$DEFINE JVCL_REGISTER_GLOBAL_DESIGNEDITORS}

{ 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}

{ 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}


--- NEW FILE: jvclc6.inc ---
{-----------------------------------------------------------------------------
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}

{ Enable this define if you want to register property and component editors included in
JVCL for non-JVCL components as well. }
{.$DEFINE JVCL_REGISTER_GLOBAL_DESIGNEDITORS}

{ 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}

{ 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}


--- NEW FILE: jvcld5.inc ---
{-----------------------------------------------------------------------------
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}

{ Enable this define if you want to register property and component editors included in
JVCL for non-JVCL components as well. }
{.$DEFINE JVCL_REGISTER_GLOBAL_DESIGNEDITORS}

{ 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}

{ 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}


--- NEW FILE: jvclbase.inc ---
{-----------------------------------------------------------------------------
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}

{ Enable this define if you want to register property and component editors included in
JVCL for non-JVCL components as well. }
{.$DEFINE JVCL_REGISTER_GLOBAL_DESIGNEDITORS}

{ 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}

{ 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}


--- NEW FILE: jvcld7.inc ---
{-----------------------------------------------------------------------------
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}

{ Enable this define if you want to register property and component editors included in
JVCL for non-JVCL components as well. }
{.$DEFINE JVCL_REGISTER_GLOBAL_DESIGNEDITORS}

{ 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}

{ 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}


--- NEW FILE: jvclk3.inc ---
{-----------------------------------------------------------------------------
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}

{ Enable this define if you want to register property and component editors included in
JVCL for non-JVCL components as well. }
{.$DEFINE JVCL_REGISTER_GLOBAL_DESIGNEDITORS}

{ 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}

{ 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}


--- NEW FILE: jvcld9.inc ---
{-----------------------------------------------------------------------------
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}

{ Enable this define if you want to register property and component editors included in
JVCL for non-JVCL components as well. }
{.$DEFINE JVCL_REGISTER_GLOBAL_DESIGNEDITORS}

{ 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}

{ 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}


Index: jvcl.inc
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/common/jvcl.inc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** jvcl.inc	2 Oct 2004 05:49:18 -0000	1.31
--- jvcl.inc	23 Dec 2004 00:39:43 -0000	1.32
***************
*** 11,15 ****
  The Original Code is: JVCL.INC, released on 2002-07-04.
  
! Last Modified: 2003-10-01
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
--- 11,15 ----
  The Original Code is: JVCL.INC, released on 2002-07-04.
  
! Last Modified: 2004-12-22
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
***************
*** 18,22 ****
  Known Issues:
  -----------------------------------------------------------------------------}
! {$A+,B-,C+,D+,E-,F-,G+,H+,I+,J-,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1}
  
  {$I jedi.inc}
--- 18,29 ----
  Known Issues:
  -----------------------------------------------------------------------------}
! {$IFDEF JVCL_NO_DEBUGINFO} // set by the Installer
!  {$D-}
! {$ELSE}
!   // default
!  {$D+}
! {$ENDIF JVCL_NO_DEBUGINFO}
! 
! {$A+,B-,C+,E-,F-,G+,H+,I+,J-,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1}
  
  {$I jedi.inc}
***************
*** 27,79 ****
  {$ENDIF !JEDI_INC}
  
  {$IFDEF QUnit}
   {$UNDEF VCL}
   {$DEFINE VisualCLX}
-  {$UNDEF JVCLThemesEnabled}
  {$ENDIF}
  
! { Enable this define if you want to register property and component editors included in
! JVCL for non-JVCL components as well. }
! {.$DEFINE JVCL_REGISTER_GLOBAL_DESIGNEDITORS}
! 
! { 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}
  
- {$IFDEF COMPILER8_UP}
- {$UNDEF JVCL_UseQuickReport}
- {$ENDIF}
  
  {$IFNDEF JVCL_UseQuickReport}
! {$UNDEF QREPORT4}
! {$ENDIF}
! 
! {$IFDEF BCB}
!  {$ObjExportAll ON}
! {$ENDIF}
! 
! { Activate this define if you are using Delphi 5 Standard or one of the D6/D7 Personal Editions. }
! {.$DEFINE DelphiPersonalEdition}
  
! { 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}
  
  // D7 has theme support built in...
--- 34,123 ----
  {$ENDIF !JEDI_INC}
  
+ // Reduces warnings on D7:
+ {$IFDEF COMPILER7_UP}
+  {$WARN UNSAFE_TYPE OFF}
+  {$WARN UNSAFE_CODE OFF}
+  {$WARN UNSAFE_CAST OFF}
+ {$ENDIF COMPILER7_UP}
+ 
+ {$IFDEF BCB}
+  {$ObjExportAll ON}
+ {$ENDIF BCB}
+ 
  {$IFDEF QUnit}
   {$UNDEF VCL}
   {$DEFINE VisualCLX}
  {$ENDIF}
  
! {$IFNDEF DEFAULT_JVCL_INC}
! {-----------------------------------------------------------------------------}
! { Delphi                                                                      }
! {-----------------------------------------------------------------------------}
! {$IFDEF DELPHI5}
!  {$I jvcld5.inc}
!  {$DEFINE JVCL_CONFIGURED}
! {$ENDIF DELPIH5}
! {-----------------------------------------------------------------------------}
! {$IFDEF DELPHI6}
!  {$I jvcld6.inc}
!  {$DEFINE JVCL_CONFIGURED}
! {$ENDIF DELPIH6}
! {-----------------------------------------------------------------------------}
! {$IFDEF DELPHI7}
!  {$I jvcld7.inc}
!  {$DEFINE JVCL_CONFIGURED}
! {$ENDIF DELPIH7}
! {-----------------------------------------------------------------------------}
! {$IFDEF DELPHI9}
!  {$I jvcld9.inc}
!  {$DEFINE JVCL_CONFIGURED}
! {$ENDIF DELPIH9}
! {-----------------------------------------------------------------------------}
! { C++Builder                                                                  }
! {-----------------------------------------------------------------------------}
! {$IFDEF BCB5}
!  {$I jvclc5.inc}
!  {$DEFINE JVCL_CONFIGURED}
! {$ENDIF BCB5}
! {-----------------------------------------------------------------------------}
! {$IFDEF BCB6}
!  {$I jvclc6.inc}
!  {$DEFINE JVCL_CONFIGURED}
! {$ENDIF BCB6}
! {-----------------------------------------------------------------------------}
! { Kylix                                                                       }
! {-----------------------------------------------------------------------------}
! {$IFDEF KYLIX3}
!  {$I jvclk3.inc}
!  {$DEFINE JVCL_CONFIGURED}
! {$ENDIF KYLIX3}
! {-----------------------------------------------------------------------------}
! { Default configuration                                                       }
! {-----------------------------------------------------------------------------}
! {$ELSE}
!  {$I jvclbase.inc}
!  {$DEFINE JVCL_CONFIGURED}
! {$ENDIF DEFAULT_JVCL_INC}
! {-----------------------------------------------------------------------------}
  
  
! // check configuration
  
! {$IFNDEF JVCL_CONFIGURED}
!  {$IFDEF SUPPORTS_COMPILETIME_MESSAGES}
!   {$MESSAGE FATAL 'Your Delphi/BCB version is not supported by this JVCL version!'}
!  {$ELSE}
!   'Your Delphi/BCB version is not supported by this JVCL version!'
!  {$ENDIF SUPPORTS_COMPILETIME_MESSAGES}
! {$ENDIF !JVCL_CONFIGURED}
  
  
  {$IFNDEF JVCL_UseQuickReport}
!  {$UNDEF QREPORT4}
! {$ENDIF !JVCL_UseQuickReport}
  
! {$IFDEF NO_UNITVERSIONING} // used by the Installer
!  {$UNDEF UNITVERSIONING}
! {$ENDIF NO_UNITVERSIONING}
  
  // D7 has theme support built in...
***************
*** 83,155 ****
   {$IFDEF JVCLThemesEnabled}
    {$DEFINE JVCLThemesEnabledD56}
!  {$ENDIF}
! {$ENDIF}
! 
! {$IFNDEF VCL}
!  {$UNDEF JVCLThemesEnabled}
!  {$UNDEF JVCLThemesEnabledD56}
! {$ENDIF}
! 
! { 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}
  
  // only allowed for VCL
  {$IFNDEF VCL}
   {$UNDEF JvInterpreter_OLEAUTO}
! {$ENDIF}
! 
! { 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}
! 
! {$IFDEF NO_UNITVERSIONING}
!  {$UNDEF UNITVERSIONING}
! {$ENDIF}
! 
! 
! // Automatic defines for entry level Delphi's:
! {$IFDEF D5Standard}
!  {$DEFINE DelphiPersonalEdition}
! {$ENDIF}
! 
! {$IFDEF D6PersonalEdition}
!  {$DEFINE DelphiPersonalEdition}
! {$ENDIF}
! 
! {$IFDEF D7PersonalEdition}
!  {$DEFINE DelphiPersonalEdition}
! {$ENDIF}
  
- // Reduces warnings on D7:
- {$IFDEF COMPILER7_UP}
-  {$WARN UNSAFE_TYPE OFF}
-  {$WARN UNSAFE_CODE OFF}
-  {$WARN UNSAFE_CAST OFF}
- {$ENDIF}
\ No newline at end of file
--- 127,138 ----
   {$IFDEF JVCLThemesEnabled}
    {$DEFINE JVCLThemesEnabledD56}
!  {$ENDIF JVCLThemesEnabled}
! {$ENDIF COMPILER7_UP}
  
  // only allowed for VCL
  {$IFNDEF VCL}
   {$UNDEF JvInterpreter_OLEAUTO}
!  {$UNDEF JVCLThemesEnabled}
!  {$UNDEF JVCLThemesEnabledD56}
! {$ENDIF !VCL}

Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25220/install/JVCLInstall

Modified Files:
	Compile.pas 
Log Message:
Typo


Index: Compile.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Compile.pas,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Compile.pas	23 Dec 2004 00:25:11 -0000	1.39
--- Compile.pas	23 Dec 2004 00:27:14 -0000	1.40
***************
*** 844,848 ****
        DccOpt := DccOpt + ' -GD';
  
!     if (not TargetConfig.DebugUnits) or (not TargetConfig.DeveloperInstall) then
      begin
        DccOpt := DccOpt + ' -DJVCL_NO_DEBUGINFO';
--- 844,848 ----
        DccOpt := DccOpt + ' -GD';
  
!     if (not DebugUnits) or (not TargetConfig.DeveloperInstall) then
      begin
        DccOpt := DccOpt + ' -DJVCL_NO_DEBUGINFO';

Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24608/install/JVCLInstall

Modified Files:
	CmdLineUtils.pas Compile.pas Compiler5MissingPropertyFix.pas 
	Core.pas DelphiData.pas FrmCompileMessages.pas 
	InstallerConsts.pas Intf.pas JCLData.pas JVCL3Install.pas 
	JVCLData.pas JVCLInstall.dof Main.dfm Main.pas 
	PackageUtils.pas PageBuilder.pas Utils.pas jvcl.inc 
Log Message:
New jvcl.inc structure
Debug Units
Quickreport detection
Personal Edition compilation option


Index: JVCLInstall.dof
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/JVCLInstall.dof,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JVCLInstall.dof	9 May 2004 21:03:36 -0000	1.7
--- JVCLInstall.dof	23 Dec 2004 00:25:12 -0000	1.8
***************
*** 1,3 ****
! [FileVersion]
  Version=7.0
  [Compiler]
--- 1,3 ----
! y[FileVersion]
  Version=7.0
  [Compiler]
***************
*** 96,105 ****
  PackageDCPOutputDir=
  SearchPath=
! Packages=vcl;rtl;vclx;indy;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;VclSmp;dbrtl;dbexpress;vcldb;dsnap;dbxcds;inetdb;bdertl;vcldbx;adortl;visualclx;visualdbclx;vclactnband;vclshlctrls;JvStdCtrlsD7R;JvAppFrmD7R;JvCoreD7R;JvCmpD7R;JvCtrlsD7R;JvCustomD7R;JvDockingD7R;JvMMD7R;JvPageCompsD7R;JvSystemD7R;JvWizardD7R;JvDlgsD7R;DJcl;AHComps;soaprtl;teeui;teedb;tee;ibxpress;IntrawebDB_50_70;Intraweb_50_70;dclOffice2k;Rave50CLX;Rave50VCL
! Conditionals=NO_JCL;USE_DXGETTEXT
  DebugSourceDirs=
  UsePackages=0
  [Parameters]
! RunParams=--ignore-ide --keep-files
  HostApplication=
  Launcher=
--- 96,104 ----
  PackageDCPOutputDir=
  SearchPath=
! Conditionals=NO_JCL;USE_DXGETTEXT;DEFAULT_JVCL_INC
  DebugSourceDirs=
  UsePackages=0
  [Parameters]
! RunParams=--ignore-ide
  HostApplication=
  Launcher=
***************
*** 124,138 ****
  Locale=1031
  CodePage=1252
! [HistoryLists\hlConditionals]
! Count=2
! Item0=NO_JCL;USE_DXGETTEXT
! Item1=NO_JCL;
! [HistoryLists\hlUnitAliases]
! Count=1
! Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
! [HistoryLists\hlUnitOutputDirectory]
! Count=1
! Item0=..\..\dcu
! [HistoryLists\hlOutputDirectorry]
! Count=1
! Item0=..\..\bin
--- 123,125 ----
  Locale=1031
  CodePage=1252
! 

Index: FrmCompileMessages.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/FrmCompileMessages.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FrmCompileMessages.pas	15 Dec 2004 23:16:09 -0000	1.4
--- FrmCompileMessages.pas	23 Dec 2004 00:25:12 -0000	1.5
***************
*** 282,289 ****
--- 282,291 ----
  begin
    FList := TObjectList.Create;
+   FPaths := TStringList.Create;
  end;
  
  procedure TFormCompileMessages.FormDestroy(Sender: TObject);
  begin
+   FPaths.Free;
    FList.Free;
  end;

Index: JVCL3Install.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/JVCL3Install.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JVCL3Install.pas	25 Nov 2004 16:36:30 -0000	1.10
--- JVCL3Install.pas	23 Dec 2004 00:25:12 -0000	1.11
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit JVCL3Install;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit JVCL3Install;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: Utils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Utils.pas,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Utils.pas	11 Dec 2004 14:34:54 -0000	1.15
--- Utils.pas	23 Dec 2004 00:25:12 -0000	1.16
***************
*** 25,32 ****
  // $Id$
  
  {$I jvcl.inc}
  
- unit Utils;
-                                                
  interface
  
--- 25,32 ----
  // $Id$
  
+ unit Utils;
+ 
  {$I jvcl.inc}
  
  interface
  

Index: JVCLData.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/JVCLData.pas,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** JVCLData.pas	17 Dec 2004 21:14:35 -0000	1.22
--- JVCLData.pas	23 Dec 2004 00:25:12 -0000	1.23
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit JVCLData;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit JVCLData;
  
+ {$I jvcl.inc}
+ 
  interface
  
***************
*** 79,82 ****
--- 79,84 ----
      FGenerateMapFiles: Boolean;
  
+     FJVCLConfig: TJVCLConfig;
+ 
      procedure SetInstallMode(const Value: TInstallMode);
      function GetFrameworkCount: Integer;
***************
*** 85,88 ****
--- 87,93 ----
      function GetGenerateMapFiles: Boolean;
      procedure SetJCLDir(const Value: string);
+     function GetJVCLConfig: TJVCLConfig;
+     function GetQuickReport: Boolean;
+     function GetQuickReport4: Boolean;
    private
      { ITargetConfig }
***************
*** 155,159 ****
  
      property DxgettextDir: string read GetDxgettextDir;
!       // Directory where dxgettext is installed or ''. (special handling for Delphi/BCb 5)
  
      property InstalledJVCLVersion: Integer read FInstalledJVCLVersion;
--- 160,167 ----
  
      property DxgettextDir: string read GetDxgettextDir;
!       // Directory where dxgettext is installed or ''. (special handling for Delphi/BCB 5)
! 
!     property QuickReport: Boolean read GetQuickReport;
!     property QuickReport4: Boolean read GetQuickReport4;
  
      property InstalledJVCLVersion: Integer read FInstalledJVCLVersion;
***************
*** 178,181 ****
--- 186,192 ----
        // FrameworkCount returns the number of available frameworks for this
        // target.
+ 
+     property JVCLConfig: TJVCLConfig read GetJVCLConfig;
+       // JVCLConfig returns the confiuration
    public
      property InstallJVCL: Boolean read FInstallJVCL write FInstallJVCL;
***************
*** 225,229 ****
      FIsDxgettextInstalled: Boolean;
      FDxgettextDir: string;
-     FJVCLConfig: TJVCLConfig;
      FJVCLDir: string;
      FDeleteFilesOnUninstall: Boolean;
--- 236,239 ----
***************
*** 247,250 ****
--- 257,262 ----
      function GetGenerateMapFiles: Integer;
      procedure SetGenerateMapFiles(const Value: Integer);
+     function GetDebugUnits: Integer;
+     procedure SetDebugUnits(const Value: Integer);
    protected
      function JvclIncFilename: string;
***************
*** 261,265 ****
      property IsDxgettextInstalled: Boolean read FIsDxgettextInstalled;
  
-     property JVCLConfig: TJVCLConfig read FJVCLConfig;
      property JVCLDir: string read GetJVCLDir;
      property JVCLPackagesDir: string read GetJVCLPackagesDir;
--- 273,276 ----
***************
*** 267,270 ****
--- 278,282 ----
  
      property DeveloperInstall: Integer read GetDeveloperInstall write SetDeveloperInstall;
+     property DebugUnits: Integer read GetDebugUnits write SetDebugUnits;
      property CleanPalettes: Integer read GetCleanPalettes write SetCleanPalettes;
      property Build: Integer read GetBuild write SetBuild;
***************
*** 281,284 ****
--- 293,299 ----
    end;
  
+ const
+   TargetTypes: array[Boolean] of string = ('D', 'C'); // do not localize
+ 
  implementation
  
***************
*** 297,303 ****
    RsComplete = 'Complete.';
  
- const
-   TargetTypes: array[Boolean] of string = ('D', 'C'); // do not localize
- 
  function ReadRegString(RootKey: HKEY; const Key, Name: string): string;
  var
--- 312,315 ----
***************
*** 340,346 ****
    FVerbose := False;
  
-   FJVCLConfig := TJVCLConfig.Create;
-   FJVCLConfig.LoadFromFile(JvclIncFilename);
- 
    ErrMsg := '';
    LoadConfig(JVCLDir + '\' + sPackageGeneratorFile, 'JVCL', ErrMsg);
--- 352,355 ----
***************
*** 357,361 ****
    i: Integer;
  begin
-   FJVCLConfig.Free;
    for i := 0 to High(FConfigs) do
      FConfigs[I].Free;
--- 366,369 ----
***************
*** 392,396 ****
          2: b := TargetConfig[i].CompileOnly;
          3: b := TargetConfig[i].DeveloperInstall;
!         4: b := TargetConfig[i].GenerateMapFiles;
        else
          b := False;
--- 400,405 ----
          2: b := TargetConfig[i].CompileOnly;
          3: b := TargetConfig[i].DeveloperInstall;
!         4: b := TargetConfig[i].DebugUnits;
!         5: b := TargetConfig[i].GenerateMapFiles;
        else
          b := False;
***************
*** 440,448 ****
  end;
  
! function TJVCLData.GetGenerateMapFiles: Integer;
  begin
    Result := GetOptionState(4);
  end;
  
  function TJVCLData.GetJVCLDir: string;
  begin
--- 449,467 ----
  end;
  
! function TJVCLData.GetDebugUnits: Integer;
  begin
    Result := GetOptionState(4);
  end;
  
+ function TJVCLData.GetGenerateMapFiles: Integer;
+ begin
+   Result := GetOptionState(5);
+ end;
+ 
+ function TTargetConfig.GetJVCLConfig: TJVCLConfig;
+ begin
+   Result := FJVCLConfig;
+ end;
+ 
  function TJVCLData.GetJVCLDir: string;
  begin
***************
*** 523,531 ****
    i: Integer;
  begin
-   if FJVCLConfig.Modified then
-   begin
-     FileSetReadOnly(JVCLConfig.Filename, False);
-     JVCLConfig.SaveToFile(JVCLConfig.Filename);
-   end;
    for i := 0 to Targets.Count - 1 do
      TargetConfig[i].Save;
--- 542,545 ----
***************
*** 572,575 ****
--- 586,597 ----
  end;
  
+ procedure TJVCLData.SetDebugUnits(const Value: Integer);
+ var
+   i: Integer;
+ begin
+   for i := 0 to Targets.Count - 1 do
+     TargetConfig[i].DebugUnits := Value <> 0;
+ end;
+ 
  { TTargetConfig }
  
***************
*** 594,597 ****
--- 616,620 ----
  
    FFrameworks := TJVCLFrameworks.Create(Self);
+   FJVCLConfig := TJVCLConfig.Create;
    Load;
  end;
***************
*** 604,609 ****
  
  procedure TTargetConfig.Init;
!  // Memory allocations must go to the constructor because Init could be called
!  // more the once.
  
    function FindJCL(List: TStrings): string;
--- 627,632 ----
  
  procedure TTargetConfig.Init;
!   // Memory allocations must go to the constructor because Init could be called
!   // more the once.
  
    function FindJCL(List: TStrings): string;
***************
*** 670,674 ****
    FOutdatedJCL := False;
  
!  // identify JVCL version
    FInstalledJVCLVersion := 0;
    if Target.FindPackageEx('JvPack1') <> nil then
--- 693,697 ----
    FOutdatedJCL := False;
  
!   // identify JVCL version
    FInstalledJVCLVersion := 0;
    if Target.FindPackageEx('JvPack1') <> nil then
***************
*** 689,693 ****
      Include(FInstallMode, pkVCL);
  
!  // identify JCL version
    FMissingJCL := True;
    if FJCLDir = '' then
--- 712,716 ----
      Include(FInstallMode, pkVCL);
  
!   // identify JCL version
    FMissingJCL := True;
    if FJCLDir = '' then
***************
*** 1047,1050 ****
--- 1070,1079 ----
    IniFileName: string;
  begin
+   if JVCLConfig.Modified then
+   begin
+     FileSetReadOnly(JVCLConfig.Filename, False);
+     JVCLConfig.SaveToFile(JVCLConfig.Filename);
+   end;
+ 
    for Kind := pkFirst to pkLast do
    begin
***************
*** 1085,1088 ****
--- 1114,1118 ----
      Ini.WriteBool(Target.DisplayName, 'AutoDependencies', AutoDependencies); // do not localize
      Ini.WriteBool(Target.DisplayName, 'GenerateMapFiles', GenerateMapFiles); // do not localize
+     Ini.WriteBool(Target.DisplayName, 'DebugUnits', DebugUnits); // do not localize
  
      Ini.UpdateFile;
***************
*** 1097,1100 ****
--- 1127,1131 ----
    Ini: TMemIniFile;
    Mode: TInstallMode;
+   Filename: string;
  begin
    for Kind := pkFirst to pkLast do
***************
*** 1116,1119 ****
--- 1147,1151 ----
      CleanPalettes := Ini.ReadBool(Target.DisplayName, 'CleanPalettes', CleanPalettes); // do not localize
      GenerateMapFiles := Ini.ReadBool(Target.DisplayName, 'GenerateMapFiles', GenerateMapFiles); // do not localize
+     DebugUnits := Ini.ReadBool(Target.DisplayName, 'DebugUnits', DebugUnits); // do not localize
      Mode := [];
      for Kind := pkFirst to pkLast do
***************
*** 1128,1131 ****
--- 1160,1179 ----
      DcpDir := FixBackslashBackslash(DcpDir);
  
+     // Load jvcl%t.inc. Or the jvclbase.inc when no jvcl%t.inc exists
+     Filename := GetJVCLDir + '\common\' + Format('jvcl%s%d.inc', [LowerCase(TargetTypes[Target.IsBCB]), Target.Version]);
+     if not FileExists(Filename) then
+     begin
+       JVCLConfig.LoadFromFile(GetJVCLDir + '\common\jvclbase.inc');
+       JVCLConfig.Filename := Filename;
+       JVCLConfig.Modified := True; // must be stored
+     end
+     else
+       JVCLConfig.LoadFromFile(Filename);
+     // set (hidden) personal edition configuration 
+     JVCLConfig.Enabled['DelphiPersonalEdition'] := Target.IsPersonal;
+ 
+     // QuickReport configuration
+     JVCLConfig.Enabled['QREPORT4'] := JVCLConfig.Enabled['QREPORT4'] or QuickReport4;
+     JVCLConfig.Enabled['JVCL_UseQuickReport'] := JVCLConfig.Enabled['JVCL_UseQuickReport'] or QuickReport;
    finally
      Ini.Free;
***************
*** 1179,1196 ****
      DeinstallJVCL(nil, nil);
  
!  // remove old
    AddPaths(Target.BrowsingPaths, False, Owner.JVCLDir,
      ['common', 'run', 'qcommon', 'qrun']); // do not localize
    AddPaths(Target.SearchPaths, False, Owner.JVCLDir,
      ['common', 'run', 'qcommon', 'qrun']); // do not localize
  
  
!  // common
    AddPaths(Target.BrowsingPaths, True, Owner.JVCLDir,
      ['common']); // do not localize
    AddPaths(Target.SearchPaths, True, Owner.JVCLDir,
      ['common', Target.InsertDirMacros(UnitOutDir)]); // do not localize
  
!  // add
    if pkVCL in InstallMode then
    begin
--- 1227,1249 ----
      DeinstallJVCL(nil, nil);
  
!   // remove old
    AddPaths(Target.BrowsingPaths, False, Owner.JVCLDir,
      ['common', 'run', 'qcommon', 'qrun']); // do not localize
    AddPaths(Target.SearchPaths, False, Owner.JVCLDir,
      ['common', 'run', 'qcommon', 'qrun']); // do not localize
+   AddPaths(Target.DebugDcuPaths, {Add:=}False, Owner.JVCLDir,
+     [Target.InsertDirMacros(UnitOutDir + '\debug'), UnitOutDir + '\debug']); // do not localize
  
  
!   // common
    AddPaths(Target.BrowsingPaths, True, Owner.JVCLDir,
      ['common']); // do not localize
    AddPaths(Target.SearchPaths, True, Owner.JVCLDir,
      ['common', Target.InsertDirMacros(UnitOutDir)]); // do not localize
+   if DebugUnits and not DeveloperInstall then
+     AddPaths(Target.DebugDcuPaths, True, Owner.JVCLDir,
+       [Target.InsertDirMacros(UnitOutDir + '\debug')]); // do not localize
  
!   // add
    if pkVCL in InstallMode then
    begin
***************
*** 1323,1327 ****
  {**}DoProgress(RsCleaningPathLists, 1, MaxSteps);
  
!  // remove JVCL 1 and 2 directories
    for i := Target.BrowsingPaths.Count - 1 downto 0 do
      if Pos('\jvpack\', AnsiLowerCase(Target.BrowsingPaths[i])) <> 0 then // do not localize
--- 1376,1380 ----
  {**}DoProgress(RsCleaningPathLists, 1, MaxSteps);
  
!   // remove JVCL 1 and 2 directories
    for i := Target.BrowsingPaths.Count - 1 downto 0 do
      if Pos('\jvpack\', AnsiLowerCase(Target.BrowsingPaths[i])) <> 0 then // do not localize
***************
*** 1333,1337 ****
  
  
!  // remove JVCL 3 directories
    AddPaths(Target.BrowsingPaths, {Add:=}False, Owner.JVCLDir,
      ['common', 'design', 'run', 'qcommon', 'qdesign', 'qrun']); // do not localize
--- 1386,1390 ----
  
  
!   // remove JVCL 3 directories
    AddPaths(Target.BrowsingPaths, {Add:=}False, Owner.JVCLDir,
      ['common', 'design', 'run', 'qcommon', 'qdesign', 'qrun']); // do not localize
***************
*** 1339,1342 ****
--- 1392,1397 ----
      ['common', 'design', 'run', 'qcommon', 'qdesign', 'qrun', // do not localize
      Target.InsertDirMacros(UnitOutDir), UnitOutDir]);
+   AddPaths(Target.DebugDcuPaths, {Add:=}False, Owner.JVCLDir,
+     [Target.InsertDirMacros(UnitOutDir + '\debug'), UnitOutDir + '\debug']); // do not localize
    Target.SavePaths;
  
***************
*** 1355,1359 ****
    Target.SavePackagesLists;
  
!  // clean ini file
    Ini := TMemIniFile.Create(ChangeFileExt(ParamStr(0), '.ini')); // do not localize
    try
--- 1410,1414 ----
    Target.SavePackagesLists;
  
!   // clean ini file
    Ini := TMemIniFile.Create(ChangeFileExt(ParamStr(0), '.ini')); // do not localize
    try
***************
*** 1380,1382 ****
--- 1435,1447 ----
  end;
  
+ function TTargetConfig.GetQuickReport: Boolean;
+ begin
+   Result := FileExists(Target.RootDir + '\qrpt.bpl') or GetQuickReport4;
+ end;
+ 
+ function TTargetConfig.GetQuickReport4: Boolean;
+ begin
+   Result := FileExists(Target.RootDir + Format('\qr4run%s%d.bpl', [LowerCase(TargetTypes[Target.IsBCB]), Target.Version]));
+ end;
+ 
  end.

Index: Core.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Core.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Core.pas	24 May 2004 13:05:31 -0000	1.6
--- Core.pas	23 Dec 2004 00:25:11 -0000	1.7
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit Core;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit Core;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: InstallerConsts.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/InstallerConsts.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** InstallerConsts.pas	13 Dec 2004 22:50:32 -0000	1.10
--- InstallerConsts.pas	23 Dec 2004 00:25:12 -0000	1.11
***************
*** 162,165 ****
--- 162,167 ----
                'Do you want to open readme.htm ?';
    RsErrorOpeningReadmeHTM = 'Cannot open file readme.htm';
+   RsEditJvclInc = 'Edit jvcl%s%d.inc';
+   RsJVCLConfigurationError = 'The jvcl.inc files are corrupted.';
  
  const

Index: Compile.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Compile.pas,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Compile.pas	17 Dec 2004 21:14:34 -0000	1.38
--- Compile.pas	23 Dec 2004 00:25:11 -0000	1.39
***************
*** 25,33 ****
  // $Id$
  
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
- unit Compile;
- 
  interface
  
--- 25,33 ----
  // $Id$
  
+ unit Compile;
+ 
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
  interface
  
***************
*** 114,118 ****
      function PrepareJCL(TargetConfig: ITargetConfig; Force: Boolean): Boolean;
  
!     function IsCondition(const Condition: string): Boolean;
    public
      constructor Create(AData: TJVCLData);
--- 114,118 ----
      function PrepareJCL(TargetConfig: ITargetConfig; Force: Boolean): Boolean;
  
!     function IsCondition(const Condition: string; TargetConfig: ITargetConfig): Boolean;
    public
      constructor Create(AData: TJVCLData);
***************
*** 179,184 ****
  
  const
!   CommonDependencyFiles: array[0..3] of string = (
!     'jvcl.inc', 'jedi.inc', 'linuxonly.inc', 'windowsonly.inc'
    );
  
--- 179,184 ----
  
  const
!   CommonDependencyFiles: array[0..5] of string = (
!     'jvcl.inc', 'jvclbase.inc', 'jvcl%t.inc', 'jedi.inc', 'linuxonly.inc', 'windowsonly.inc'
    );
  
***************
*** 387,391 ****
      EnumeratePackages(PackagesPath, List);
      if not Generate(List, TargetList, WriteMsg, Data.JVCLDir + '\' + sPackageGeneratorFile,
!                     Group, ErrMsg, PackagesPath, '', '', Data.JVCLConfig.Filename) then
      begin
        CaptureLine(ErrMsg, FAborted);
--- 387,391 ----
      EnumeratePackages(PackagesPath, List);
      if not Generate(List, TargetList, WriteMsg, Data.JVCLDir + '\' + sPackageGeneratorFile,
!                     Group, ErrMsg, PackagesPath, '', '', Data.JVCLDir + '\common\jvcl%t.inc') then
      begin
        CaptureLine(ErrMsg, FAborted);
***************
*** 432,441 ****
      end;
  
!    // let the compiler rebuild the dcp files
      DeleteFile(Format('%s\CJcl%s.dcp', [BplDir, S]));
      DeleteFile(Format('%s\CJclVcl%s.dcp', [BplDir, S]));
      DeleteFile(Format('%s\CJclVClx%s.dcp', [BplDir, S]));
  
!    // sometimes the files are in the wrong directory
      DeleteFile(Format('%s\CJcl%s.dcp', [DcpDir, S]));
      DeleteFile(Format('%s\CJclVcl%s.dcp', [DcpDir, S]));
--- 432,441 ----
      end;
  
!     // let the compiler rebuild the dcp files
      DeleteFile(Format('%s\CJcl%s.dcp', [BplDir, S]));
      DeleteFile(Format('%s\CJclVcl%s.dcp', [BplDir, S]));
      DeleteFile(Format('%s\CJclVClx%s.dcp', [BplDir, S]));
  
!     // sometimes the files are in the wrong directory
      DeleteFile(Format('%s\CJcl%s.dcp', [DcpDir, S]));
      DeleteFile(Format('%s\CJclVcl%s.dcp', [DcpDir, S]));
***************
*** 460,469 ****
        DoPackageProgress(nil, RsCompilingJCL, 1, 3);
  
!      // generate packages
        Result := GeneratePackages('JCL', 'c' + IntToStr(TargetConfig.Target.Version),
          TargetConfig.JCLDir + '\packages');
        DoPackageProgress(nil, RsCompilingJCL, 2, 3);
  
!      // compile dcp files
        if Make(TargetConfig, Args + FQuiet, CaptureLine,
          Data.JVCLPackagesDir + '\bin') <> 0 then
--- 460,469 ----
        DoPackageProgress(nil, RsCompilingJCL, 1, 3);
  
!       // generate packages
        Result := GeneratePackages('JCL', 'c' + IntToStr(TargetConfig.Target.Version),
          TargetConfig.JCLDir + '\packages');
        DoPackageProgress(nil, RsCompilingJCL, 2, 3);
  
!       // compile dcp files
        if Make(TargetConfig, Args + FQuiet, CaptureLine,
          Data.JVCLPackagesDir + '\bin') <> 0 then
***************
*** 473,477 ****
        end;
      finally
!      // clean
        Make(TargetConfig, Args + FQuiet + ' Clean', CaptureLineClean,
          Data.JVCLPackagesDir + '\bin');
--- 473,477 ----
        end;
      finally
!       // clean
        Make(TargetConfig, Args + FQuiet + ' Clean', CaptureLineClean,
          Data.JVCLPackagesDir + '\bin');
***************
*** 543,547 ****
  
    AbortReason := '';
!  // read target configs that should be compiled
    Count := 0;
    Frameworks := 0;
--- 543,547 ----
  
    AbortReason := '';
!   // read target configs that should be compiled
    Count := 0;
    Frameworks := 0;
***************
*** 561,565 ****
    SetLength(TargetConfigs, Count);
  
!  // compile all targets
    Index := 0;
    for i := 0 to Count - 1 do
--- 561,565 ----
    SetLength(TargetConfigs, Count);
  
!   // compile all targets
    Index := 0;
    for i := 0 to Count - 1 do
***************
*** 615,629 ****
    end;
  
!  // VCL
    if Result and (pkVCL in TargetConfig.InstallMode) and not DoClx then
    begin
!    // debug units
!     if (not TargetConfig.Target.IsBCB) and TargetConfig.DebugUnits then
!       Result := CompileProjectGroup(
!         TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkVCL], True,
!           ForceJclDcp);
  
      if Result then
!      // compile
        Result := CompileProjectGroup(
          TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkVCL], False,
--- 615,632 ----
    end;
  
!   // VCL
    if Result and (pkVCL in TargetConfig.InstallMode) and not DoClx then
    begin
!     if not TargetConfig.DeveloperInstall then
!     begin
!       // debug units
!       if (not TargetConfig.Target.IsBCB) and TargetConfig.DebugUnits then
!         Result := CompileProjectGroup(
!           TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkVCL], True,
!             ForceJclDcp);
!     end;
  
      if Result then
!       // compile
        Result := CompileProjectGroup(
          TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkVCL], False,
***************
*** 636,640 ****
    end;
  
!  // Clx
    if Result and (pkClx in TargetConfig.InstallMode) and DoClx then
    begin
--- 639,643 ----
    end;
  
!   // CLX
    if Result and (pkClx in TargetConfig.InstallMode) and DoClx then
    begin
***************
*** 647,658 ****
      end;
  
!    // debug units
!     if (not TargetConfig.Target.IsBCB) and TargetConfig.DebugUnits then
!       Result := CompileProjectGroup(
!         TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkClx], True,
!           ForceJclDcp);
  
      if Result then
!      // compile
        Result := CompileProjectGroup(
          TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkClx], False,
--- 650,664 ----
      end;
  
!     if not TargetConfig.DeveloperInstall then
!     begin
!       // debug units
!       if (not TargetConfig.Target.IsBCB) and TargetConfig.DebugUnits then
!         Result := CompileProjectGroup(
!           TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkClx], True,
!             ForceJclDcp);
!     end;
  
      if Result then
!       // compile
        Result := CompileProjectGroup(
          TargetConfig.Frameworks.Items[TargetConfig.Target.IsPersonal, pkClx], False,
***************
*** 673,677 ****
    Result := False;
  
!  // get number of resources to compile
    FCount := 0;
    if Make(TargetConfig, '-f makefile.mak -n', CaptureLineGetCompileCount, TargetConfig.JVCLDir + '\images') <> 0 then
--- 679,683 ----
    Result := False;
  
!   // get number of resources to compile
    FCount := 0;
    if Make(TargetConfig, '-f makefile.mak -n', CaptureLineGetCompileCount, TargetConfig.JVCLDir + '\images') <> 0 then
***************
*** 680,684 ****
      Exit;
    end;
!  // update FResCount with the number of resources that MAKE will compile
    FResCount := FCount;
  
--- 686,690 ----
      Exit;
    end;
!   // update FResCount with the number of resources that MAKE will compile
    FResCount := FCount;
  
***************
*** 687,691 ****
    begin
      DoResourceProgress('', 0, FResCount);
!    // generate .res and .dcr files
      if Make(TargetConfig, '-f makefile.mak', CaptureLineResourceCompilation, TargetConfig.JVCLDir + '\images') <> 0 then
      begin
--- 693,697 ----
    begin
      DoResourceProgress('', 0, FResCount);
!     // generate .res and .dcr files
      if Make(TargetConfig, '-f makefile.mak', CaptureLineResourceCompilation, TargetConfig.JVCLDir + '\images') <> 0 then
      begin
***************
*** 838,842 ****
--- 844,855 ----
        DccOpt := DccOpt + ' -GD';
  
+     if (not TargetConfig.DebugUnits) or (not TargetConfig.DeveloperInstall) then
+     begin
+       DccOpt := DccOpt + ' -DJVCL_NO_DEBUGINFO';
+       CreateDir(TargetConfig.UnitOutDir + '\debug');
+     end;
+ 
      Path := GetWindowsDir + ';' + GetSystemDir + ';' + GetWindowsDir + '\Command';
+     Path := Path + ';' + TargetConfig.Target.BplDir; // add original BPL directory for "common" BPLs
      if TargetConfig.DcpDir <> TargetConfig.BplDir then
        Path := TargetConfig.Target.RootDir + ';' + TargetConfig.BplDir + ';' + TargetConfig.DcpDir + ';' + Path
***************
*** 862,865 ****
--- 875,881 ----
      else
        SetEnvironmentVariable('UNITOUTDIR', Pointer(TargetConfig.UnitOutDir));
+     SetEnvironmentVariable('MAINBPLDIR', Pointer(TargetConfig.Target.BplDir));
+     SetEnvironmentVariable('MAINDCPDIR', Pointer(TargetConfig.Target.DcpDir));
+     SetEnvironmentVariable('MAINLIBDIR', Pointer(TargetConfig.Target.DcpDir)); // for BCB
      SetEnvironmentVariable('BPLDIR', Pointer(TargetConfig.BplDir));
      SetEnvironmentVariable('DCPDIR', Pointer(TargetConfig.DcpDir));
***************
*** 877,886 ****
      SetEnvironmentVariable('EXTRARESDIRS', nil);
  
!    // *****************************************************************
  
  {**}DoProjectProgress(RsGeneratingPackages, GetProjectIndex, ProjectMax);
      if ProjectGroup.Target.IsPersonal then
      begin
!      // generate template.cfg for the "master" PkgDir
        SetEnvironmentVariable('EDITION', PChar(Copy(Edition, 1, 2)));
        SetEnvironmentVariable('PKGDIR', PChar(Copy(PkgDir, 1, 2)));
--- 893,902 ----
      SetEnvironmentVariable('EXTRARESDIRS', nil);
  
!     // *****************************************************************
  
  {**}DoProjectProgress(RsGeneratingPackages, GetProjectIndex, ProjectMax);
      if ProjectGroup.Target.IsPersonal then
      begin
!       // generate template.cfg for the "master" PkgDir
        SetEnvironmentVariable('EDITION', PChar(Copy(Edition, 1, 2)));
        SetEnvironmentVariable('PKGDIR', PChar(Copy(PkgDir, 1, 2)));
***************
*** 903,912 ****
      end;
  
!    // *****************************************************************
  
  {**}DoProjectProgress(RsGeneratingPackages, GetProjectIndex, ProjectMax);
      if ProjectGroup.Target.IsPersonal then
      begin
!      // generate the packages and .cfg files for the "master" PkgDir
        if not GeneratePackages('JVCL', Copy(Edition, 1, 2),
                                TargetConfig.JVCLPackagesDir) then
--- 919,928 ----
      end;
  
!     // *****************************************************************
  
  {**}DoProjectProgress(RsGeneratingPackages, GetProjectIndex, ProjectMax);
      if ProjectGroup.Target.IsPersonal then
      begin
!       // generate the packages and .cfg files for the "master" PkgDir
        if not GeneratePackages('JVCL', Copy(Edition, 1, 2),
                                TargetConfig.JVCLPackagesDir) then
***************
*** 918,930 ****
        Exit; // AbortReason is set in GeneratePackages
  
!    // *****************************************************************
  
!    if ProjectGroup.Target.IsBCB and Data.CompileJclDcp then
!    begin
  {**}  DoProjectProgress(RsCompilingJCL, GetProjectIndex, ProjectMax);
        if not PrepareJCL(TargetConfig, ForceJclDcp) then
          Exit; // AbortReason was set in PrepareJCL
!    end
!    else
  {**}  GetProjectIndex; // increase progress
  
--- 934,946 ----
        Exit; // AbortReason is set in GeneratePackages
  
!     // *****************************************************************
  
!     if ProjectGroup.Target.IsBCB and Data.CompileJclDcp then
!     begin
  {**}  DoProjectProgress(RsCompilingJCL, GetProjectIndex, ProjectMax);
        if not PrepareJCL(TargetConfig, ForceJclDcp) then
          Exit; // AbortReason was set in PrepareJCL
!     end
!     else
  {**}  GetProjectIndex; // increase progress
  
***************
*** 989,993 ****
      end;
  
!    // *****************************************************************
  
      if (FPkgCount > 0) and
--- 1005,1009 ----
      end;
  
!     // *****************************************************************
  
      if (FPkgCount > 0) and
***************
*** 1015,1018 ****
--- 1031,1049 ----
  end;
  
+ function ReplaceTargetMacros(S: string; TargetConfig: ITargetConfig): string;
+ var
+   ps: Integer;
+ begin
+   ps := Pos('%t', S);
+   if ps > 0 then
+   begin
+     Delete(S, ps, 2);
+     Insert(Format('%s%d', [LowerCase(TargetTypes[TargetConfig.Target.IsBCB]), TargetConfig.Target.Version]),
+       S, ps);
+   end
+   else
+     Result := S;
+ end;
+ 
  /// <summary>
  /// CreateProjectGroupMakefile creates the make file for the project group.
***************
*** 1074,1078 ****
        for depI := 0 to High(CommonDependencyFiles) do
          Dependencies := Dependencies + '\' + sLineBreak + #9#9 +
!           ExtractFileName(CommonDependencyFiles[depI]);
  
        Lines.Add('CommonDependencies = ' + Dependencies);
--- 1105,1109 ----
        for depI := 0 to High(CommonDependencyFiles) do
          Dependencies := Dependencies + '\' + sLineBreak + #9#9 +
!           ExtractFileName(ReplaceTargetMacros(CommonDependencyFiles[depI], ProjectGroup.TargetConfig));
  
        Lines.Add('CommonDependencies = ' + Dependencies);
***************
*** 1253,1257 ****
  begin
    Result := ContainedFile.IsUsedByTarget(ProjectGroup.TargetConfig.TargetSymbol) and
!             IsCondition(ContainedFile.Condition);
  end;
  
--- 1284,1288 ----
  begin
    Result := ContainedFile.IsUsedByTarget(ProjectGroup.TargetConfig.TargetSymbol) and
!             IsCondition(ContainedFile.Condition, ProjectGroup.TargetConfig);
  end;
  
***************
*** 1260,1264 ****
  begin
    Result := RequiredPackage.IsRequiredByTarget(ProjectGroup.TargetConfig.TargetSymbol) and
!             IsCondition(RequiredPackage.Condition);
  end;
  
--- 1291,1295 ----
  begin
    Result := RequiredPackage.IsRequiredByTarget(ProjectGroup.TargetConfig.TargetSymbol) and
!             IsCondition(RequiredPackage.Condition, ProjectGroup.TargetConfig);
  end;
  
***************
*** 1268,1281 ****
    TListConditionParser = class(TConditionParser)
    private
!     FData: TJVCLData;
    protected
      procedure MissingRightParenthesis; override;
      function GetIdentValue(const Ident: String): Boolean; override;
    public
!     constructor Create(AData: TJVCLData);
    end;
  
  
! function TJVCLCompiler.IsCondition(const Condition: string): Boolean;
  var
    Parser: TListConditionParser;
--- 1299,1312 ----
    TListConditionParser = class(TConditionParser)
    private
!     FTargetConfig: ITargetConfig;
    protected
      procedure MissingRightParenthesis; override;
      function GetIdentValue(const Ident: String): Boolean; override;
    public
!     constructor Create(ATargetConfig: ITargetConfig);
    end;
  
  
! function TJVCLCompiler.IsCondition(const Condition: string; TargetConfig: ITargetConfig): Boolean;
  var
    Parser: TListConditionParser;
***************
*** 1284,1288 ****
    if Condition <> '' then
    begin
!     Parser := TListConditionParser.Create(Data);
      try
        Result := Parser.Parse(Condition);
--- 1315,1319 ----
    if Condition <> '' then
    begin
!     Parser := TListConditionParser.Create(TargetConfig);
      try
        Result := Parser.Parse(Condition);
***************
*** 1295,1307 ****
  { TListConditionParser }
  
! constructor TListConditionParser.Create(AData: TJVCLData);
  begin
    inherited Create;
!   FData := AData;
  end;
  
  function TListConditionParser.GetIdentValue(const Ident: String): Boolean;
  begin
!   Result := FData.JVCLConfig.Enabled[Ident];
  end;
  
--- 1326,1338 ----
  { TListConditionParser }
  
! constructor TListConditionParser.Create(ATargetConfig: ITargetConfig);
  begin
    inherited Create;
!   FTargetConfig := ATargetConfig;
  end;
  
  function TListConditionParser.GetIdentValue(const Ident: String): Boolean;
  begin
!   Result := FTargetConfig.JVCLConfig.Enabled[Ident];
  end;
  

Index: Intf.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Intf.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Intf.pas	7 May 2004 22:52:38 -0000	1.5
--- Intf.pas	23 Dec 2004 00:25:12 -0000	1.6
***************
*** 25,36 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit Intf;
  
  interface
  
  uses
!   SysUtils, Classes, Contnrs, DelphiData;
  
  type
--- 25,36 ----
  // $Id$
  
  unit Intf;
  
+ {$I jvcl.inc}
+ 
  interface
  
  uses
!   SysUtils, Classes, Contnrs, DelphiData, JVCLConfiguration;
  
  type
***************
*** 61,64 ****
--- 61,66 ----
      function GetGenerateMapFiles: Boolean;
  
+     function GetJVCLConfig: TJVCLConfig;
+ 
      function GetTarget: TCompileTarget;
      function GetJVCLPackagesXmlDir: string;
***************
*** 82,85 ****
--- 84,89 ----
      property GenerateMapFiles: Boolean read GetGenerateMapFiles;
  
+     property JVCLConfig: TJVCLConfig read GetJVCLConfig;
+ 
      property UnitOutDir: string read GetUnitOutDir;
      property JCLDir: string read GetJCLDir;

Index: PageBuilder.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/PageBuilder.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PageBuilder.pas	24 May 2004 13:04:41 -0000	1.8
--- PageBuilder.pas	23 Dec 2004 00:25:12 -0000	1.9
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit PageBuilder;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit PageBuilder;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: DelphiData.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/DelphiData.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DelphiData.pas	14 Dec 2004 22:49:05 -0000	1.11
--- DelphiData.pas	23 Dec 2004 00:25:11 -0000	1.12
***************
*** 25,33 ****
  // $Id$
  
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
- unit DelphiData;
- 
  interface
  
--- 25,33 ----
  // $Id$
  
+ unit DelphiData;
+ 
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
  interface
  
***************
*** 89,92 ****
--- 89,93 ----
      FHKLMRegistryKey: string;
      FRegistryKey: string;
+     FDebugDcuPaths: TStrings;
  
      procedure LoadFromRegistry;
***************
*** 143,146 ****
--- 144,148 ----
      property PackageSearchPaths: TStrings read FPackageSearchPaths; // with macros
      property SearchPaths: TStrings read FSearchPaths; // with macros
+     property DebugDcuPaths: TStrings read FDebugDcuPaths; // with macros
  
      property BDSProjectsDir: string read FBDSProjectsDir;
***************
*** 345,348 ****
--- 347,351 ----
    FPackageSearchPaths := TStringList.Create;
    FSearchPaths := TStringList.Create;
+   FDebugDcuPaths := TStringList.Create;
  
    FDisabledPackages := TDelphiPackageList.Create;
***************
*** 358,361 ****
--- 361,365 ----
    FPackageSearchPaths.Free;
    FSearchPaths.Free;
+   FDebugDcuPaths.Free;
  
    FDisabledPackages.Free;
***************
*** 571,574 ****
--- 575,582 ----
        ConvertPathList(Reg.ReadString('Search Path'), FSearchPaths); // do not localize
      end;
+     if Reg.OpenKeyReadOnly(RegistryKey + '\Debugging') then // do not localize
+     begin
+       ConvertPathList(Reg.ReadString('Debug DCUs Path'), FDebugDcuPaths); // do not localize
+     end;
    finally
      Reg.Free;
***************
*** 620,624 ****
    try
      Reg.RootKey := HKEY_CURRENT_USER;
!     if Reg.OpenKey(RegistryKey + '\' + SubKey, True) then
      begin
        List := TStringList.Create;
--- 628,632 ----
    try
      Reg.RootKey := HKEY_CURRENT_USER;
!     if Reg.OpenKey(RegistryKey + '\' + SubKey, False) then
      begin
        List := TStringList.Create;
***************
*** 667,679 ****
  var
    Reg: TRegistry;
  begin
    Reg := TRegistry.Create;
    try
      Reg.RootKey := HKEY_CURRENT_USER;
!     if Reg.OpenKey(RegistryKey + '\Library', True) then // do not localize
      begin
        Reg.WriteString('Browsing Path', ConvertPathList(FBrowsingPaths)); // do not localize
        Reg.WriteString('Search Path', ConvertPathList(FSearchPaths)); // do not localize
      end;
    finally
      Reg.Free;
--- 675,694 ----
  var
    Reg: TRegistry;
+   S: string;
  begin
    Reg := TRegistry.Create;
    try
      Reg.RootKey := HKEY_CURRENT_USER;
!     if Reg.OpenKey(RegistryKey + '\Library', False) then // do not localize
      begin
        Reg.WriteString('Browsing Path', ConvertPathList(FBrowsingPaths)); // do not localize
        Reg.WriteString('Search Path', ConvertPathList(FSearchPaths)); // do not localize
      end;
+     if Reg.OpenKey(RegistryKey + '\Debugging', False) then // do not localize
+     begin
+       S := ConvertPathList(FDebugDcuPaths);
+       if S <> Reg.ReadString('Debug DCUs Path') then
+         Reg.WriteString('Debug DCUs Path', ConvertPathList(FDebugDcuPaths)); // do not localize
+     end;
    finally
      Reg.Free;

Index: Main.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Main.pas,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Main.pas	25 Nov 2004 22:43:23 -0000	1.15
--- Main.pas	23 Dec 2004 00:25:12 -0000	1.16
***************
*** 25,30 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  {
    command line arguments:
--- 25,28 ----
***************
*** 34,37 ****
--- 32,37 ----
  unit Main;
  
+ {$I jvcl.inc}
+ 
  interface
  
***************
*** 180,184 ****
        Page := TJvWizardInteriorPage.Create(JvWizard);
        Page.Wizard := JvWizard;
!       Page.Header.Height := 65;
        PreparePage(Page, Inst);
        Page.OnPage := DoPageShow;
--- 180,185 ----
        Page := TJvWizardInteriorPage.Create(JvWizard);
        Page.Wizard := JvWizard;
!       //Page.Header.Height := 65;
!       Page.Header.Height := 50;
        PreparePage(Page, Inst);
        Page.OnPage := DoPageShow;

Index: Main.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Main.dfm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Main.dfm	18 Dec 2004 15:54:35 -0000	1.13
--- Main.dfm	23 Dec 2004 00:25:12 -0000	1.14
***************
*** 55,58 ****
--- 55,61 ----
      OnActivePageChanged = JvWizardActivePageChanged
      OnActivePageChanging = JvWizardActivePageChanging
+     DesignSize = (
+       683
+       444)
      object LblHomepage: TLabel
        Left = 8

Index: CmdLineUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/CmdLineUtils.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CmdLineUtils.pas	14 Dec 2004 22:55:48 -0000	1.5
--- CmdLineUtils.pas	23 Dec 2004 00:25:11 -0000	1.6
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit CmdLineUtils;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit CmdLineUtils;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: JCLData.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/JCLData.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JCLData.pas	17 Nov 2004 09:12:22 -0000	1.3
--- JCLData.pas	23 Dec 2004 00:25:12 -0000	1.4
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit JCLData;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit JCLData;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: jvcl.inc
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/jvcl.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jvcl.inc	25 Nov 2004 19:55:08 -0000	1.2
--- jvcl.inc	23 Dec 2004 00:25:12 -0000	1.3
***************
*** 30,46 ****
  {$DEFINE NO_JCL}
  
- // Automatic defines for entry level Delphi's:
- {$IFDEF D5Standard}
-  {$DEFINE DelphiPersonalEdition}
- {$ENDIF}
- 
- {$IFDEF D6PersonalEdition}
-  {$DEFINE DelphiPersonalEdition}
- {$ENDIF}
- 
- {$IFDEF D7PersonalEdition}
-  {$DEFINE DelphiPersonalEdition}
- {$ENDIF}
- 
  // Reduces warnings on D7:
  {$IFDEF COMPILER7_UP}
--- 30,33 ----

Index: PackageUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/PackageUtils.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PackageUtils.pas	16 Jul 2004 09:47:20 -0000	1.9
--- PackageUtils.pas	23 Dec 2004 00:25:12 -0000	1.10
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit PackageUtils;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit PackageUtils;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: Compiler5MissingPropertyFix.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Compiler5MissingPropertyFix.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Compiler5MissingPropertyFix.pas	9 Apr 2004 22:22:31 -0000	1.2
--- Compiler5MissingPropertyFix.pas	23 Dec 2004 00:25:11 -0000	1.3
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit Compiler5MissingPropertyFix;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit Compiler5MissingPropertyFix;
  
+ {$I jvcl.inc}
+ 
  interface

Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24608/install/JVCLInstall/Helpers

Modified Files:
	AHCompBrowseFolderDlg.pas CapExec.pas HtHint.pas 
	JVCLConfiguration.pas MainConfig.dfm MainConfig.pas 
Log Message:
New jvcl.inc structure
Debug Units
Quickreport detection
Personal Edition compilation option


Index: AHCompBrowseFolderDlg.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/AHCompBrowseFolderDlg.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AHCompBrowseFolderDlg.pas	9 Apr 2004 22:22:33 -0000	1.2
--- AHCompBrowseFolderDlg.pas	23 Dec 2004 00:25:13 -0000	1.3
***************
*** 25,37 ****
  // $Id$
  
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
- unit AHCompBrowseFolderDlg;
  {$IFDEF COMPILER6_UP}
   {$WARN UNIT_PLATFORM OFF}
   {$WARN SYMBOL_PLATFORM OFF}
  {$ENDIF}
  interface
  uses
    Windows, Messages, SysUtils, Graphics, Controls, Forms, Classes, Dialogs,
--- 25,40 ----
  // $Id$
  
+ unit AHCompBrowseFolderDlg;
+ 
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
  {$IFDEF COMPILER6_UP}
   {$WARN UNIT_PLATFORM OFF}
   {$WARN SYMBOL_PLATFORM OFF}
  {$ENDIF}
+ 
  interface
+ 
  uses
    Windows, Messages, SysUtils, Graphics, Controls, Forms, Classes, Dialogs,

Index: MainConfig.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/MainConfig.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MainConfig.pas	14 May 2004 17:08:06 -0000	1.5
--- MainConfig.pas	23 Dec 2004 00:25:13 -0000	1.6
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit MainConfig;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit MainConfig;
  
+ {$I jvcl.inc}
+ 
  interface
  
***************
*** 51,55 ****
      BevelHeader: TBevel;
      PanelSpace: TPanel;
-     Label1: TLabel;
      PaintBoxWhite: TPaintBox;
      BtnCancel: TButton;
--- 51,54 ----
***************
*** 62,69 ****
--- 61,74 ----
      procedure FormDestroy(Sender: TObject);
    private
+     function GetCurrentItem: TJVCLConfigItem;
+   private
      FConfig: TJVCLConfig;
+     FSavedCaption: string;
      FFileName: string;
+     property CurrentItem: TJVCLConfigItem read GetCurrentItem;
    public
+     function Execute(const Version: String): Boolean;
      procedure UpdateCheckStates;
+ 
      property FileName: string read FFileName write FFileName;
      property Config: TJVCLConfig read FConfig;
***************
*** 79,83 ****
  procedure TFormJvclIncConfig.CheckListBoxClick(Sender: TObject);
  begin
!   LblComment.Caption := FConfig.Items[CheckListBox.ItemIndex].Comment;
    LblComment.Font.Color := clWindowText;
  end;
--- 84,88 ----
  procedure TFormJvclIncConfig.CheckListBoxClick(Sender: TObject);
  begin
!   LblComment.Caption := CurrentItem.Comment;
    LblComment.Font.Color := clWindowText;
  end;
***************
*** 85,101 ****
  procedure TFormJvclIncConfig.CheckListBoxClickCheck(Sender: TObject);
  begin
!   FConfig.Items[CheckListBox.ItemIndex].Enabled :=
!     CheckListBox.Checked[CheckListBox.ItemIndex];
  end;
  
  procedure TFormJvclIncConfig.UpdateCheckStates;
  var
!   I: Integer;
  begin
    CheckListBox.Clear;
    for I := 0 to FConfig.ItemCount - 1 do
    begin
!     CheckListBox.Items.Add(FConfig.Items[I].Name);
!     CheckListBox.Checked[I] := FConfig.Items[I].Enabled;
    end;
  end;
--- 90,108 ----
  procedure TFormJvclIncConfig.CheckListBoxClickCheck(Sender: TObject);
  begin
!   CurrentItem.Enabled := CheckListBox.Checked[CheckListBox.ItemIndex];
  end;
  
  procedure TFormJvclIncConfig.UpdateCheckStates;
  var
!   I, J: Integer;
  begin
    CheckListBox.Clear;
    for I := 0 to FConfig.ItemCount - 1 do
    begin
!     if not FConfig.Items[I].Hidden then
!     begin
!       J := CheckListBox.Items.AddObject(FConfig.Items[I].Name, FConfig.Items[I]);
!       CheckListBox.Checked[J] := FConfig.Items[I].Enabled
!     end;
    end;
  end;
***************
*** 115,119 ****
  procedure TFormJvclIncConfig.PaintBoxWhitePaint(Sender: TObject);
  begin
!  // XP Theming makes the panel gray so we paint a white rectangle
    PaintBoxWhite.Canvas.Brush.Color := clWindow;
    PaintBoxWhite.Canvas.FillRect(PaintBoxWhite.ClientRect);
--- 122,126 ----
  procedure TFormJvclIncConfig.PaintBoxWhitePaint(Sender: TObject);
  begin
!   // XP Theming makes the panel gray so we paint a white rectangle
    PaintBoxWhite.Canvas.Brush.Color := clWindow;
    PaintBoxWhite.Canvas.FillRect(PaintBoxWhite.ClientRect);
***************
*** 123,129 ****
  begin
    {$IFDEF USE_DXGETTEXT}
!   TranslateComponent(Label1, 'JVCLInstall');
    {$ENDIF USE_DXGETTEXT}
    FConfig := TJVCLConfig.Create;
  end;
  
--- 130,138 ----
  begin
    {$IFDEF USE_DXGETTEXT}
!   TranslateComponent(Self, 'JVCLInstall');
    {$ENDIF USE_DXGETTEXT}
    FConfig := TJVCLConfig.Create;
+   FSavedCaption := Caption;
+   LblComment.Caption := '';
  end;
  
***************
*** 133,135 ****
--- 142,163 ----
  end;
  
+ function TFormJvclIncConfig.GetCurrentItem: TJVCLConfigItem;
+ begin
+   if CheckListBox.ItemIndex >= 0 then
+     Result := TJVCLConfigItem(CheckListBox.Items.Objects[CheckListBox.ItemIndex])
+   else
+     Result := nil;
+ end;
+ 
+ function TFormJvclIncConfig.Execute(const Version: String): Boolean;
+ begin
+   if Version <> '' then
+     Caption := FSavedCaption + ' - ' + Version
+   else
+     Caption := FSavedCaption;
+ 
+   UpdateCheckStates;
+   Result := ShowModal = mrOk;
+ end;
+ 
  end.

Index: JVCLConfiguration.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/JVCLConfiguration.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JVCLConfiguration.pas	22 Jul 2004 19:26:46 -0000	1.4
--- JVCLConfiguration.pas	23 Dec 2004 00:25:13 -0000	1.5
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit JVCLConfiguration;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit JVCLConfiguration;
  
+ {$I jvcl.inc}
+ 
  interface
  
***************
*** 44,47 ****
--- 44,48 ----
      FDirective: string;
      FLine: Integer;
+     FHidden: Boolean;
      function GetEnabled: Boolean;
      function GetName: string;
***************
*** 49,60 ****
    public
      constructor Create(AOwner: TJVCLConfig; const AComment, ADirective: string;
!       ALine: Integer);
      property Line: Integer read FLine;
      property Enabled: Boolean read GetEnabled write SetEnabled;
      property Name: string read GetName;
      property Comment: string read FComment;
    end;
  
!   // Do not edit the lines directly. If you must then call Parse after you had
    // done your changes.
    TJVCLConfig = class(TStringList)
--- 50,62 ----
    public
      constructor Create(AOwner: TJVCLConfig; const AComment, ADirective: string;
!       ALine: Integer; AHidden: Boolean);
      property Line: Integer read FLine;
      property Enabled: Boolean read GetEnabled write SetEnabled;
      property Name: string read GetName;
      property Comment: string read FComment;
+     property Hidden: Boolean read FHidden;
    end;
  
!   // Do not edit the lines directly. If you must then call Parse after you have
    // done your changes.
    TJVCLConfig = class(TStringList)
***************
*** 63,66 ****
--- 65,69 ----
      FItems: TObjectList;
      FFilename: string;
+     FNextHidden: Boolean;
      procedure ParseComment(Token: PTokenInfo; var LastCommentToken: string;
        var InAutoConfig: Integer);
***************
*** 84,88 ****
      property Enabled[Index: string]: Boolean read GetEnabled write SetEnabled;
      property Modified: Boolean read FModified write FModified;
!     property Filename: string read FFilename;
    end;
  
--- 87,91 ----
      property Enabled[Index: string]: Boolean read GetEnabled write SetEnabled;
      property Modified: Boolean read FModified write FModified;
!     property Filename: string read FFilename write FFilename;
    end;
  
***************
*** 113,121 ****
  end;
  
- 
  //=== TJVCLConfigItem ========================================================
  
  constructor TJVCLConfigItem.Create(AOwner: TJVCLConfig;
!   const AComment, ADirective: string; ALine: Integer);
  begin
    inherited Create;
--- 116,123 ----
  end;
  
  //=== TJVCLConfigItem ========================================================
  
  constructor TJVCLConfigItem.Create(AOwner: TJVCLConfig;
!   const AComment, ADirective: string; ALine: Integer; AHidden: Boolean);
  begin
    inherited Create;
***************
*** 123,126 ****
--- 125,129 ----
    FLine := ALine;
    FComment := AComment;
+   FHidden := AHidden;
    FDirective := ADirective;
  end;
***************
*** 228,231 ****
--- 231,235 ----
      LastCommentToken := '';
      InAutoConfig := 0;
+     FNextHidden := False;
      while Parser.GetToken(Token) do
      begin
***************
*** 247,250 ****
--- 251,257 ----
    S := Trim(RemoveCommentBrackets(Token.Value));
  
+   if IsDirective(S, '%hidden%') then
+     FNextHidden := True;
+ 
    if IsDirective(S, '$IFDEF') or IsDirective(S, '$IF') or       // do not localize
      IsDirective(S, '$IFNDEF') then                              // do not localize
***************
*** 255,265 ****
  
    if InAutoConfig = 0 then
      if IsDirective(S, '$DEFINE') or IsDirective(S, '.$DEFINE') then // do not localize
      begin
!       Item := TJVCLConfigItem.Create(Self, LastCommentToken, S, Token.StartLine - 1);
        FItems.Add(Item);
      end
      else
        LastCommentToken := S;
  end;
  
--- 262,275 ----
  
    if InAutoConfig = 0 then
+   begin
      if IsDirective(S, '$DEFINE') or IsDirective(S, '.$DEFINE') then // do not localize
      begin
!       Item := TJVCLConfigItem.Create(Self, LastCommentToken, S, Token.StartLine - 1, FNextHidden);
        FItems.Add(Item);
+       FNextHidden := False;
      end
      else
        LastCommentToken := S;
+   end;
  end;
  

Index: HtHint.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/HtHint.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HtHint.pas	29 Nov 2004 19:17:32 -0000	1.4
--- HtHint.pas	23 Dec 2004 00:25:13 -0000	1.5
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit HtHint;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit HtHint;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: MainConfig.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/MainConfig.dfm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MainConfig.dfm	13 Jun 2004 04:27:58 -0000	1.4
--- MainConfig.dfm	23 Dec 2004 00:25:13 -0000	1.5
***************
*** 26,46 ****
      Height = 141
    end
-   object Label1: TLabel
-     Left = 280
-     Top = 200
-     Width = 457
-     Height = 49
-     AutoSize = False
-     Caption = 
-       'jvcl.inc changes are global to all installed Delphi/BCB versions' +
-       '.'
-     Font.Charset = DEFAULT_CHARSET
-     Font.Color = clRed
-     Font.Height = -13
-     Font.Name = 'MS Sans Serif'
-     Font.Style = [fsBold]
-     ParentFont = False
-     WordWrap = True
-   end
    object CheckListBox: TCheckListBox
      Left = 0
--- 26,29 ----
***************
*** 59,63 ****
      Top = 49
      Width = 457
!     Height = 137
      BorderStyle = bsNone
      TabOrder = 1
--- 42,46 ----
      Top = 49
      Width = 457
!     Height = 136
      BorderStyle = bsNone
      TabOrder = 1
***************
*** 79,82 ****
--- 62,68 ----
      Color = clWindow
      TabOrder = 2
+     DesignSize = (
+       744
+       44)
      object PaintBoxWhite: TPaintBox
        Left = 0

Index: CapExec.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/CapExec.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CapExec.pas	14 May 2004 17:08:06 -0000	1.5
--- CapExec.pas	23 Dec 2004 00:25:13 -0000	1.6
***************
*** 25,33 ****
  // $Id$
  
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
- unit CapExec;
- 
  interface
  
--- 25,33 ----
  // $Id$
  
+ unit CapExec;
+ 
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
  interface

Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24608/install/JVCLInstall/Frames

Modified Files:
	FrmConfigPage.dfm FrmConfigPage.pas FrmDirEditBrowse.pas 
	FrmInstall.dfm FrmInstall.pas FrmPackageSelection.dfm 
	FrmPackageSelection.pas FrmUninstall.dfm FrmUninstall.pas 
Log Message:
New jvcl.inc structure
Debug Units
Quickreport detection
Personal Edition compilation option


Index: FrmDirEditBrowse.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmDirEditBrowse.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FrmDirEditBrowse.pas	24 May 2004 11:32:58 -0000	1.8
--- FrmDirEditBrowse.pas	23 Dec 2004 00:25:12 -0000	1.9
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit FrmDirEditBrowse;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit FrmDirEditBrowse;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: FrmConfigPage.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmConfigPage.pas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FrmConfigPage.pas	17 Dec 2004 21:14:36 -0000	1.16
--- FrmConfigPage.pas	23 Dec 2004 00:25:12 -0000	1.17
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit FrmConfigPage;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit FrmConfigPage;
  
+ {$I jvcl.inc}
+ 
  interface
  
***************
*** 45,62 ****
      CheckBoxDxgettextSupport: TCheckBox;
      CheckBoxRegisterJvGif: TCheckBox;
-     LblDxgettextHomepage: TLabel;
      CheckBoxUseJVCL: TCheckBox;
      GroupBoxInstallOptions: TGroupBox;
      CheckBoxDeveloperInstall: TCheckBox;
      CheckBoxCleanPalettes: TCheckBox;
-     LblOptionsFor: TLabel;
-     ComboBoxTargetIDE: TComboBox;
      ImageListTargets: TImageList;
      CheckBoxBuild: TCheckBox;
!     CheckBoxCompileOnly: TCheckBox;
      FrameDirEditBrowseBPL: TFrameDirEditBrowse;
      FrameDirEditBrowseDCP: TFrameDirEditBrowse;
      FrameDirEditBrowseHPP: TFrameDirEditBrowse;
-     BtnEditJvclInc: TButton;
      LblBCBGuide: TLabel;
      CheckBoxCompileJclDcp: TCheckBox;
--- 45,58 ----
      CheckBoxDxgettextSupport: TCheckBox;
      CheckBoxRegisterJvGif: TCheckBox;
      CheckBoxUseJVCL: TCheckBox;
      GroupBoxInstallOptions: TGroupBox;
      CheckBoxDeveloperInstall: TCheckBox;
      CheckBoxCleanPalettes: TCheckBox;
      ImageListTargets: TImageList;
      CheckBoxBuild: TCheckBox;
!     CheckBoxIDERegister: TCheckBox;
      FrameDirEditBrowseBPL: TFrameDirEditBrowse;
      FrameDirEditBrowseDCP: TFrameDirEditBrowse;
      FrameDirEditBrowseHPP: TFrameDirEditBrowse;
      LblBCBGuide: TLabel;
      CheckBoxCompileJclDcp: TCheckBox;
***************
*** 65,68 ****
--- 61,69 ----
      CheckBoxUnitVersioning: TCheckBox;
      CheckBoxIgnoreMakeErrors: TCheckBox;
+     ComboBoxTargetIDE: TComboBox;
+     BtnEditJvclInc: TButton;
+     PanelBk: TPanel;
+     LblOptionsFor: TLabel;
+     CheckBoxDebugUnits: TCheckBox;
      procedure CheckBoxDeveloperInstallClick(Sender: TObject);
      procedure CheckBoxXPThemingClick(Sender: TObject);
***************
*** 84,87 ****
--- 85,90 ----
      procedure DcpDirChanged(Sender: TObject; UserData: TObject; var Dir: string);
      procedure HppDirChanged(Sender: TObject; UserData: TObject; var Dir: string);
+     procedure SetJVCLConfig(const Id: string; CheckBox: TCheckBox);
+     procedure GetJVCLConfig(const Id: string; CheckBox: TCheckBox);
    protected
      property Installer: TInstaller read FInstaller;
***************
*** 95,99 ****
  
  uses
!   InstallerConsts, Core, MainConfig, Main, Utils, Math;
  
  {$R *.dfm}
--- 98,102 ----
  
  uses
!   InstallerConsts, Core, MainConfig, Main, Utils, Math, JVCLConfiguration;
  
  {$R *.dfm}
***************
*** 197,211 ****
      end;
      ComboBoxTargetIDEChange(ComboBoxTargetIDE);
-     
-    // jvcl.inc
-     LblDxgettextHomepage.Left := CheckBoxDxgettextSupport.Left + 16;
-     LblDxgettextHomepage.Top := CheckBoxDxgettextSupport.Top;
-     LblDxgettextHomepage.OnClick := Installer.DoHomepageClick;
-     LblDxgettextHomepage.Caption := CheckBoxDxgettextSupport.Caption;
  
-     //CheckBoxDxgettextSupport.Visible := Installer.Data.IsDxgettextInstalled;
-     LblDxgettextHomepage.Visible := not CheckBoxDxgettextSupport.Visible;
- 
-    // common options
      if not CommonCompiledJcl then
        Installer.Data.CompileJclDcp := True;
--- 200,204 ----
***************
*** 213,217 ****
      CheckBoxCompileJclDcp.Enabled := CommonCompiledJcl;
      CheckBoxCompileJclDcp.Visible := HasBCB;
!     
      CheckBoxVerbose.Checked := Installer.Data.Verbose;
      CheckBoxIgnoreMakeErrors.Checked := Installer.Data.IgnoreMakeErrors;
--- 206,210 ----
      CheckBoxCompileJclDcp.Enabled := CommonCompiledJcl;
      CheckBoxCompileJclDcp.Visible := HasBCB;
! 
      CheckBoxVerbose.Checked := Installer.Data.Verbose;
      CheckBoxIgnoreMakeErrors.Checked := Installer.Data.IgnoreMakeErrors;
***************
*** 232,237 ****
      TCheckBox(Sender).State := cbChecked;
  
!   CheckBoxDeveloperInstall.Enabled := CheckBoxCompileOnly.Checked;
!   CheckBoxCleanPalettes.Enabled := CheckBoxCompileOnly.Checked;
  
    if ComboBoxTargetIDE.ItemIndex <= 0 then
--- 225,230 ----
      TCheckBox(Sender).State := cbChecked;
  
!   CheckBoxDebugUnits.Enabled := not CheckBoxDeveloperInstall.Checked;
!   CheckBoxCleanPalettes.Enabled := CheckBoxIDERegister.Checked;
  
    if ComboBoxTargetIDE.ItemIndex <= 0 then
***************
*** 239,248 ****
      if Sender = CheckBoxDeveloperInstall then
        Installer.Data.DeveloperInstall := Integer(CheckBoxDeveloperInstall.Checked)
      else if Sender = CheckBoxCleanPalettes then
        Installer.Data.CleanPalettes := Integer(CheckBoxCleanPalettes.Checked)
      else if Sender = CheckBoxBuild then
        Installer.Data.Build := Integer(CheckBoxBuild.Checked)
!     else if Sender = CheckBoxCompileOnly then
!       Installer.Data.CompileOnly := Integer(not CheckBoxCompileOnly.Checked)
      else if Sender = CheckBoxGenerateMapFiles then
        Installer.Data.GenerateMapFiles := Integer(CheckBoxGenerateMapFiles.Checked)
--- 232,243 ----
      if Sender = CheckBoxDeveloperInstall then
        Installer.Data.DeveloperInstall := Integer(CheckBoxDeveloperInstall.Checked)
+     else if Sender = CheckBoxDebugUnits then
+       Installer.Data.DebugUnits := Integer(CheckBoxDebugUnits.Checked)
      else if Sender = CheckBoxCleanPalettes then
        Installer.Data.CleanPalettes := Integer(CheckBoxCleanPalettes.Checked)
      else if Sender = CheckBoxBuild then
        Installer.Data.Build := Integer(CheckBoxBuild.Checked)
!     else if Sender = CheckBoxIDERegister then
!       Installer.Data.CompileOnly := Integer(not CheckBoxIDERegister.Checked)
      else if Sender = CheckBoxGenerateMapFiles then
        Installer.Data.GenerateMapFiles := Integer(CheckBoxGenerateMapFiles.Checked)
***************
*** 254,267 ****
      if Sender = CheckBoxDeveloperInstall then
        TargetConfig.DeveloperInstall := CheckBoxDeveloperInstall.Checked
      else if Sender = CheckBoxCleanPalettes then
        TargetConfig.CleanPalettes := CheckBoxCleanPalettes.Checked
      else if Sender = CheckBoxBuild then
        TargetConfig.Build := CheckBoxBuild.Checked
!     else if Sender = CheckBoxCompileOnly then
!       TargetConfig.CompileOnly := not CheckBoxCompileOnly.Checked
      else if Sender = CheckBoxGenerateMapFiles then
        TargetConfig.GenerateMapFiles := CheckBoxGenerateMapFiles.Checked
      ;
    end;
    PackageInstaller.UpdatePages;
  end;
--- 249,265 ----
      if Sender = CheckBoxDeveloperInstall then
        TargetConfig.DeveloperInstall := CheckBoxDeveloperInstall.Checked
+     else if Sender = CheckBoxDebugUnits then
+       TargetConfig.DebugUnits := CheckBoxDebugUnits.Checked
      else if Sender = CheckBoxCleanPalettes then
        TargetConfig.CleanPalettes := CheckBoxCleanPalettes.Checked
      else if Sender = CheckBoxBuild then
        TargetConfig.Build := CheckBoxBuild.Checked
!     else if Sender = CheckBoxIDERegister then
!       TargetConfig.CompileOnly := not CheckBoxIDERegister.Checked
      else if Sender = CheckBoxGenerateMapFiles then
        TargetConfig.GenerateMapFiles := CheckBoxGenerateMapFiles.Checked
      ;
    end;
+ 
    PackageInstaller.UpdatePages;
  end;
***************
*** 280,294 ****
  end;
  
! procedure TFrameConfigPage.UpdateJvclIncSettings;
  begin
!   with Installer.Data do
    begin
!     CheckBoxXPTheming.Checked := JVCLConfig.Enabled['JVCLThemesEnabled'];
!     CheckBoxRegisterGlobalDesignEditors.Checked := JVCLConfig.Enabled['JVCL_REGISTER_GLOBAL_DESIGNEDITORS'];
!     CheckBoxDxgettextSupport.Checked := JVCLConfig.Enabled['USE_DXGETTEXT'];
!     CheckBoxRegisterJvGif.Checked := JVCLConfig.Enabled['USE_JV_GIF'];
!     CheckBoxUseJVCL.Checked := JVCLConfig.Enabled['USEJVCL'];
!     CheckBoxUnitVersioning.Checked := JVCLConfig.Enabled['UNITVERSIONING'];
!   end;
  end;
  
--- 278,342 ----
  end;
  
! procedure TFrameConfigPage.GetJVCLConfig(const Id: string; CheckBox: TCheckBox);
! var
!   i, e, Count: Integer;
  begin
!   CheckBox.AllowGrayed := False;
! 
!   if SelTargetConfig = nil then
    begin
!     // for all
!     e := 0;
!     Count := 0;
!     for i := 0 to Installer.SelTargetCount - 1 do
!       if Installer.SelTargets[i].InstallJVCL then
!       begin
!         Inc(Count);
!         if Installer.SelTargets[i].JVCLConfig.Enabled[Id] then
!           Inc(e);
!       end;
! 
!     if e = 0 then
!       CheckBox.Checked := False
!     else if e = Count then
!       CheckBox.Checked := True
!     else
!     begin
!       CheckBox.AllowGrayed := True;
!       CheckBox.State := cbGrayed;
!     end;
!   end
!   else
!     CheckBox.Checked := SelTargetConfig.JVCLConfig.Enabled[Id];
! end;
! 
! procedure TFrameConfigPage.SetJVCLConfig(const Id: string; CheckBox: TCheckBox);
! var
!   i: Integer;
! begin
!   if SelTargetConfig = nil then
!   begin
!     // for all
!     for i := 0 to Installer.SelTargetCount - 1 do
!     begin
!       if Installer.SelTargets[i].InstallJVCL and (CheckBox.State <> cbGrayed) then
!       begin
!         Installer.SelTargets[i].JVCLConfig.Enabled[Id] := CheckBox.Checked;
!         CheckBox.AllowGrayed := False;
!       end;
!     end;
!   end
!   else
!     SelTargetConfig.JVCLConfig.Enabled[Id] := CheckBox.Checked;
! end;
! 
! procedure TFrameConfigPage.UpdateJvclIncSettings;
! begin
!   GetJVCLConfig('JVCLThemesEnabled', CheckBoxXPTheming);
!   GetJVCLConfig('JVCL_REGISTER_GLOBAL_DESIGNEDITORS', CheckBoxRegisterGlobalDesignEditors);
!   GetJVCLConfig('USE_DXGETTEXT', CheckBoxDxgettextSupport);
!   GetJVCLConfig('USE_JV_GIF', CheckBoxRegisterJvGif);
!   GetJVCLConfig('USEJVCL', CheckBoxUseJVCL);
!   GetJVCLConfig('UNITVERSIONING', CheckBoxUnitVersioning);
  end;
  
***************
*** 324,335 ****
    end;
  
!   with Installer.Data do
!   begin
!     JVCLConfig.Enabled['JVCLThemesEnabled'] := CheckBoxXPTheming.Checked;
!     JVCLConfig.Enabled['JVCL_REGISTER_GLOBAL_DESIGNEDITORS'] := CheckBoxRegisterGlobalDesignEditors.Checked;
!     JVCLConfig.Enabled['USE_DXGETTEXT'] := CheckBoxDxgettextSupport.Checked;
!     JVCLConfig.Enabled['USE_JV_GIF'] := CheckBoxRegisterJvGif.Checked;
!     JVCLConfig.Enabled['USEJVCL'] := CheckBoxUseJVCL.Checked;
!     JVCLConfig.Enabled['UNITVERSIONING'] := CheckBoxUnitVersioning.Checked;
    end;
  end;
--- 372,385 ----
    end;
  
!   try
!     SetJVCLConfig('JVCLThemesEnabled', CheckBoxXPTheming);
!     SetJVCLConfig('JVCL_REGISTER_GLOBAL_DESIGNEDITORS', CheckBoxRegisterGlobalDesignEditors);
!     SetJVCLConfig('USE_DXGETTEXT', CheckBoxDxgettextSupport);
!     SetJVCLConfig('USE_JV_GIF', CheckBoxRegisterJvGif);
!     SetJVCLConfig('USEJVCL', CheckBoxUseJVCL);
!     SetJVCLConfig('UNITVERSIONING', CheckBoxUnitVersioning);
!   except
!     on E: Exception do
!       MessageDlg(RsJVCLConfigurationError, mtError, [mbOk], 0);
    end;
  end;
***************
*** 346,368 ****
      if ItemIndex <= 0 then
      begin
        CheckBoxDeveloperInstall.State := TCheckBoxState(Installer.Data.DeveloperInstall);
        CheckBoxCleanPalettes.State := TCheckBoxState(Installer.Data.CleanPalettes);
        CheckBoxBuild.State := TCheckBoxState(Installer.Data.Build);
        case TCheckBoxState(Installer.Data.CompileOnly) of
!         cbUnchecked: CheckBoxCompileOnly.State := cbChecked; // invert
!         cbChecked:  CheckBoxCompileOnly.State := cbUnchecked; // invert
        else
!         CheckBoxCompileOnly.State := cbGrayed;
        end;
        CheckBoxGenerateMapFiles.State := TCheckBoxState(Installer.Data.GenerateMapFiles);
      end
      else
      begin
        TargetConfig := SelTargetConfig;
  
        CheckBoxDeveloperInstall.Checked := TargetConfig.DeveloperInstall;
        CheckBoxCleanPalettes.Checked := TargetConfig.CleanPalettes;
        CheckBoxBuild.Checked := TargetConfig.Build;
!       CheckBoxCompileOnly.Checked := not TargetConfig.CompileOnly;
        CheckBoxGenerateMapFiles.Checked := TargetConfig.GenerateMapFiles;
  
--- 396,428 ----
      if ItemIndex <= 0 then
      begin
+       // for all
        CheckBoxDeveloperInstall.State := TCheckBoxState(Installer.Data.DeveloperInstall);
        CheckBoxCleanPalettes.State := TCheckBoxState(Installer.Data.CleanPalettes);
        CheckBoxBuild.State := TCheckBoxState(Installer.Data.Build);
        case TCheckBoxState(Installer.Data.CompileOnly) of
!         cbUnchecked:
!           CheckBoxIDERegister.State := cbChecked; // invert
!         cbChecked:
!           CheckBoxIDERegister.State := cbUnchecked; // invert
        else
!         CheckBoxIDERegister.State := cbGrayed;
        end;
+       BtnEditJvclInc.Visible := False;
        CheckBoxGenerateMapFiles.State := TCheckBoxState(Installer.Data.GenerateMapFiles);
+ 
+       CheckBoxDebugUnits.State := TCheckBoxState(Installer.Data.DebugUnits);
      end
      else
      begin
+       // for selected
        TargetConfig := SelTargetConfig;
+       BtnEditJvclInc.Caption := Format(RsEditJvclInc, [LowerCase(TargetTypes[TargetConfig.Target.IsBCB]), TargetConfig.Target.Version]);
+       BtnEditJvclInc.Visible := True;
  
        CheckBoxDeveloperInstall.Checked := TargetConfig.DeveloperInstall;
+       CheckBoxDebugUnits.Checked := TargetConfig.DebugUnits;
        CheckBoxCleanPalettes.Checked := TargetConfig.CleanPalettes;
        CheckBoxBuild.Checked := TargetConfig.Build;
!       CheckBoxIDERegister.Checked := not TargetConfig.CompileOnly;
        CheckBoxGenerateMapFiles.Checked := TargetConfig.GenerateMapFiles;
  
***************
*** 373,380 ****
--- 433,444 ----
      end;
  
+     CheckBoxCleanPalettes.Enabled := CheckBoxIDERegister.Checked;
+     CheckBoxDebugUnits.Enabled := not CheckBoxDeveloperInstall.Checked;
      FrameDirEditBrowseBPL.Visible := ItemIndex > 0;
      FrameDirEditBrowseDCP.Visible := ItemIndex > 0;
      FrameDirEditBrowseHPP.Visible := (ItemIndex > 0) and SelTargetConfig.Target.IsBCB;
      LblBCBGuide.Visible := FrameDirEditBrowseHPP.Visible;
+ 
+     UpdateJvclIncSettings;
    finally
      Dec(FInitializing);
***************
*** 412,427 ****
  procedure TFrameConfigPage.BtnEditJvclIncClick(Sender: TObject);
  begin
    if FormJvclIncConfig.imgProjectJEDI.Picture.Graphic = nil then
      FormJvclIncConfig.imgProjectJEDI.Picture.Assign(FormMain.ImageLogo.Picture);
  
!   FormJvclIncConfig.Config.Assign(Installer.Data.JVCLConfig);
! 
!   FormJvclIncConfig.UpdateCheckStates;
!   if FormJvclIncConfig.ShowModal = mrOk then
    begin
      if FormJvclIncConfig.Config.Modified then
      begin
!       Installer.Data.JVCLConfig.Assign(FormJvclIncConfig.Config);
!       Installer.Data.JVCLConfig.Modified := True;
      end;
    end;
--- 476,491 ----
  procedure TFrameConfigPage.BtnEditJvclIncClick(Sender: TObject);
  begin
+   Assert(SelTargetConfig <> nil);
+ 
    if FormJvclIncConfig.imgProjectJEDI.Picture.Graphic = nil then
      FormJvclIncConfig.imgProjectJEDI.Picture.Assign(FormMain.ImageLogo.Picture);
  
!   FormJvclIncConfig.Config.Assign(SelTargetConfig.JVCLConfig);
!   if FormJvclIncConfig.Execute(SelTargetConfig.Target.Name + ' ' + SelTargetConfig.Target.VersionStr) then
    begin
      if FormJvclIncConfig.Config.Modified then
      begin
!       SelTargetConfig.JVCLConfig.Assign(FormJvclIncConfig.Config);
!       SelTargetConfig.JVCLConfig.Modified := True;
      end;
    end;

Index: FrmUninstall.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmUninstall.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FrmUninstall.pas	7 May 2004 22:52:43 -0000	1.5
--- FrmUninstall.pas	23 Dec 2004 00:25:12 -0000	1.6
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit FrmUninstall;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit FrmUninstall;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: FrmUninstall.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmUninstall.dfm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FrmUninstall.dfm	9 Apr 2004 22:22:33 -0000	1.2
--- FrmUninstall.dfm	23 Dec 2004 00:25:12 -0000	1.3
***************
*** 3,11 ****
    Top = 0
    Width = 518
!   Height = 335
    TabOrder = 0
    object LblTarget: TLabel
      Left = 8
!     Top = 112
      Width = 55
      Height = 13
--- 3,11 ----
    Top = 0
    Width = 518
!   Height = 348
    TabOrder = 0
    object LblTarget: TLabel
      Left = 8
!     Top = 120
      Width = 55
      Height = 13
***************
*** 20,24 ****
    object LblFilename: TLabel
      Left = 8
!     Top = 160
      Width = 68
      Height = 13
--- 20,24 ----
    object LblFilename: TLabel
      Left = 8
!     Top = 168
      Width = 68
      Height = 13
***************
*** 33,37 ****
    object ProgressBar: TProgressBar
      Left = 8
!     Top = 128
      Width = 505
      Height = 17
--- 33,37 ----
    object ProgressBar: TProgressBar
      Left = 8
!     Top = 136
      Width = 505
      Height = 17
***************
*** 39,44 ****
    end
    object ProgressBarDelete: TProgressBar
!     Left = 5
!     Top = 176
      Width = 505
      Height = 17
--- 39,44 ----
    end
    object ProgressBarDelete: TProgressBar
!     Left = 8
!     Top = 184
      Width = 505
      Height = 17

Index: FrmPackageSelection.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmPackageSelection.dfm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FrmPackageSelection.dfm	14 Oct 2004 20:04:53 -0000	1.4
--- FrmPackageSelection.dfm	23 Dec 2004 00:25:12 -0000	1.5
***************
*** 3,7 ****
    Top = 0
    Width = 518
!   Height = 335
    TabOrder = 0
    object LblTarget: TLabel
--- 3,7 ----
    Top = 0
    Width = 518
!   Height = 348
    TabOrder = 0
    object LblTarget: TLabel
***************
*** 49,53 ****
      Top = 120
      Width = 505
!     Height = 209
      OnClickCheck = CheckListBoxPackagesClickCheck
      AllowGrayed = True
--- 49,53 ----
      Top = 120
      Width = 505
!     Height = 225
      OnClickCheck = CheckListBoxPackagesClickCheck
      AllowGrayed = True

Index: FrmPackageSelection.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmPackageSelection.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FrmPackageSelection.pas	17 May 2004 21:45:02 -0000	1.8
--- FrmPackageSelection.pas	23 Dec 2004 00:25:12 -0000	1.9
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit FrmPackageSelection;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit FrmPackageSelection;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: FrmConfigPage.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmConfigPage.dfm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FrmConfigPage.dfm	17 Dec 2004 21:14:35 -0000	1.17
--- FrmConfigPage.dfm	23 Dec 2004 00:25:12 -0000	1.18
***************
*** 3,10 ****
    Top = 0
    Width = 518
!   Height = 335
    TabOrder = 0
    object LblBCBGuide: TLabel
!     Left = 264
      Top = 312
      Width = 102
--- 3,10 ----
    Top = 0
    Width = 518
!   Height = 348
    TabOrder = 0
    object LblBCBGuide: TLabel
!     Left = 272
      Top = 312
      Width = 102
***************
*** 28,59 ****
    object GroupBoxJvclInc: TGroupBox
      Left = 272
!     Top = 8
      Width = 241
!     Height = 185
!     Caption = ' Global options for all IDEs '
      TabOrder = 1
-     object LblDxgettextHomepage: TLabel
-       Left = 8
-       Top = 74
-       Width = 146
-       Height = 13
-       Cursor = crHandPoint
-       Hint = 
-         'http://dxgettext.sourceforge.net|Download from <c:blue>http://dx' +
-         'gettext.sourceforge.net<c:black>'#13#10'<c:red>The gnugettext.pas unit' +
-         ' will be added to the contains list'#13#10'of the JvCore-R package. Th' +
-         'at means that you cannot add'#13#10'it to another package.'
-       Caption = 'dxgettext &support (not required)'
-       Font.Charset = DEFAULT_CHARSET
-       Font.Color = clBlue
-       Font.Height = -11
-       Font.Name = 'MS Sans Serif'
-       Font.Style = [fsUnderline]
-       ParentFont = False
-       ParentShowHint = False
-       ShowHint = True
-       Visible = False
-       OnClick = LblDxgettextHomepageClick
-     end
      object CheckBoxXPTheming: TCheckBox
        Left = 8
--- 28,36 ----
    object GroupBoxJvclInc: TGroupBox
      Left = 272
!     Top = 33
      Width = 241
!     Height = 160
!     Caption = ' JVCL Options  '
      TabOrder = 1
      object CheckBoxXPTheming: TCheckBox
        Left = 8
***************
*** 136,151 ****
        OnClick = CheckBoxXPThemingClick
      end
-     object BtnEditJvclInc: TButton
-       Left = 152
-       Top = 154
-       Width = 81
-       Height = 25
-       Hint = 'Edit all compile time conditions that are in the jvcl.inc file.'
-       Caption = 'Edit jvcl.inc'
-       ParentShowHint = False
-       ShowHint = True
-       TabOrder = 5
-       OnClick = BtnEditJvclIncClick
-     end
      object CheckBoxUnitVersioning: TCheckBox
        Left = 8
--- 113,116 ----
***************
*** 160,164 ****
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 6
        OnClick = CheckBoxXPThemingClick
      end
--- 125,129 ----
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 5
        OnClick = CheckBoxXPThemingClick
      end
***************
*** 166,186 ****
    object GroupBoxInstallOptions: TGroupBox
      Left = 8
!     Top = 8
      Width = 249
!     Height = 321
      Caption = ' Installation options '
      TabOrder = 0
-     object LblOptionsFor: TLabel
-       Left = 8
-       Top = 20
-       Width = 54
-       Height = 13
-       Caption = '&Options for:'
-       FocusControl = ComboBoxTargetIDE
-     end
      object CheckBoxDeveloperInstall: TCheckBox
!       Left = 16
!       Top = 115
!       Width = 225
        Height = 17
        Hint = 
--- 131,143 ----
    object GroupBoxInstallOptions: TGroupBox
      Left = 8
!     Top = 33
      Width = 249
!     Height = 312
      Caption = ' Installation options '
      TabOrder = 0
      object CheckBoxDeveloperInstall: TCheckBox
!       Left = 8
!       Top = 88
!       Width = 233
        Height = 17
        Hint = 
***************
*** 192,202 ****
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 4
        OnClick = CheckBoxDeveloperInstallClick
      end
      object CheckBoxCleanPalettes: TCheckBox
!       Left = 16
!       Top = 91
!       Width = 225
        Height = 17
        Hint = 
--- 149,159 ----
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 3
        OnClick = CheckBoxDeveloperInstallClick
      end
      object CheckBoxCleanPalettes: TCheckBox
!       Left = 24
!       Top = 64
!       Width = 217
        Height = 17
        Hint = 
***************
*** 207,227 ****
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 3
        OnClick = CheckBoxDeveloperInstallClick
      end
-     object ComboBoxTargetIDE: TComboBox
-       Left = 72
-       Top = 16
-       Width = 169
-       Height = 22
-       Style = csOwnerDrawFixed
-       ItemHeight = 16
-       TabOrder = 0
-       OnChange = ComboBoxTargetIDEChange
-       OnDrawItem = ComboBoxTargetIDEDrawItem
-     end
      object CheckBoxBuild: TCheckBox
        Left = 8
!       Top = 43
        Width = 233
        Height = 17
--- 164,173 ----
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 2
        OnClick = CheckBoxDeveloperInstallClick
      end
      object CheckBoxBuild: TCheckBox
        Left = 8
!       Top = 16
        Width = 233
        Height = 17
***************
*** 234,243 ****
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 1
        OnClick = CheckBoxDeveloperInstallClick
      end
!     object CheckBoxCompileOnly: TCheckBox
        Left = 8
!       Top = 67
        Width = 233
        Height = 17
--- 180,189 ----
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 0
        OnClick = CheckBoxDeveloperInstallClick
      end
!     object CheckBoxIDERegister: TCheckBox
        Left = 8
!       Top = 40
        Width = 233
        Height = 17
***************
*** 249,258 ****
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 2
        OnClick = CheckBoxDeveloperInstallClick
      end
      inline FrameDirEditBrowseBPL: TFrameDirEditBrowse
        Left = 2
!       Top = 160
        Width = 239
        Height = 49
--- 195,204 ----
        ParentShowHint = False
        ShowHint = True
!       TabOrder = 1
        OnClick = CheckBoxDeveloperInstallClick
      end
      inline FrameDirEditBrowseBPL: TFrameDirEditBrowse
        Left = 2
!       Top = 155
        Width = 239
        Height = 49
***************
*** 278,282 ****
      inline FrameDirEditBrowseDCP: TFrameDirEditBrowse
        Left = 2
!       Top = 208
        Width = 239
        Height = 49
--- 224,228 ----
      inline FrameDirEditBrowseDCP: TFrameDirEditBrowse
        Left = 2
!       Top = 203
        Width = 239
        Height = 49
***************
*** 302,306 ****
      inline FrameDirEditBrowseHPP: TFrameDirEditBrowse
        Left = 2
!       Top = 264
        Width = 239
        Height = 49
--- 248,252 ----
      inline FrameDirEditBrowseHPP: TFrameDirEditBrowse
        Left = 2
!       Top = 259
        Width = 239
        Height = 49
***************
*** 334,338 ****
      object CheckBoxGenerateMapFiles: TCheckBox
        Left = 8
!       Top = 139
        Width = 233
        Height = 17
--- 280,284 ----
      object CheckBoxGenerateMapFiles: TCheckBox
        Left = 8
!       Top = 136
        Width = 233
        Height = 17
***************
*** 349,352 ****
--- 295,314 ----
        OnClick = CheckBoxDeveloperInstallClick
      end
+     object CheckBoxDebugUnits: TCheckBox
+       Left = 24
+       Top = 112
+       Width = 217
+       Height = 17
+       Hint = 
+         'Activate this option if you also want to compile debug units.'#13#10'J' +
+         'VCL Developer installations units do not need this because'#13#10'they' +
+         ' are compiled with debug information included.'
+       AllowGrayed = True
+       Caption = 'Compile debug units'
+       ParentShowHint = False
+       ShowHint = True
+       TabOrder = 4
+       OnClick = CheckBoxDeveloperInstallClick
+     end
    end
    object CheckBoxCompileJclDcp: TCheckBox
***************
*** 393,396 ****
--- 355,398 ----
      OnClick = CheckBoxCompileJclDcpClick
    end
+   object ComboBoxTargetIDE: TComboBox
+     Left = 80
+     Top = 8
+     Width = 177
+     Height = 22
+     Style = csOwnerDrawFixed
+     ItemHeight = 16
+     TabOrder = 5
+     OnChange = ComboBoxTargetIDEChange
+     OnDrawItem = ComboBoxTargetIDEDrawItem
+   end
+   object BtnEditJvclInc: TButton
+     Left = 384
+     Top = 7
+     Width = 129
+     Height = 25
+     Hint = 'Edit all compile time conditions that are in the jvcl.inc file.'
+     Caption = 'Edit jvcl%s%d.inc'
+     ParentShowHint = False
+     ShowHint = True
+     TabOrder = 6
+     OnClick = BtnEditJvclIncClick
+   end
+   object PanelBk: TPanel
+     Left = 0
+     Top = 8
+     Width = 78
+     Height = 22
+     BevelOuter = bvNone
+     TabOrder = 7
+     object LblOptionsFor: TLabel
+       Left = 8
+       Top = 4
+       Width = 54
+       Height = 13
+       Caption = '&Options for:'
+       FocusControl = ComboBoxTargetIDE
+       Transparent = False
+     end
+   end
    object ImageListTargets: TImageList
      Left = 200

Index: FrmInstall.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmInstall.dfm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FrmInstall.dfm	10 May 2004 16:57:59 -0000	1.3
--- FrmInstall.dfm	23 Dec 2004 00:25:12 -0000	1.4
***************
*** 3,7 ****
    Top = 0
    Width = 518
!   Height = 335
    TabOrder = 0
    object LblTarget: TLabel
--- 3,7 ----
    Top = 0
    Width = 518
!   Height = 348
    TabOrder = 0
    object LblTarget: TLabel
***************
*** 27,31 ****
    object LblOpenFile: TLabel
      Left = 8
!     Top = 320
      Width = 505
      Height = 13
--- 27,31 ----
    object LblOpenFile: TLabel
      Left = 8
!     Top = 331
      Width = 505
      Height = 13
***************
*** 62,66 ****
      Top = 128
      Width = 505
!     Height = 193
      Font.Charset = DEFAULT_CHARSET
      Font.Color = clWindowText
--- 62,66 ----
      Top = 128
      Width = 505
!     Height = 201
      Font.Charset = DEFAULT_CHARSET
      Font.Color = clWindowText

Index: FrmInstall.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmInstall.pas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FrmInstall.pas	17 Dec 2004 21:14:36 -0000	1.16
--- FrmInstall.pas	23 Dec 2004 00:25:12 -0000	1.17
***************
*** 25,33 ****
  // $Id$
  
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
- unit FrmInstall;
- 
  interface
  
--- 25,33 ----
  // $Id$
  
+ unit FrmInstall;
+ 
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
  interface

Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Pages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24608/install/JVCLInstall/Pages

Modified Files:
	PgConfig.pas PgIDESelection.pas PgInstall.pas 
	PgPackageSelection.pas PgSummary.pas PgUninstall.pas 
Log Message:
New jvcl.inc structure
Debug Units
Quickreport detection
Personal Edition compilation option


Index: PgSummary.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Pages/PgSummary.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PgSummary.pas	14 May 2004 17:08:06 -0000	1.4
--- PgSummary.pas	23 Dec 2004 00:25:13 -0000	1.5
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit PgSummary;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit PgSummary;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: PgInstall.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Pages/PgInstall.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgInstall.pas	9 Apr 2004 22:22:34 -0000	1.2
--- PgInstall.pas	23 Dec 2004 00:25:13 -0000	1.3
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit PgInstall;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit PgInstall;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: PgIDESelection.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Pages/PgIDESelection.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PgIDESelection.pas	5 Nov 2004 11:49:21 -0000	1.4
--- PgIDESelection.pas	23 Dec 2004 00:25:13 -0000	1.5
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit PgIDESelection;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit PgIDESelection;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: PgUninstall.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Pages/PgUninstall.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgUninstall.pas	9 Apr 2004 22:22:34 -0000	1.2
--- PgUninstall.pas	23 Dec 2004 00:25:13 -0000	1.3
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit PgUninstall;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit PgUninstall;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: PgPackageSelection.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Pages/PgPackageSelection.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgPackageSelection.pas	9 Apr 2004 22:22:34 -0000	1.2
--- PgPackageSelection.pas	23 Dec 2004 00:25:13 -0000	1.3
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit PgPackageSelection;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit PgPackageSelection;
  
+ {$I jvcl.inc}
+ 
  interface
  

Index: PgConfig.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Pages/PgConfig.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgConfig.pas	9 Apr 2004 22:22:34 -0000	1.2
--- PgConfig.pas	23 Dec 2004 00:25:13 -0000	1.3
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit PgConfig;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit PgConfig;
  
+ {$I jvcl.inc}
+ 
  interface

Update of /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24333/devtools/PackagesGenerator

Modified Files:
	FileUtils.pas GenerateUtils.pas UtilsJcl.pas 
Log Message:
New jvcl.inc structure


Index: UtilsJcl.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator/UtilsJcl.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UtilsJcl.pas	20 May 2004 09:18:50 -0000	1.3
--- UtilsJcl.pas	23 Dec 2004 00:23:58 -0000	1.4
***************
*** 26,34 ****
  -----------------------------------------------------------------------------}
  
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
- unit UtilsJcl;
- 
  interface
  
--- 26,34 ----
  -----------------------------------------------------------------------------}
  
+ unit UtilsJcl;
+ 
  {$I jvcl.inc}
  {$I windowsonly.inc}
  
  interface
  

Index: FileUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator/FileUtils.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FileUtils.pas	7 Apr 2004 00:20:39 -0000	1.6
--- FileUtils.pas	23 Dec 2004 00:23:58 -0000	1.7
***************
*** 1,11 ****
- {$I jvcl.inc}
  unit FileUtils;
  
  interface
  uses
    Windows;
  {$IFNDEF COMPILER6_UP}
! {$DEFINE MSWINDOWS}
  {$ENDIF COMPILER6_UP}
  // returns the relative path between Origin and Destination
  // This is the string you would have to type after the 'cd'
--- 1,15 ----
  unit FileUtils;
  
+ {$I jvcl.inc}
+ 
  interface
+ 
  uses
    Windows;
+ 
  {$IFNDEF COMPILER6_UP}
!  {$DEFINE MSWINDOWS}
  {$ENDIF COMPILER6_UP}
+ 
  // returns the relative path between Origin and Destination
  // This is the string you would have to type after the 'cd'

Index: GenerateUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator/GenerateUtils.pas,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** GenerateUtils.pas	25 Nov 2004 21:49:10 -0000	1.70
--- GenerateUtils.pas	23 Dec 2004 00:23:58 -0000	1.71
***************
*** 1,6 ****
- {$I jvcl.inc}
- 
  unit GenerateUtils;
  
  interface
  
--- 1,6 ----
  unit GenerateUtils;
  
+ {$I jvcl.inc}
+ 
  interface
  
***************
*** 175,178 ****
--- 175,179 ----
    GCallBack          : TGenerateCallBack;
    GPackagesLocation  : string;
+   GIncDefFileName    : string;
    GIncFileName       : string;
    GPrefix            : string;
***************
*** 509,512 ****
--- 510,514 ----
        ClxReplacementList  := TClxReplacementList.Create(Node.Items.ItemNamed['ClxReplacements']);
  
+       GIncDefFileName   := Node.Properties.ItemNamed['incdeffile'].Value;
        GIncFileName      := Node.Properties.ItemNamed['IncFile'].Value;
        GPackagesLocation := Node.Properties.ItemNamed['packages'].Value;
***************
*** 1494,1497 ****
--- 1496,1529 ----
  end;
  
+ // loads the .inc file into Defines and returns True if the Filename contains
+ // a "%t"
+ function LoadDefines(const Target: string; Filename: string): Boolean;
+ var
+   incfile : TStringList;
+   ps: Integer;
+ begin
+   Result := False;
+   FreeAndNil(DefinesList);
+ 
+   // read the include file for this target or the default file if jvclxx.inc does not exist
+   incfile := TStringList.Create;
+   try
+     ps := Pos('%t', Filename);
+     if ps > 0 then
+     begin
+       Delete(Filename, ps, 2);
+       Insert(LowerCase(Target), Filename, ps);
+       if not FileExists(Filename) then
+         Filename := GIncDefFileName;
+       Result := True;
+     end;
+     if FileExists(Filename) then
+       incfile.LoadFromFile(Filename);
+     DefinesList := TDefinesList.Create(incfile);
+   finally
+     incfile.free;
+   end;
+ end;
+ 
  function Generate(packages : TStrings;
                     targets : TStrings;
***************
*** 1515,1519 ****
    persoTarget : string;
    target : string;
!   incfile : TStringList;
  
  begin
--- 1547,1551 ----
    persoTarget : string;
    target : string;
!   GenericIncFile: Boolean;
  
  begin
***************
*** 1536,1551 ****
    IsBinaryCache.Clear;
  
-   FreeAndNil(DefinesList);
    if incFileName = '' then
      incFileName := GIncFileName;
!   // read the include file
!   incfile := TStringList.Create;
!   try
!     if FileExists(IncFileName) then
!       incfile.LoadFromFile(IncFileName);
!     DefinesList := TDefinesList.Create(incfile);
!   finally
!     incfile.free;
!   end;
  
    GCallBack := CallBack;
--- 1568,1574 ----
    IsBinaryCache.Clear;
  
    if incFileName = '' then
      incFileName := GIncFileName;
!   GenericIncFile := LoadDefines('', incFileName);
  
    GCallBack := CallBack;
***************
*** 1570,1573 ****
--- 1593,1599 ----
    begin
      target := targets[i];
+     if GenericIncFile then
+       LoadDefines(target, incFileName);
+ 
      SendMsg(SysUtils.Format('Generating packages for %s', [target]));
      // find all template files for that target

Update of /cvsroot/jvcl/dev/JVCL3/devtools/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24333/devtools/bin

Modified Files:
	pgEdit.xml 
Log Message:
New jvcl.inc structure


Index: pgEdit.xml
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/bin/pgEdit.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** pgEdit.xml	15 Nov 2004 20:29:10 -0000	1.23
--- pgEdit.xml	23 Dec 2004 00:23:59 -0000	1.24
***************
*** 61,65 ****
    -->
    <models>
!     <model name="JVCL" prefix="Jv" format="%p%n%e%v%t" clxPrefix="JvQ" packages="..\..\packages" incfile="..\..\common\jvcl.inc">
        <targets>
          <target name="c5" pname="c5s" pdir="c5std"/>
--- 61,65 ----
    -->
    <models>
!     <model name="JVCL" prefix="Jv" format="%p%n%e%v%t" clxPrefix="JvQ" packages="..\..\packages" incfile="..\..\common\jvcl%t.inc" incdeffile="..\..\common\jvclbase.inc">
        <targets>
          <target name="c5" pname="c5s" pdir="c5std"/>

Update of /cvsroot/jvcl/dev/JVCL3/devtools/Common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24333/devtools/Common

Modified Files:
	PackageInformation.pas 
Log Message:
New jvcl.inc structure


Index: PackageInformation.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/Common/PackageInformation.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PackageInformation.pas	25 Nov 2004 22:18:28 -0000	1.9
--- PackageInformation.pas	23 Dec 2004 00:23:58 -0000	1.10
***************
*** 25,32 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  unit PackageInformation;
  
  interface
  
--- 25,32 ----
  // $Id$
  
  unit PackageInformation;
  
+ {$I jvcl.inc}
+ 
  interface

Update of /cvsroot/jvcl/dev/JVCL3/packages/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17667/packages/bin

Modified Files:
	Makefile.mak 
Log Message:
Updated installer


Index: Makefile.mak
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/Makefile.mak,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Makefile.mak	22 Dec 2004 23:48:52 -0000	1.42
--- Makefile.mak	22 Dec 2004 23:59:59 -0000	1.43
***************
*** 161,166 ****
  	@echo -R"$(ROOT)\Lib">>"$(CFG)"
  	@echo -I"$(ROOT)\Include;$(ROOT)\Include\Vcl">>"$(CFG)"
! 	@echo -U"$(DCPDIR);$(LIBDIR);$(BPLDIR)>>"$(CFG)"
! 	#@echo -U"$(MAINDCPDIR);$(MAINLIBDIR);$(MAINBPLDIR)">>"$(CFG)"
  	#
  	@echo -I"$(JCLINCLUDEDIRS)">>"$(CFG)"
--- 161,165 ----
  	@echo -R"$(ROOT)\Lib">>"$(CFG)"
  	@echo -I"$(ROOT)\Include;$(ROOT)\Include\Vcl">>"$(CFG)"
! 	@echo -U"$(DCPDIR);$(LIBDIR);$(BPLDIR)">>"$(CFG)"
  	#
  	@echo -I"$(JCLINCLUDEDIRS)">>"$(CFG)"
***************
*** 235,238 ****
--- 234,238 ----
  	@echo -DNO_UNITVERSIONING>>JVCLInstall.cfg
  	@echo -DUSE_DXGETTEXT>>JVCLInstall.cfg
+ 	@echo -DDEFAULT_JVCL_INC>>JVCLInstall.cfg
  	#
  	#