* Improve compilation experience under 3.0.4

git-svn-id: trunk@61215 -

.gitattributes

@@ -4635,6 +4635,7 @@ components/sqldbrest/demo/restmodule/demorestmodule.lpr svneol=native#text/plain
 components/sqldbrest/demo/restmodule/demorestmodule.res -text
 components/sqldbrest/demo/restmodule/dmmyrest.lfm svneol=native#text/plain
 components/sqldbrest/demo/restmodule/dmmyrest.pp svneol=native#text/plain
+components/sqldbrest/design/build304.pp svneol=native#text/plain
 components/sqldbrest/design/dlgrestfieldoptions.lfm svneol=native#text/plain
 components/sqldbrest/design/dlgrestfieldoptions.pp svneol=native#text/plain
 components/sqldbrest/design/dlgsqldbrestconnection.lfm svneol=native#text/plain

components/sqldbrest/design/build304.pp

@@ -0,0 +1,24 @@
+unit build304;
+
+{ ---------------------------------------------------------------------
+  This unit is only needed to build with FPC 3.0.4:
+
+  It makes sure that all units of the sqldbrestbridge in ../src are compiled.
+  Otherwise, the ../src directory must be added to lazsqldbrest as well,
+  which will lead to duplicate units warnings.
+
+  As soon as FPC 3.2.0 is released, this unit can be removed.
+
+  Michael.
+  ---------------------------------------------------------------------}
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  sqldbrestcsv ,sqldbrestxml, sqldbrestcds, sqldbrestado,sqldbrestmodule;
+
+implementation
+
+end.
+

components/sqldbrest/design/sqldbrestschemadesigner.lpk

@@ -10,7 +10,7 @@
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
-    <Files Count="21">
+    <Files Count="22">
       <Item1>
         <Filename Value="dlgrestfieldoptions.lfm"/>
         <Type Value="LFM"/>
@@ -95,6 +95,10 @@
         <Filename Value="sqldbschemaedittools.lfm"/>
         <Type Value="LFM"/>
       </Item21>
+      <Item22>
+        <Filename Value="build304.pp"/>
+        <UnitName Value="build304"/>
+      </Item22>
     </Files>
     <RequiredPkgs Count="3">
       <Item1>

components/sqldbrest/design/sqldbrestschemadesigner.pas

@@ -10,7 +10,7 @@ interface
 uses
   dlgrestfieldoptions, dlgsqldbrestconnection, fraconnections, fraschematableseditor, frasqldbfullrestschemaaditor, 
   frasqldbrestfieldedit, frasqldbrestresourceedit, fraSQLDBRestSchemaEditor, frmeditframedialog, sqldbschemaedittools, 
-  frasqldbresourcefields, LazarusPackageIntf;
+  frasqldbresourcefields, build304, LazarusPackageIntf;
 
 implementation
 

components/sqldbrest/lazsqldbrest.lpk

@@ -6,7 +6,6 @@
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
-        <OtherUnitFiles Value="src"/>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>