papki -> fsif

igagis · igagis · commit e50baf921688 · 2025-11-02T23:22:20.000+02:00
diff --git a/build/android/cssom-$(version).pom.in b/build/android/cssom-$(version).pom.in
@@ -16,7 +16,7 @@
 	  </dependency>
 	  <dependency>
 		  <groupId>io.github.cppfw</groupId>
-		  <artifactId>papki</artifactId>
+		  <artifactId>fsif</artifactId>
 		  <version>[1.0.93,)</version>
 		  <type>aar</type>
 		  <scope>compile</scope>
diff --git a/build/android/cssom/build.gradle b/build/android/cssom/build.gradle
@@ -50,7 +50,7 @@ repositories {
 }
 dependencies {
     implementation 'io.github.cppfw:utki:+'
-    implementation 'io.github.cppfw:papki:+'
+    implementation 'io.github.cppfw:fsif:+'
 }
 
 // copy and rename release AAR to unified name
diff --git a/build/archlinux/PKGBUILD b/build/archlinux/PKGBUILD
@@ -10,7 +10,7 @@ url="http://github.com/cppfw/${pkgname}"
 license=('MIT')
 groups=()
 
-depends=("utki" "papki")
+depends=("utki" "fsif")
 
 makedepends=(
 	'myci'
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
@@ -23,5 +23,5 @@ myci_declare_library(${name}
         ../../src/${name}
     DEPENDENCIES
         utki
-        papki
+        fsif
 )
diff --git a/build/conan/conanfile.py b/build/conan/conanfile.py
@@ -18,7 +18,7 @@ class CssomConan(ConanFile):
 	generators = "AutotoolsDeps" # this will set CXXFLAGS etc. env vars
 
 	def requirements(self):
-		self.requires("papki/[>=0.0.0]@cppfw/main", transitive_headers=True, transitive_libs=True)
+		self.requires("fsif/[>=0.0.0]@cppfw/main", transitive_headers=True, transitive_libs=True)
 
 	def build_requirements(self):
 		self.tool_requires("prorab/[>=2.0.27]@cppfw/main")
diff --git a/build/debian/control.in b/build/debian/control.in
@@ -11,7 +11,7 @@ Build-Depends:
 		clang-format,
 		libc6-dev,
 		libutki-dev (>= 1.1.122),
-		libpapki-dev (>= 1.0.93),
+		libfsif-dev (>= 1.0.93),
 		libclargs-dev (>= 0.2.19),
 		libtst-dev (>= 0.3.2)
 Build-Depends-Indep: doxygen
@@ -43,7 +43,7 @@ Depends:
 	libcssom-dbg$(soname) (= ${binary:Version}),
 	${misc:Depends},
 	libutki-dev,
-	libpapki-dev
+	libfsif-dev
 Suggests: libcssom-doc
 Description: CSS document object model library.
 	CSS document object model cross-platform C++ library.
diff --git a/build/homebrew/libcssom.rb.in b/build/homebrew/libcssom.rb.in
@@ -10,7 +10,7 @@ class Libcssom < Formula
   depends_on "pkg-config" => :build
   depends_on "libtst" => :build
   depends_on "libclargs" => :build
-  depends_on "libpapki"
+  depends_on "libfsif"
   depends_on "libutki"
 
   # use gmake here because otherwise homebrew uses default Mac's make which is of too old version 3.81
diff --git a/build/msys2/PKGBUILD.in b/build/msys2/PKGBUILD.in
@@ -29,7 +29,7 @@ url="http://github.com/cppfw/${packageName}"
 license=('MIT')
 groups=()
 
-depends=("${pkgPrefix}utki" "${pkgPrefix}papki")
+depends=("${pkgPrefix}utki" "${pkgPrefix}fsif")
 
 makedepends=(
 	'myci'
diff --git a/build/vcpkg/test/vcpkg-configuration.json b/build/vcpkg/test/vcpkg-configuration.json
@@ -13,7 +13,7 @@
         "packages": [
           "myci",
           "utki",
-          "papki"
+          "fsif"
         ]
       }
     ],
diff --git a/build/vcpkg/vcpkg.json.in b/build/vcpkg/vcpkg.json.in
@@ -18,6 +18,6 @@
         "host" : false
       },
       "utki",
-      "papki"
+      "fsif"
     ]
   }
diff --git a/src/cssom/om.cpp b/src/cssom/om.cpp
@@ -188,7 +188,7 @@ class om_parser : public parser
 } // namespace
 
 sheet cssom::read(
-	const papki::file& fi,
+	const fsif::file& fi,
 	std::function<uint32_t(std::string_view)> property_name_to_id,
 	std::function<std::unique_ptr<cssom::property_value_base>(uint32_t, std::string_view)> parse_property
 )
@@ -203,7 +203,7 @@ sheet cssom::read(
 	om_parser p(std::move(property_name_to_id), std::move(parse_property));
 
 	{
-		papki::file::guard file_guard(fi);
+		fsif::file::guard file_guard(fi);
 
 		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
 		std::array<uint8_t, size_t(utki::kilobyte) * 4> buf;
@@ -341,7 +341,7 @@ std::vector<std::pair<std::string, std::shared_ptr<std::string>>> to_string_styl
 } // namespace
 
 void sheet::write(
-	papki::file& fi,
+	fsif::file& fi,
 	const std::function<std::string(uint32_t)>& property_id_to_name,
 	const std::function<std::string(uint32_t, const property_value_base&)>& property_value_to_string,
 	std::string_view indent
@@ -353,7 +353,7 @@ void sheet::write(
 		property_value_to_string
 	);
 
-	papki::file::guard file_guard(fi, papki::mode::create);
+	fsif::file::guard file_guard(fi, fsif::mode::create);
 
 	for (auto i = styles_to_save.begin(); i != styles_to_save.end(); ++i) {
 		// Go through selector chains which refer to the same property set (selectors in the same selector group).
diff --git a/src/cssom/om.hpp b/src/cssom/om.hpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <map>
 
-#include <papki/file.hpp>
+#include <fsif/file.hpp>
 #include <utki/destructable.hpp>
 #include <utki/span.hpp>
 
@@ -154,7 +154,7 @@ struct sheet {
 	std::vector<style> styles{};
 
 	void write(
-		papki::file& fi,
+		fsif::file& fi,
 		const std::function<std::string(uint32_t)>& property_id_to_name,
 		const std::function<std::string(uint32_t, const property_value_base&)>& property_value_to_string,
 		std::string_view indent = {}
@@ -189,7 +189,7 @@ struct sheet {
 };
 
 sheet read(
-	const papki::file& fi,
+	const fsif::file& fi,
 	std::function<uint32_t(std::string_view)> property_name_to_id,
 	std::function<std::unique_ptr<property_value_base>(uint32_t, std::string_view)> parse_property_value
 );
diff --git a/src/makefile b/src/makefile
@@ -13,7 +13,7 @@ this_soname := $(shell cat $(d)soname.txt)
 
 this_srcs := $(call prorab-src-dir, $(this_src_dir))
 
-this_ldlibs += -l papki$(this_dbg)
+this_ldlibs += -l fsif$(this_dbg)
 this_ldlibs += -l utki$(this_dbg)
 
 $(eval $(prorab-build-lib))
diff --git a/tests/harness/makefile b/tests/harness/makefile
@@ -9,7 +9,7 @@ this_soname := 0
 
 this_srcs += $(call prorab-src-dir, .)
 
-this_ldlibs += -l papki$(this_dbg)
+this_ldlibs += -l fsif$(this_dbg)
 this_ldlibs += ../../src/out/$(c)/libcssom$(this_dbg)$(dot_so)
 
 this_no_install := true
diff --git a/tests/harness/om.cpp b/tests/harness/om.cpp
@@ -1,13 +1,13 @@
 #include "om.hpp"
 #include "properties.hpp"
 
-#include <papki/span_file.hpp>
+#include <fsif/span_file.hpp>
 
 cssom::sheet read_css(const char* css){
 	auto pntim = &property_name_to_id_map;
 
 	return cssom::read(
-			papki::span_file(utki::make_span(css)),
+			fsif::span_file(utki::make_span(css)),
 			[pntim](std::string_view name) -> uint32_t{
 				auto i = pntim->find(name);
 				if(i == pntim->end()){
diff --git a/tests/unit/makefile b/tests/unit/makefile
@@ -7,7 +7,7 @@ this_name := tests
 
 this_srcs += $(call prorab-src-dir, .)
 
-this_ldlibs += -l papki$(this_dbg)
+this_ldlibs += -l fsif$(this_dbg)
 this_ldlibs += -l utki$(this_dbg)
 this_ldlibs += -l tst$(this_dbg)
 
diff --git a/tests/unit/om.cpp b/tests/unit/om.cpp
@@ -1,7 +1,7 @@
 #include <tst/set.hpp>
 #include <tst/check.hpp>
 
-#include <papki/span_file.hpp>
+#include <fsif/span_file.hpp>
 
 #include <cssom/om.hpp>
 
diff --git a/tests/unit/samples.cpp b/tests/unit/samples.cpp
@@ -6,8 +6,8 @@
 #include <utki/util.hpp>
 #include <utki/string.hpp>
 
-#include <papki/fs_file.hpp>
-#include <papki/vector_file.hpp>
+#include <fsif/native_file.hpp>
+#include <fsif/vector_file.hpp>
 
 #include <regex>
 
@@ -24,7 +24,7 @@ const tst::set set("samples", [](tst::suite& suite){
 
     {
 		const std::regex suffix_regex("^.*\\.css$");
-		auto all_files = papki::fs_file(data_dir).list_dir();
+		auto all_files = fsif::native_file(data_dir).list_dir();
 
 		std::copy_if(
 				all_files.begin(),
@@ -43,7 +43,7 @@ const tst::set set("samples", [](tst::suite& suite){
             auto in_file_name = data_dir + p;
 
             auto doc = cssom::read(
-                    papki::fs_file(in_file_name),
+                    fsif::native_file(in_file_name),
                     [](std::string_view name) -> uint32_t{
                         auto i = property_name_to_id_map.find(name);
                         if(i == property_name_to_id_map.end()){
@@ -58,7 +58,7 @@ const tst::set set("samples", [](tst::suite& suite){
             
             auto pitnm = utki::flip_map(property_name_to_id_map);
 
-            papki::vector_file out_file;
+            fsif::vector_file out_file;
 
             doc.write(
                     out_file,
@@ -80,7 +80,7 @@ const tst::set set("samples", [](tst::suite& suite){
 
             decltype(out_data) cmp_data;
 
-            papki::fs_file cmp_file(in_file_name + ".cmp");
+            fsif::native_file cmp_file(in_file_name + ".cmp");
 
             try{
                 cmp_data = cmp_file.load();
@@ -90,10 +90,10 @@ const tst::set set("samples", [](tst::suite& suite){
 
             if(out_data != cmp_data){
                 {
-                    papki::fs_file failed_file(data_dir + p + ".out");
-                    papki::file::guard file_guard(
+                    fsif::native_file failed_file(data_dir + p + ".out");
+                    fsif::file::guard file_guard(
                         failed_file,//
-                        papki::mode::create
+                        fsif::mode::create
                     );
                     failed_file.write(out_data);
                 }
diff --git a/tests/unit/selectors.cpp b/tests/unit/selectors.cpp
@@ -1,7 +1,7 @@
 #include <tst/set.hpp>
 #include <tst/check.hpp>
 
-#include <papki/span_file.hpp>
+#include <fsif/span_file.hpp>
 
 #include "../harness/properties.hpp"
 #include "../harness/om.hpp"

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ repositories {`
`50`	`50`	`}`
`51`	`51`	`dependencies {`
`52`	`52`	`implementation 'io.github.cppfw:utki:+'`
`53`		`- implementation 'io.github.cppfw:papki:+'`
	`53`	`+ implementation 'io.github.cppfw:fsif:+'`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// copy and rename release AAR to unified name`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ myci_declare_library(${name}`
`23`	`23`	`../../src/${name}`
`24`	`24`	`DEPENDENCIES`
`25`	`25`	`utki`
`26`		`- papki`
	`26`	`+ fsif`
`27`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"packages": [`
`14`	`14`	`"myci",`
`15`	`15`	`"utki",`
`16`		`- "papki"`
	`16`	`+ "fsif"`
`17`	`17`	`]`
`18`	`18`	`}`
`19`	`19`	`],`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`	`"host" : false`
`19`	`19`	`},`
`20`	`20`	`"utki",`
`21`		`- "papki"`
	`21`	`+ "fsif"`
`22`	`22`	`]`
`23`	`23`	`}`