From 151a3124e032a91d96c944d08fde6777346ef5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 6 Mar 2023 14:57:57 +0100 Subject: [PATCH] * Dotted filenames for package ncurses --- packages/ncurses/namespaced/Api.NCurses.Form.pp | 3 +++ packages/ncurses/namespaced/Api.NCurses.Menu.pp | 3 +++ packages/ncurses/namespaced/Api.NCurses.Ncrt.pp | 3 +++ packages/ncurses/namespaced/Api.NCurses.Ocrt.pp | 3 +++ packages/ncurses/namespaced/Api.NCurses.Panel.pp | 3 +++ packages/ncurses/namespaced/Api.Ncurses.pp | 3 +++ packages/ncurses/namespaces.lst | 8 ++++++++ packages/ncurses/src/form.pp | 7 +++++++ packages/ncurses/src/menu.pp | 7 +++++++ packages/ncurses/src/ncrt.inc | 4 ++++ packages/ncurses/src/ncrt.pp | 12 ++++++++++++ packages/ncurses/src/ncurses.pp | 7 +++++++ packages/ncurses/src/ocrt.pp | 12 ++++++++++++ packages/ncurses/src/panel.pp | 7 +++++++ 14 files changed, 82 insertions(+) create mode 100644 packages/ncurses/namespaced/Api.NCurses.Form.pp create mode 100644 packages/ncurses/namespaced/Api.NCurses.Menu.pp create mode 100644 packages/ncurses/namespaced/Api.NCurses.Ncrt.pp create mode 100644 packages/ncurses/namespaced/Api.NCurses.Ocrt.pp create mode 100644 packages/ncurses/namespaced/Api.NCurses.Panel.pp create mode 100644 packages/ncurses/namespaced/Api.Ncurses.pp create mode 100644 packages/ncurses/namespaces.lst diff --git a/packages/ncurses/namespaced/Api.NCurses.Form.pp b/packages/ncurses/namespaced/Api.NCurses.Form.pp new file mode 100644 index 0000000000..ddb2be2b87 --- /dev/null +++ b/packages/ncurses/namespaced/Api.NCurses.Form.pp @@ -0,0 +1,3 @@ +unit Api.NCurses.Form; +{$DEFINE FPC_DOTTEDUNITS} +{$i form.pp} diff --git a/packages/ncurses/namespaced/Api.NCurses.Menu.pp b/packages/ncurses/namespaced/Api.NCurses.Menu.pp new file mode 100644 index 0000000000..31758ca11f --- /dev/null +++ b/packages/ncurses/namespaced/Api.NCurses.Menu.pp @@ -0,0 +1,3 @@ +unit Api.NCurses.Menu; +{$DEFINE FPC_DOTTEDUNITS} +{$i menu.pp} diff --git a/packages/ncurses/namespaced/Api.NCurses.Ncrt.pp b/packages/ncurses/namespaced/Api.NCurses.Ncrt.pp new file mode 100644 index 0000000000..d9a0f39e39 --- /dev/null +++ b/packages/ncurses/namespaced/Api.NCurses.Ncrt.pp @@ -0,0 +1,3 @@ +unit Api.NCurses.Ncrt; +{$DEFINE FPC_DOTTEDUNITS} +{$i ncrt.pp} diff --git a/packages/ncurses/namespaced/Api.NCurses.Ocrt.pp b/packages/ncurses/namespaced/Api.NCurses.Ocrt.pp new file mode 100644 index 0000000000..55640cfb9f --- /dev/null +++ b/packages/ncurses/namespaced/Api.NCurses.Ocrt.pp @@ -0,0 +1,3 @@ +unit Api.NCurses.Ocrt; +{$DEFINE FPC_DOTTEDUNITS} +{$i ocrt.pp} diff --git a/packages/ncurses/namespaced/Api.NCurses.Panel.pp b/packages/ncurses/namespaced/Api.NCurses.Panel.pp new file mode 100644 index 0000000000..df7de37935 --- /dev/null +++ b/packages/ncurses/namespaced/Api.NCurses.Panel.pp @@ -0,0 +1,3 @@ +unit Api.NCurses.Panel; +{$DEFINE FPC_DOTTEDUNITS} +{$i panel.pp} diff --git a/packages/ncurses/namespaced/Api.Ncurses.pp b/packages/ncurses/namespaced/Api.Ncurses.pp new file mode 100644 index 0000000000..0f3ff53e11 --- /dev/null +++ b/packages/ncurses/namespaced/Api.Ncurses.pp @@ -0,0 +1,3 @@ +unit Api.Ncurses; +{$DEFINE FPC_DOTTEDUNITS} +{$i ncurses.pp} diff --git a/packages/ncurses/namespaces.lst b/packages/ncurses/namespaces.lst new file mode 100644 index 0000000000..b2bb749f37 --- /dev/null +++ b/packages/ncurses/namespaces.lst @@ -0,0 +1,8 @@ +src/form.pp=namespaced/Api.NCurses.Form.pp +{s*:src/}=namespaced/ +{i+:src/} +src/ocrt.pp=namespaced/Api.NCurses.Ocrt.pp +src/ncurses.pp=namespaced/Api.Ncurses.pp +src/ncrt.pp=namespaced/Api.NCurses.Ncrt.pp +src/menu.pp=namespaced/Api.NCurses.Menu.pp +src/panel.pp=namespaced/Api.NCurses.Panel.pp diff --git a/packages/ncurses/src/form.pp b/packages/ncurses/src/form.pp index b0e6b5aaed..3f29d54a61 100644 --- a/packages/ncurses/src/form.pp +++ b/packages/ncurses/src/form.pp @@ -1,9 +1,16 @@ {$MODE OBJFPC} +{$IFNDEF FPC_DOTTEDUNITS} unit form; +{$ENDIF FPC_DOTTEDUNITS} interface +{$IFDEF FPC_DOTTEDUNITS} +uses + Api.Ncurses, System.CTypes; +{$ELSE FPC_DOTTEDUNITS} uses ncurses, ctypes; +{$ENDIF FPC_DOTTEDUNITS} {$LINKLIB formw} const diff --git a/packages/ncurses/src/menu.pp b/packages/ncurses/src/menu.pp index 4cbd820340..a7121842d2 100644 --- a/packages/ncurses/src/menu.pp +++ b/packages/ncurses/src/menu.pp @@ -1,10 +1,17 @@ {$MODE OBJFPC} +{$IFNDEF FPC_DOTTEDUNITS} unit menu; +{$ENDIF FPC_DOTTEDUNITS} interface +{$IFDEF FPC_DOTTEDUNITS} +uses + Api.Ncurses; +{$ELSE FPC_DOTTEDUNITS} uses ncurses; +{$ENDIF FPC_DOTTEDUNITS} {$LINKLIB menuw} {$PACKRECORDS C} diff --git a/packages/ncurses/src/ncrt.inc b/packages/ncurses/src/ncrt.inc index 32e89b1bfa..748faa981c 100644 --- a/packages/ncurses/src/ncrt.inc +++ b/packages/ncurses/src/ncrt.inc @@ -192,7 +192,11 @@ Const Implementation +{$IFDEF FPC_DOTTEDUNITS} +uses System.Strings; +{$ELSE FPC_DOTTEDUNITS} uses strings; +{$ENDIF FPC_DOTTEDUNITS} Const { standard file descriptors } diff --git a/packages/ncurses/src/ncrt.pp b/packages/ncurses/src/ncrt.pp index e775a05555..05c5e18655 100644 --- a/packages/ncurses/src/ncrt.pp +++ b/packages/ncurses/src/ncrt.pp @@ -1,4 +1,6 @@ +{$IFNDEF FPC_DOTTEDUNITS} Unit nCrt; +{$ENDIF FPC_DOTTEDUNITS} {--------------------------------------------------------------------------- CncWare (c) Copyright 1999-2000 @@ -24,6 +26,15 @@ Unit nCrt; } Interface +{$IFDEF FPC_DOTTEDUNITS} +Uses +{$ifdef Unix} + UnixApi.Base, + UnixApi.TermIO, +{$endif} + Api.Ncurses, + TP.DOS; {TP.DOS needed for TextRec} +{$ELSE FPC_DOTTEDUNITS} Uses {$ifdef Unix} baseunix, @@ -31,6 +42,7 @@ Uses {$endif} ncurses, dos; {dos needed for TextRec} +{$ENDIF FPC_DOTTEDUNITS} {$i ncrt.inc} diff --git a/packages/ncurses/src/ncurses.pp b/packages/ncurses/src/ncurses.pp index fc9fad2bfe..ec64461249 100644 --- a/packages/ncurses/src/ncurses.pp +++ b/packages/ncurses/src/ncurses.pp @@ -32,11 +32,18 @@ {$MODE OBJFPC} +{$IFNDEF FPC_DOTTEDUNITS} unit ncurses; +{$ENDIF FPC_DOTTEDUNITS} interface +{$IFDEF FPC_DOTTEDUNITS} +uses + UnixApi.Types; +{$ELSE FPC_DOTTEDUNITS} uses unixtype; +{$ENDIF FPC_DOTTEDUNITS} {$PACKRECORDS C} {$LINKLIB ncursesw} diff --git a/packages/ncurses/src/ocrt.pp b/packages/ncurses/src/ocrt.pp index 5a35b46240..bf7d2ce656 100644 --- a/packages/ncurses/src/ocrt.pp +++ b/packages/ncurses/src/ocrt.pp @@ -1,4 +1,6 @@ +{$IFNDEF FPC_DOTTEDUNITS} Unit oCrt; +{$ENDIF FPC_DOTTEDUNITS} {--------------------------------------------------------------------------- CncWare (c) Copyright 1999-2000 @@ -152,6 +154,15 @@ Unit oCrt; } Interface +{$IFDEF FPC_DOTTEDUNITS} +Uses +{$ifdef Unix} + UnixApi.Base, + UnixApi.TermIO, +{$endif} + Api.Ncurses,Api.NCurses.Panel,Api.NCurses.Menu, + TP.DOS; {TP.DOS needed for TextRec} +{$ELSE FPC_DOTTEDUNITS} Uses {$ifdef unix} baseunix, @@ -159,6 +170,7 @@ Uses {$endif} ncurses,panel,menu, dos; {dos needed for TextRec} +{$ENDIF FPC_DOTTEDUNITS} Const diff --git a/packages/ncurses/src/panel.pp b/packages/ncurses/src/panel.pp index 91c7998023..a470d9f6e1 100644 --- a/packages/ncurses/src/panel.pp +++ b/packages/ncurses/src/panel.pp @@ -1,9 +1,16 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit panel; +{$ENDIF FPC_DOTTEDUNITS} interface +{$IFDEF FPC_DOTTEDUNITS} +uses + Api.Ncurses; +{$ELSE FPC_DOTTEDUNITS} uses ncurses; +{$ENDIF FPC_DOTTEDUNITS} {$PACKRECORDS C}