Add examples/ folder, move non-core bits there

The core of composefs today is the `mount.composefs` and `mkcomposefs` tools. Let's move the other stuff into a separate subdirectory to make this clearer. These tools are not installed with `make install` even before this. In the future I'd like to more strongly decouple these examples even more. Signed-off-by: Colin Walters <[email protected]>
containers · Jun 16, 2023 · 9f31696 · 9f31696
1 parent 58f326a
commit 9f31696
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 /Makefile
 libcomposefs/Makefile
 tools/Makefile
+examples/Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache

diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=libcomposefs tools
+SUBDIRS=libcomposefs tools examples
 
 EXTRA_DIST=\
 	composefs.pc.in \

diff --git a/configure.ac b/configure.ac
@@ -206,6 +206,7 @@ AC_CONFIG_FILES([
 Makefile
 libcomposefs/Makefile
 tools/Makefile
+examples/Makefile
 composefs.spec
 composefs.pc
 ])

diff --git a/examples/.gitignore b/examples/.gitignore
@@ -0,0 +1 @@
+composefs-from-json
diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -0,0 +1,28 @@
+noinst_PROGRAMS =
+
+if USE_YAJL
+noinst_PROGRAMS += composefs-from-json
+endif
+
+AM_CFLAGS = $(WARN_CFLAGS) -I$(top_srcdir)/
+
+composefs_from_json_SOURCES = composefs-from-json.c read-file.c read-file.h
+composefs_from_json_LDADD = ../libcomposefs/libcomposefs.la $(LIBS_YAJL) $(LIBCRYPTO_LIBS) $(LIBS_SECCOMP)
+
+TEST_ASSETS_SMALL = \
+	config.json.gz config-with-hard-link.json.gz
+
+TEST_ASSETS = ${TEST_ASSETS_SMALL} \
+	cs9-x86_64-developer.json.gz cs9-x86_64-minimal.json.gz	\
+	f36-x86_64-silverblue.json.gz
+
+if ENABLE_VALGRIND
+WRITER_JSON_PREFIX=libtool --mode=execute ${VALGRIND} --quiet --leak-check=yes --error-exitcode=42
+endif
+
+EXTRA_DIST = test-checksums.sh $(patsubst %,test-assets/%,${TEST_ASSETS_SMALL}) $(patsubst %,test-assets/%.sha256_erofs,${TEST_ASSETS_SMALL})
+
+check-checksums:
+	$(srcdir)/test-checksums.sh "${WRITER_JSON_PREFIX} $(builddir)/composefs-from-json" "$(srcdir)/test-assets" "${TEST_ASSETS}"
+
+check: check-checksums
diff --git a/tools/composefs-from-json.c → examples/composefs-from-json.c b/tools/composefs-from-json.c → examples/composefs-from-json.c
diff --git a/tools/ostree-convert-commit.py → examples/ostree-convert-commit.py b/tools/ostree-convert-commit.py → examples/ostree-convert-commit.py
diff --git a/tools/read-file.c → examples/read-file.c b/tools/read-file.c → examples/read-file.c
diff --git a/tools/read-file.h → examples/read-file.h b/tools/read-file.h → examples/read-file.h
diff --git a/...test-assets/config-with-hard-link.json.gz → ...test-assets/config-with-hard-link.json.gz b/...test-assets/config-with-hard-link.json.gz → ...test-assets/config-with-hard-link.json.gz
diff --git a/...onfig-with-hard-link.json.gz.sha256_erofs → ...onfig-with-hard-link.json.gz.sha256_erofs b/...onfig-with-hard-link.json.gz.sha256_erofs → ...onfig-with-hard-link.json.gz.sha256_erofs
diff --git a/tools/test-assets/config.json.gz → examples/test-assets/config.json.gz b/tools/test-assets/config.json.gz → examples/test-assets/config.json.gz
diff --git a/...s/test-assets/config.json.gz.sha256_erofs → ...s/test-assets/config.json.gz.sha256_erofs b/...s/test-assets/config.json.gz.sha256_erofs → ...s/test-assets/config.json.gz.sha256_erofs
diff --git a/.../test-assets/cs9-x86_64-developer.json.gz → .../test-assets/cs9-x86_64-developer.json.gz b/.../test-assets/cs9-x86_64-developer.json.gz → .../test-assets/cs9-x86_64-developer.json.gz
diff --git a/...cs9-x86_64-developer.json.gz.sha256_erofs → ...cs9-x86_64-developer.json.gz.sha256_erofs b/...cs9-x86_64-developer.json.gz.sha256_erofs → ...cs9-x86_64-developer.json.gz.sha256_erofs
diff --git a/tools/test-assets/cs9-x86_64-minimal.json.gz → ...es/test-assets/cs9-x86_64-minimal.json.gz b/tools/test-assets/cs9-x86_64-minimal.json.gz → ...es/test-assets/cs9-x86_64-minimal.json.gz
diff --git a/...s/cs9-x86_64-minimal.json.gz.sha256_erofs → ...s/cs9-x86_64-minimal.json.gz.sha256_erofs b/...s/cs9-x86_64-minimal.json.gz.sha256_erofs → ...s/cs9-x86_64-minimal.json.gz.sha256_erofs
diff --git a/...test-assets/f36-x86_64-silverblue.json.gz → ...test-assets/f36-x86_64-silverblue.json.gz b/...test-assets/f36-x86_64-silverblue.json.gz → ...test-assets/f36-x86_64-silverblue.json.gz
diff --git a/...36-x86_64-silverblue.json.gz.sha256_erofs → ...36-x86_64-silverblue.json.gz.sha256_erofs b/...36-x86_64-silverblue.json.gz.sha256_erofs → ...36-x86_64-silverblue.json.gz.sha256_erofs
diff --git a/tools/test-checksums.sh → examples/test-checksums.sh b/tools/test-checksums.sh → examples/test-checksums.sh
diff --git a/tools/.gitignore b/tools/.gitignore
@@ -2,3 +2,4 @@ dump
 mkcomposefs
 writer-json
 mount.composefs
+composefs-fuse
diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -2,10 +2,6 @@ bin_PROGRAMS = mkcomposefs
 sbin_PROGRAMS = mount.composefs
 noinst_PROGRAMS =
 
-if USE_YAJL
-noinst_PROGRAMS += composefs-from-json
-endif
-
 if USE_FUSE3
 noinst_PROGRAMS += composefs-fuse
 endif
@@ -18,27 +14,6 @@ mkcomposefs_LDADD =  ../libcomposefs/libcomposefs.la $(LIBCRYPTO_LIBS)
 mount_composefs_SOURCES = mountcomposefs.c
 mount_composefs_LDADD = ../libcomposefs/libcomposefs.la $(LIBCRYPTO_LIBS)
 
-composefs_from_json_SOURCES = composefs-from-json.c read-file.c read-file.h
-composefs_from_json_LDADD = ../libcomposefs/libcomposefs.la $(LIBS_YAJL) $(LIBCRYPTO_LIBS) $(LIBS_SECCOMP)
-
 composefs_fuse_SOURCES = cfs-fuse.c
 composefs_fuse_LDADD =   ../libcomposefs/libcomposefs.la $(FUSE3_LIBS)
 composefs_fuse_CFLAGS = $(FUSE3_CFLAGS)
-
-TEST_ASSETS_SMALL = \
-	config.json.gz config-with-hard-link.json.gz
-
-TEST_ASSETS = ${TEST_ASSETS_SMALL} \
-	cs9-x86_64-developer.json.gz cs9-x86_64-minimal.json.gz	\
-	f36-x86_64-silverblue.json.gz
-
-if ENABLE_VALGRIND
-WRITER_JSON_PREFIX=libtool --mode=execute ${VALGRIND} --quiet --leak-check=yes --error-exitcode=42
-endif
-
-EXTRA_DIST = test-checksums.sh $(patsubst %,test-assets/%,${TEST_ASSETS_SMALL}) $(patsubst %,test-assets/%.sha256_erofs,${TEST_ASSETS_SMALL})
-
-check-checksums:
-	$(srcdir)/test-checksums.sh "${WRITER_JSON_PREFIX} $(builddir)/composefs-from-json" "$(srcdir)/test-assets" "${TEST_ASSETS}"
-
-check: check-checksums