From 10535d18d55f6389a14079e58a5e4694e114ea56 Mon Sep 17 00:00:00 2001
From: andrew <andrew@lazarus-ide.org>
Date: Sun, 28 Oct 2007 12:48:20 +0000
Subject: [PATCH] Removed dependancy of lnet from lhelp and added a note about
 the chmhelp package not needed with fpc >= 2.3.1

git-svn-id: trunk@12618 -
---
 components/chmhelp/lhelp/lhelp.lpi         | 41 +++++++---------------
 components/chmhelp/lhelp/lhelpcore.lfm     |  6 ++--
 components/chmhelp/lhelp/lhelpcore.lrs     |  6 ++--
 components/chmhelp/lhelp/lhelpcore.pas     |  3 +-
 components/chmhelp/packages/chm/chmpkg.lpk | 12 ++++---
 5 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/components/chmhelp/lhelp/lhelp.lpi b/components/chmhelp/lhelp/lhelp.lpi
index e1346e4b1f..cbbb602a2f 100644
--- a/components/chmhelp/lhelp/lhelp.lpi
+++ b/components/chmhelp/lhelp/lhelp.lpi
@@ -2,32 +2,13 @@
 <CONFIG>
   <ProjectOptions>
     <PathDelim Value="/"/>
-    <Version Value="5"/>
+    <Version Value="6"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=""/>
     </General>
-    <VersionInfo>
-      <UseVersionInfo Value="False"/>
-      <AutoIncrementBuild Value="False"/>
-      <CurrentVersionNr Value="0"/>
-      <CurrentMajorRevNr Value="0"/>
-      <CurrentMinorRevNr Value="0"/>
-      <CurrentBuildNr Value="0"/>
-      <ProjectVersion Value="1.0.0.0"/>
-      <Language Value="0409"/>
-      <CharSet Value="04E4"/>
-      <Comments Value=""/>
-      <CompanyName Value=""/>
-      <FileDescription Value=""/>
-      <InternalName Value=""/>
-      <LegalCopyright Value=""/>
-      <LegalTrademarks Value=""/>
-      <OriginalFilename Value=""/>
-      <ProductName Value=""/>
-    </VersionInfo>
     <PublishOptions>
       <Version Value="2"/>
       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
@@ -40,25 +21,22 @@
         <Display Value="192.168.0.250:0"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="5">
+    <RequiredPackages Count="4">
       <Item1>
-        <PackageName Value="TurboPowerIPro"/>
-        <MinVersion Major="1" Valid="True"/>
+        <PackageName Value="chmpkg"/>
       </Item1>
       <Item2>
-        <PackageName Value="lnetpackage"/>
+        <PackageName Value="LCL"/>
       </Item2>
       <Item3>
         <PackageName Value="lhelpcontrolpkg"/>
       </Item3>
       <Item4>
-        <PackageName Value="LCL"/>
+        <PackageName Value="TurboPowerIPro"/>
+        <MinVersion Major="1" Valid="True"/>
       </Item4>
-      <Item5>
-        <PackageName Value="chmpkg"/>
-      </Item5>
     </RequiredPackages>
-    <Units Count="9">
+    <Units Count="10">
       <Unit0>
         <Filename Value="lhelp.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -109,6 +87,11 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="HTTPContentProvider"/>
       </Unit8>
+      <Unit9>
+        <Filename Value="../packages/chm/chmpkg.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="chmpkg"/>
+      </Unit9>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/chmhelp/lhelp/lhelpcore.lfm b/components/chmhelp/lhelp/lhelpcore.lfm
index 3c7e4eeff1..3d1f0d7357 100644
--- a/components/chmhelp/lhelp/lhelpcore.lfm
+++ b/components/chmhelp/lhelp/lhelpcore.lfm
@@ -4,9 +4,9 @@ object HelpForm: THelpForm
   Top = 208
   Width = 758
   HorzScrollBar.Page = 757
-  VertScrollBar.Page = 508
+  VertScrollBar.Page = 509
   Caption = 'LHelp'
-  ClientHeight = 509
+  ClientHeight = 510
   ClientWidth = 758
   Icon.Data = {
     F6060000424DF606000000000000360000002800000018000000180000000100
@@ -260,7 +260,7 @@ object HelpForm: THelpForm
     end
   end
   object PageControl: TPageControl
-    Height = 477
+    Height = 478
     Top = 32
     Width = 758
     Align = alClient
diff --git a/components/chmhelp/lhelp/lhelpcore.lrs b/components/chmhelp/lhelp/lhelpcore.lrs
index 03daf9bee8..3ad2d892dc 100644
--- a/components/chmhelp/lhelp/lhelpcore.lrs
+++ b/components/chmhelp/lhelp/lhelpcore.lrs
@@ -2,8 +2,8 @@
 
 LazarusResources.Add('THelpForm','FORMDATA',[
   'TPF0'#9'THelpForm'#8'HelpForm'#4'Left'#3'V'#1#6'Height'#3#23#2#3'Top'#3#208#0
-  +#5'Width'#3#246#2#18'HorzScrollBar.Page'#3#245#2#18'VertScrollBar.Page'#3#252
-  +#1#7'Caption'#6#5'LHelp'#12'ClientHeight'#3#253#1#11'ClientWidth'#3#246#2#9
+  +#5'Width'#3#246#2#18'HorzScrollBar.Page'#3#245#2#18'VertScrollBar.Page'#3#253
+  +#1#7'Caption'#6#5'LHelp'#12'ClientHeight'#3#254#1#11'ClientWidth'#3#246#2#9
   +'Icon.Data'#10#250#6#0#0#246#6#0#0'BM'#246#6#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#24
   +#0#0#0#24#0#0#0#1#0#24#0#0#0#0#0#192#6#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0
   +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
@@ -176,7 +176,7 @@ LazarusResources.Add('THelpForm','FORMDATA',[
   +',.,...,.,.,.,.,.,.,.,.,...,.,.,.,.,.,......",'#10'".................,.,.,..'
   +'........................",'#10'"...........................................'
   +'....."}'#10#9'NumGlyphs'#2#0#7'OnClick'#7#16'HomeToolBtnClick'#0#0#0#12'TPa'
-  +'geControl'#11'PageControl'#6'Height'#3#221#1#3'Top'#2' '#5'Width'#3#246#2#5
+  +'geControl'#11'PageControl'#6'Height'#3#222#1#3'Top'#2' '#5'Width'#3#246#2#5
   +'Align'#7#8'alClient'#8'TabOrder'#2#1#11'TabPosition'#7#8'tpBottom'#8'OnChan'
   +'ge'#7#17'PageControlChange'#7'OnEnter'#7#16'PageControlEnter'#13'OnPageChan'
   +'ged'#7#17'PageControlChange'#0#0#9'TMainMenu'#9'MainMenu1'#3'top'#2'|'#0#9
diff --git a/components/chmhelp/lhelp/lhelpcore.pas b/components/chmhelp/lhelp/lhelpcore.pas
index 6d07010b16..7e47fd5b0d 100644
--- a/components/chmhelp/lhelp/lhelpcore.pas
+++ b/components/chmhelp/lhelp/lhelpcore.pas
@@ -24,8 +24,7 @@ interface
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs,
   Buttons, LCLProc, StdCtrls, IpHtml, ComCtrls, ExtCtrls,
-  Menus, SimpleIPC, BaseContentProvider, FileContentProvider, ChmContentProvider
-  {$IFNDEF NO_LNET}, HTTPContentProvider{$ENDIF};
+  Menus, SimpleIPC, BaseContentProvider, FileContentProvider, ChmContentProvider;
 
 type
 
diff --git a/components/chmhelp/packages/chm/chmpkg.lpk b/components/chmhelp/packages/chm/chmpkg.lpk
index 7f7e1a05ac..e81c688c6d 100644
--- a/components/chmhelp/packages/chm/chmpkg.lpk
+++ b/components/chmhelp/packages/chm/chmpkg.lpk
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="2">
+  <Package Version="3">
     <Name Value="chmpkg"/>
     <CompilerOptions>
       <Version Value="5"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <CodeGeneration>
         <Generate Value="Faster"/>
@@ -14,6 +14,8 @@
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
+    <Description Value="Units for reading chm files. If you are using a version of FPC >= 2.3.1 you may need to remove the dependancy of this package since FPC >= 2.3.1 contains these units,
+"/>
     <Version Minor="1"/>
     <Files Count="3">
       <Item1>
@@ -32,11 +34,11 @@
     <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="2">
       <Item1>
-        <PackageName Value="LCL"/>
-      </Item1>
-      <Item2>
         <PackageName Value="FCL"/>
         <MinVersion Major="1" Valid="True"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="LCL"/>
       </Item2>
     </RequiredPkgs>
     <UsageOptions>