From 22193d35461348ae0afaa6eb2ee320d18691458d Mon Sep 17 00:00:00 2001
From: inoussa <inoussa@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 3 Jan 2015 13:37:43 +0000
Subject: [PATCH] Improve packages files (Thanks Juha)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3863 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 wst/trunk/ide/lazarus/wst_design.lpk  | 18 ++++--------------
 wst/trunk/ide/lazarus/wst_indy.lpk    | 13 ++++++-------
 wst/trunk/ide/lazarus/wst_synapse.lpk | 15 ++++++---------
 3 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/wst/trunk/ide/lazarus/wst_design.lpk b/wst/trunk/ide/lazarus/wst_design.lpk
index 32e6ec1e0..0dde4c6df 100644
--- a/wst/trunk/ide/lazarus/wst_design.lpk
+++ b/wst/trunk/ide/lazarus/wst_design.lpk
@@ -3,6 +3,7 @@
   <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="wst_design"/>
+    <Type Value="DesignTime"/>
     <AddToProjectUsesSection Value="True"/>
     <Author Value="Inoussa OUEDRAOGO"/>
     <CompilerOptions>
@@ -16,14 +17,11 @@
       <Parsing>
         <SyntaxOptions>
           <CStyleOperator Value="False"/>
-          <UseAnsiStrings Value="True"/>
         </SyntaxOptions>
       </Parsing>
       <Other>
         <CustomOptions Value="-dWST_IDE
--dWST_HANDLE_DOC
-"/>
-        <CompilerPath Value="$(CompPath)"/>
+-dWST_HANDLE_DOC"/>
       </Other>
     </CompilerOptions>
     <Description Value="Web Services Toolkit Lazarus IDE design time package
@@ -60,8 +58,7 @@
         <UnitName Value="uabout"/>
       </Item7>
     </Files>
-    <Type Value="DesignTime"/>
-    <RequiredPkgs Count="5">
+    <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="wst_core"/>
       </Item1>
@@ -69,15 +66,8 @@
         <PackageName Value="SynEdit"/>
       </Item2>
       <Item3>
-        <PackageName Value="LCL"/>
-      </Item3>
-      <Item4>
         <PackageName Value="IDEIntf"/>
-      </Item4>
-      <Item5>
-        <PackageName Value="FCL"/>
-        <MinVersion Major="1" Valid="True"/>
-      </Item5>
+      </Item3>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>
diff --git a/wst/trunk/ide/lazarus/wst_indy.lpk b/wst/trunk/ide/lazarus/wst_indy.lpk
index ff1ff4b28..dbebd08f1 100644
--- a/wst/trunk/ide/lazarus/wst_indy.lpk
+++ b/wst/trunk/ide/lazarus/wst_indy.lpk
@@ -1,14 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="wst_indy"/>
+    <Type Value="RunAndDesignTime"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="Inoussa Ouedraogo"/>
     <CompilerOptions>
-      <Version Value="9"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="..\..;$(LazarusDir)\others_package\indy-10.2.0.3\fpc"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Parsing>
@@ -19,7 +20,6 @@
       </Parsing>
       <Other>
         <CustomOptions Value="-dINDY_10"/>
-        <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
     <Description Value="WebServices Toolkit  Indy transport layer
@@ -45,7 +45,6 @@
         <UnitName Value="indy_tcp_server"/>
       </Item4>
     </Files>
-    <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="indylaz"/>
@@ -59,7 +58,7 @@
       </Item3>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\"/>
+      <UnitPath Value="$(PkgOutDir)"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
diff --git a/wst/trunk/ide/lazarus/wst_synapse.lpk b/wst/trunk/ide/lazarus/wst_synapse.lpk
index 82277cb60..8c8bf82cd 100644
--- a/wst/trunk/ide/lazarus/wst_synapse.lpk
+++ b/wst/trunk/ide/lazarus/wst_synapse.lpk
@@ -1,14 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="wst_synapse"/>
+    <Type Value="RunAndDesignTime"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="Inoussa Ouedraogo"/>
     <CompilerOptions>
-      <Version Value="10"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="..\..;$(LazarusDir)\others_package\synapse"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Parsing>
@@ -17,9 +18,6 @@
           <UseAnsiStrings Value="False"/>
         </SyntaxOptions>
       </Parsing>
-      <Other>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
     </CompilerOptions>
     <Description Value="WebServices Toolkit  Synapse transport layer
 "/>
@@ -40,7 +38,6 @@
         <UnitName Value="synapse_tcp_protocol"/>
       </Item3>
     </Files>
-    <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="2">
       <Item1>
         <PackageName Value="laz_synapse"/>
@@ -50,7 +47,7 @@
       </Item2>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\"/>
+      <UnitPath Value="$(PkgOutDir)"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>