Organizing src/ directories in categories

    src/
    src/3rd-party/ # Everything that is 3rd-party related
    src/cmds/ # All sub-commands from swupd (except 3rd-party ones)
    src/lib/ # Modules that implement functions not dependent on swupd
               behavior (i.e. system interations, logging)
    src/swupd_lib/ # Modules that implement functions dependent on swupd
                     behavior (i.e. hash calculation, signature verification,
                     manifest/bundle handlers)

Author: Otavio Pontes

.gitignore

@@ -53,7 +53,7 @@ Swupd_Root.pem
 private.pem
 test/**/*.log
 test/unit/test_*.test
-verifytime
+/verifytime
 unit_tests.log
 html/
 xml/

Makefile.am

@@ -39,49 +39,35 @@ bin_PROGRAMS = swupd
 AM_CPPFLAGS = $(AM_CFLAGS) $(libarchive_CFLAGS)
 
 swupd_SOURCES = \
-	src/3rd_party_add.c \
-	src/3rd_party_bundle_add.c \
-	src/3rd_party_bundle_info.c \
-	src/3rd_party_bundle_list.c \
-	src/3rd_party_bundle_remove.c \
-	src/3rd_party.c \
-	src/3rd_party_check_update.c \
-	src/3rd_party_clean.c \
-	src/3rd_party_diagnose.c \
-	src/3rd_party_info.c \
-	src/3rd_party_list.c \
-	src/3rd_party_remove.c \
-	src/3rd_party_repair.c \
-	src/3rd_party_repos.c \
-	src/3rd_party_repos.h \
-	src/3rd_party_update.c \
-	src/alias.c \
-	src/alias.h \
-	src/autoupdate.c \
-	src/binary_loader.c \
-	src/bundle_add.c \
-	src/bundle.c \
-	src/bundle.h \
-	src/bundle_info.c \
-	src/bundle_list.c \
-	src/bundle_remove.c \
-	src/check_update.c \
-	src/clean.c \
-	src/config_loader.c \
-	src/config_loader.h \
-	src/curl_async.c \
-	src/curl.c \
-	src/delta.c \
-	src/extra_files.c \
-	src/filedesc.c \
-	src/fullfile.c \
-	src/globals.c \
-	src/globals.h \
-	src/hash.c \
-	src/hashdump.c \
-	src/helpers.c \
-	src/heuristics.c \
-	src/info.c \
+	src/3rd_party/3rd_party_add.c \
+	src/3rd_party/3rd_party_bundle_add.c \
+	src/3rd_party/3rd_party_bundle_info.c \
+	src/3rd_party/3rd_party_bundle_list.c \
+	src/3rd_party/3rd_party_bundle_remove.c \
+	src/3rd_party/3rd_party.c \
+	src/3rd_party/3rd_party_check_update.c \
+	src/3rd_party/3rd_party_clean.c \
+	src/3rd_party/3rd_party_diagnose.c \
+	src/3rd_party/3rd_party_info.c \
+	src/3rd_party/3rd_party_list.c \
+	src/3rd_party/3rd_party_remove.c \
+	src/3rd_party/3rd_party_repair.c \
+	src/3rd_party/3rd_party_repos.c \
+	src/3rd_party/3rd_party_repos.h \
+	src/3rd_party/3rd_party_update.c \
+	src/cmds/autoupdate.c \
+	src/cmds/bundle_add.c \
+	src/cmds/bundle_info.c \
+	src/cmds/bundle_list.c \
+	src/cmds/bundle_remove.c \
+	src/cmds/check_update.c \
+	src/cmds/clean.c \
+	src/cmds/info.c \
+	src/cmds/os_install.c \
+	src/cmds/repair.c \
+	src/cmds/swupd_cmds.h \
+	src/cmds/update.c \
+	src/cmds/verify.c \
 	src/lib/archives.c \
 	src/lib/archives.h \
 	src/lib/comp_functions.c \
@@ -105,45 +91,59 @@ swupd_SOURCES = \
 	src/lib/thread_pool.h \
 	src/lib/timelist.c \
 	src/lib/timelist.h \
-	src/lock.c \
 	src/main.c \
-	src/manifest.c \
-	src/manifest.h \
-	src/manifest_parser.c \
-	src/mirror.c \
-	src/os_install.c \
-	src/packs.c \
-	src/progress.c \
-	src/progress.h \
-	src/repair.c \
-	src/scripts.c \
-	src/scripts.h \
-	src/search_file.c \
-	src/signature.c \
-	src/signature.h \
-	src/stats.c \
-	src/subscriptions.c \
 	src/swupd_build_opts.h \
 	src/swupd_build_variant.h \
-	src/swupd_comp_functions.c \
-	src/swupd_comp_functions.h \
-	src/swupd_curl.h \
-	src/swupd_curl_internal.h \
 	src/swupd_exit_codes.h \
 	src/swupd.h \
-	src/swupd_internal.h \
-	src/swupd_progress.c \
-	src/swupd_progress.h \
-	src/target_root.c \
-	src/target_root.h \
-	src/telemetry.c \
-	src/telemetry.h \
-	src/update.c \
-	src/verify.c \
-	src/verifytime.c \
-	src/version.c \
-	src/xattrs.c \
-	src/xattrs.h
+	src/swupd_lib/alias.c \
+	src/swupd_lib/alias.h \
+	src/swupd_lib/binary_loader.c \
+	src/swupd_lib/bundle.c \
+	src/swupd_lib/bundle.h \
+	src/swupd_lib/config_loader.c \
+	src/swupd_lib/config_loader.h \
+	src/swupd_lib/curl_async.c \
+	src/swupd_lib/curl.c \
+	src/swupd_lib/delta.c \
+	src/swupd_lib/extra_files.c \
+	src/swupd_lib/filedesc.c \
+	src/swupd_lib/fullfile.c \
+	src/swupd_lib/globals.c \
+	src/swupd_lib/globals.h \
+	src/swupd_lib/hash.c \
+	src/swupd_lib/hashdump.c \
+	src/swupd_lib/helpers.c \
+	src/swupd_lib/heuristics.c \
+	src/swupd_lib/lock.c \
+	src/swupd_lib/manifest.c \
+	src/swupd_lib/manifest.h \
+	src/swupd_lib/manifest_parser.c \
+	src/swupd_lib/mirror.c \
+	src/swupd_lib/packs.c \
+	src/swupd_lib/progress.c \
+	src/swupd_lib/progress.h \
+	src/swupd_lib/scripts.c \
+	src/swupd_lib/scripts.h \
+	src/swupd_lib/search_file.c \
+	src/swupd_lib/signature.c \
+	src/swupd_lib/signature.h \
+	src/swupd_lib/stats.c \
+	src/swupd_lib/subscriptions.c \
+	src/swupd_lib/swupd_comp_functions.c \
+	src/swupd_lib/swupd_comp_functions.h \
+	src/swupd_lib/swupd_curl.h \
+	src/swupd_lib/swupd_curl_internal.h \
+	src/swupd_lib/swupd_progress.c \
+	src/swupd_lib/swupd_progress.h \
+	src/swupd_lib/target_root.c \
+	src/swupd_lib/target_root.h \
+	src/swupd_lib/telemetry.c \
+	src/swupd_lib/telemetry.h \
+	src/swupd_lib/version.c \
+	src/swupd_lib/xattrs.c \
+	src/swupd_lib/xattrs.h \
+	src/verifytime/verifytime.c
 
 swupd_LDADD = \
 	$(lzma_LIBS) \
@@ -155,9 +155,10 @@ swupd_LDADD = \
 	$(libarchive_LIBS) \
 	$(pthread_LIBS)
 
-verifytime_SOURCES = src/verifytime.h \
-	src/verifytime.c \
-	src/verifytime_main.c
+verifytime_SOURCES = \
+	src/verifytime/verifytime.h \
+	src/verifytime/verifytime.c \
+	src/verifytime/verifytime_main.c
 
 verifytime_LDADD =
 
@@ -270,7 +271,7 @@ functional-check:
 
 docs-coverage:
 	doxygen docs/Doxyfile || die; \
-	python -m coverxygen --xml-dir xml/ --src-dir ./ --output doc-coverage.info --exclude ".*/src/globals.h" --exclude ".*/src/swupd_build_opts.h" --exclude ".*/src/swupd_build_variant.h" --exclude ".*/src/swupd_exit_codes.h" --exclude ".*/src/swupd.h" --exclude ".*/src/swupd_internal.h" --exclude ".*/src/manifest.h" --exclude ".*/src/swupd_curl_internal.h" --exclude ".*/src/swupd_curl.h" --format json || die; \
+	python -m coverxygen --xml-dir xml/ --src-dir ./ --output doc-coverage.info --exclude ".*/src/swupd_lib/globals.h" --exclude ".*/src/swupd_build_opts.h" --exclude ".*/src/swupd_build_variant.h" --exclude ".*/src/swupd_exit_codes.h" --exclude ".*/src/swupd.h" --exclude ".*/src/cmds/swupd_cmds.h" --exclude ".*/src/swupd_lib/manifest.h" --exclude ".*/src/swupd_lib/swupd_curl_internal.h" --exclude ".*/src/swupd_lib/swupd_curl.h" --format json || die; \
 	if [ "$$(cat doc-coverage.info | grep documented.*false | wc -l)" -gt "0" ]; then \
 		echo "Public functions or data added on headers but not documented on src/lib "; \
 		exit 1; \