Browse Source

* Patch from Martok to fix compilation using build project (Bug ID 32322)

git-svn-id: trunk@37046 -
michael 8 years ago
parent
commit
164778b020
3 changed files with 15 additions and 16 deletions
  1. 2 2
      .gitattributes
  2. 12 13
      packages/fcl-xml/buildfclxml.lpi
  3. 1 1
      packages/fcl-xml/buildfclxml.pp

+ 2 - 2
.gitattributes

@@ -3425,8 +3425,8 @@ packages/fcl-web/tests/uhpacktest1.pas svneol=native#text/plain
 packages/fcl-xml/Makefile svneol=native#text/plain
 packages/fcl-xml/Makefile.fpc svneol=native#text/plain
 packages/fcl-xml/Makefile.fpc.fpcmake svneol=native#text/plain
-packages/fcl-xml/buildfcl-xml.lpi svneol=native#text/plain
-packages/fcl-xml/buildfcl-xml.pp svneol=native#text/plain
+packages/fcl-xml/buildfclxml.lpi svneol=native#text/plain
+packages/fcl-xml/buildfclxml.pp svneol=native#text/plain
 packages/fcl-xml/fpmake.pp svneol=native#text/plain
 packages/fcl-xml/src/README.txt svneol=native#text/plain
 packages/fcl-xml/src/dom.pp svneol=native#text/plain

+ 12 - 13
packages/fcl-xml/buildfcl-xml.lpi → packages/fcl-xml/buildfclxml.lpi

@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="10"/>
     <General>
       <Flags>
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
@@ -12,12 +12,11 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
       <Title Value="buildrtl"/>
     </General>
-    <VersionInfo>
-      <ProjectVersion Value=""/>
-    </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -32,30 +31,30 @@
     </RunParams>
     <Units Count="1">
       <Unit0>
-        <Filename Value="buildfcl-xml.pp"/>
+        <Filename Value="buildfclxml.pp"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="buildrtl"/>
       </Unit0>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <SearchPaths>
-      <IncludeFiles Value="src/"/>
-      <OtherUnitFiles Value="src/"/>
+      <IncludeFiles Value="src"/>
+      <OtherUnitFiles Value="src"/>
       <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <Style Value="2"/>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
     </Parsing>
     <Other>
       <Verbosity>
         <ShowNotes Value="False"/>
         <ShowHints Value="False"/>
       </Verbosity>
-      <CompilerPath Value="$(CompPath)"/>
       <ExecuteBefore>
-        <Command Value="cmd.exe /c &quot;if not exist units/$(TargetCPU)-$(TargetOS) mkdir units/$(TargetCPU)-$(TargetOS)&quot;"/>
         <ShowAllMessages Value="True"/>
       </ExecuteBefore>
     </Other>

+ 1 - 1
packages/fcl-xml/buildfcl-xml.pp → packages/fcl-xml/buildfclxml.pp

@@ -6,7 +6,7 @@ unit buildfclxml;
     uses
       htmldefs, sax, xmlutils, dom, sax_html, dom_html, xmlcfg, xmlread,
       xmlstreaming, xmlwrite, xhtml, htmwrite, xpath, htmlelements, htmlwriter,
-      xmlconf, sax_xml, xmliconv;
+      xmlconf, sax_xml;
 
   implementation