瀏覽代碼

* mode objfpc added
* remove old fpmake

git-svn-id: trunk@9910 -

peter 17 年之前
父節點
當前提交
e338befa21

+ 0 - 2
.gitattributes

@@ -4229,8 +4229,6 @@ packages/fcl-xml/Makefile.fpc svneol=native#text/plain
 packages/fcl-xml/src/README -text
 packages/fcl-xml/src/README -text
 packages/fcl-xml/src/dom.pp svneol=native#text/plain
 packages/fcl-xml/src/dom.pp svneol=native#text/plain
 packages/fcl-xml/src/dom_html.pp svneol=native#text/plain
 packages/fcl-xml/src/dom_html.pp svneol=native#text/plain
-packages/fcl-xml/src/fpmake.inc svneol=native#text/plain
-packages/fcl-xml/src/fpmake.pp svneol=native#text/plain
 packages/fcl-xml/src/htmldefs.pp svneol=native#text/plain
 packages/fcl-xml/src/htmldefs.pp svneol=native#text/plain
 packages/fcl-xml/src/htmlelements.pp svneol=native#text/plain
 packages/fcl-xml/src/htmlelements.pp svneol=native#text/plain
 packages/fcl-xml/src/htmlwriter.pp svneol=native#text/plain
 packages/fcl-xml/src/htmlwriter.pp svneol=native#text/plain

+ 2 - 0
packages/fcl-xml/src/dom_html.pp

@@ -17,6 +17,8 @@
 { Please note that this is a very early version, most properties and methods
 { Please note that this is a very early version, most properties and methods
   are not implemented yet. }
   are not implemented yet. }
 
 
+{$mode objfpc}
+{$H+}
 
 
 unit DOM_HTML;
 unit DOM_HTML;
 
 

+ 0 - 20
packages/fcl-xml/src/fpmake.inc

@@ -1,20 +0,0 @@
-{ Make XML directory and all subdirectories }
-{ FULLFCL will be defined if included from main FCL directory }
-
-Targets.ResetDefaults;
-Targets.DefaultDir:='xml';
-T:=Targets.AddUnit('sax');
-T.ResourceStrings:=True;
-T:=Targets.AddUnit('dom');
-T:=Targets.AddUnit('sax_html');
-T:=Targets.AddUnit('dom_html');
-T:=Targets.AddUnit('xmlcfg');
-T:=Targets.AddUnit('xmlread');
-T:=Targets.AddUnit('xmlstreaming');
-T:=Targets.AddUnit('xmlwrite');
-T:=Targets.AddUnit('xhtml');
-T:=Targets.AddUnit('htmldefs');
-T:=Targets.AddUnit('htmwrite');
-T:=Targets.AddUnit('xpath');
-T:=Targets.AddUnit('htmlelements');
-T:=Targets.AddUnit('htmlwriter');

+ 0 - 20
packages/fcl-xml/src/fpmake.pp

@@ -1,20 +0,0 @@
-{$mode objfpc}
-{$H+}
-program fpmake;
-
-uses fpmkunit;
-
-Var
-  T : TTarget;
-   
-begin
-  ChangeDir('..');
-  With Installer do 
-    begin
-    {$i ../fclmake.inc}
-    {$i fpmake.inc}
-    EndPackage;
-    Run;
-    end;
-end.
-

+ 1 - 7
packages/fcl-xml/src/sax.pp

@@ -17,13 +17,7 @@
 
 
 unit SAX;
 unit SAX;
 
 
-{ $DEFINE UseDynArrays}
-
-{ $IFDEF UseDynArrays}
-  {$MODE objfpc}
-{ $ELSE}
-  { $MODE Delphi}
-{ $ENDIF}
+{$MODE objfpc}
 {$H+}
 {$H+}
 
 
 
 

+ 2 - 0
packages/fcl-xml/src/sax_html.pp

@@ -24,6 +24,8 @@
   * Entity references in attribute values don't get parsed.
   * Entity references in attribute values don't get parsed.
 }
 }
 
 
+{$mode objfpc}
+{$H+}
 
 
 unit SAX_HTML;
 unit SAX_HTML;
 
 

+ 3 - 2
packages/fcl-xml/src/sax_xml.pp

@@ -1,5 +1,3 @@
-{$mode objfpc}
-{$h+}
 {
 {
     This file is part of the Free Component Library
     This file is part of the Free Component Library
     Copyright (c) 2006 by Michael Van Canneyt.
     Copyright (c) 2006 by Michael Van Canneyt.
@@ -16,6 +14,9 @@
 
 
  **********************************************************************}
  **********************************************************************}
 
 
+{$mode objfpc}
+{$h+}
+
 unit SAX_XML;
 unit SAX_XML;
 
 
 interface
 interface

+ 3 - 0
packages/fcl-xml/src/xmlutils.pp

@@ -14,6 +14,9 @@
  **********************************************************************}
  **********************************************************************}
 unit xmlutils;
 unit xmlutils;
 
 
+{$mode objfpc}
+{$H+}
+
 interface
 interface
 
 
 uses
 uses

+ 0 - 4
packages/fcl-xml/src/xmlwrite.pp

@@ -17,12 +17,8 @@
 
 
 unit XMLWrite;
 unit XMLWrite;
 
 
-{$ifdef fpc}
 {$MODE objfpc}
 {$MODE objfpc}
 {$H+}
 {$H+}
-{/$DEFINE HAS_INLINE}
-{$INLINE OFF}
-{$endif}
 
 
 interface
 interface