AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
- -I $(top_srcdir)/include \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS) \
# ------------------------------------------------------------------------------
bin_SCRIPTS = \
- src/scripts/pakfire-client \
src/scripts/pakfire-daemon
EXTRA_DIST += \
- src/scripts/pakfire-client.in \
src/scripts/pakfire-daemon.in
CLEANFILES += \
- src/scripts/pakfire-client \
src/scripts/pakfire-daemon
# ------------------------------------------------------------------------------
pakfire_PYTHON = \
src/pakfire/__init__.py \
src/pakfire/__version__.py \
+ src/pakfire/buildservice.py \
src/pakfire/config.py \
src/pakfire/constants.py \
src/pakfire/daemon.py \
src/pakfire/errors.py \
- src/pakfire/hub.py \
src/pakfire/i18n.py \
src/pakfire/logger.py \
src/pakfire/util.py
src/_pakfire/archive.h \
src/_pakfire/archive_file.c \
src/_pakfire/archive_file.h \
+ src/_pakfire/buildservice.c \
+ src/_pakfire/buildservice.h \
+ src/_pakfire/ctx.c \
+ src/_pakfire/ctx.h \
src/_pakfire/errors.h \
src/_pakfire/file.c \
src/_pakfire/file.h \
src/_pakfire/pakfire.h \
src/_pakfire/problem.c \
src/_pakfire/problem.h \
- src/_pakfire/progressbar.c \
- src/_pakfire/progressbar.h \
src/_pakfire/repo.c \
src/_pakfire/repo.h \
src/_pakfire/solution.c \
_pakfire_la_CFLAGS = \
$(AM_CFLAGS) \
$(PYTHON_DEVEL_CFLAGS) \
+ $(JSON_C_CFLAGS) \
-Wno-cast-function-type
_pakfire_la_LDFLAGS = \
src/libpakfire/arch.c \
src/libpakfire/archive.c \
src/libpakfire/build.c \
+ src/libpakfire/buildservice.c \
src/libpakfire/cgroup.c \
src/libpakfire/compress.c \
src/libpakfire/config.c \
+ src/libpakfire/ctx.c \
+ src/libpakfire/daemon.c \
src/libpakfire/db.c \
src/libpakfire/dependencies.c \
src/libpakfire/digest.c \
src/libpakfire/dist.c \
- src/libpakfire/downloader.c \
src/libpakfire/fhs.c \
src/libpakfire/file.c \
src/libpakfire/filelist.c \
+ src/libpakfire/httpclient.c \
src/libpakfire/jail.c \
src/libpakfire/key.c \
src/libpakfire/linter.c \
src/libpakfire/logging.c \
+ src/libpakfire/mirror.c \
+ src/libpakfire/mirrorlist.c \
src/libpakfire/mount.c \
+ src/libpakfire/os.c \
src/libpakfire/package.c \
src/libpakfire/packager.c \
src/libpakfire/packagelist.c \
src/libpakfire/pakfire.c \
+ src/libpakfire/parse.c \
src/libpakfire/parser.c \
+ src/libpakfire/path.c \
src/libpakfire/problem.c \
- src/libpakfire/progressbar.c \
+ src/libpakfire/progress.c \
src/libpakfire/pwd.c \
src/libpakfire/repo.c \
src/libpakfire/repolist.c \
src/libpakfire/solution.c \
src/libpakfire/string.c \
src/libpakfire/transaction.c \
- src/libpakfire/util.c
+ src/libpakfire/util.c \
+ src/libpakfire/xfer.c
pkginclude_HEADERS += \
src/libpakfire/include/pakfire/arch.h \
src/libpakfire/include/pakfire/archive.h \
src/libpakfire/include/pakfire/build.h \
+ src/libpakfire/include/pakfire/buildservice.h \
src/libpakfire/include/pakfire/cgroup.h \
src/libpakfire/include/pakfire/compress.h \
src/libpakfire/include/pakfire/config.h \
src/libpakfire/include/pakfire/constants.h \
+ src/libpakfire/include/pakfire/ctx.h \
+ src/libpakfire/include/pakfire/daemon.h \
src/libpakfire/include/pakfire/db.h \
src/libpakfire/include/pakfire/dependencies.h \
src/libpakfire/include/pakfire/digest.h \
src/libpakfire/include/pakfire/dist.h \
- src/libpakfire/include/pakfire/downloader.h \
src/libpakfire/include/pakfire/fhs.h \
src/libpakfire/include/pakfire/file.h \
src/libpakfire/include/pakfire/filelist.h \
+ src/libpakfire/include/pakfire/httpclient.h \
src/libpakfire/include/pakfire/i18n.h \
src/libpakfire/include/pakfire/jail.h \
src/libpakfire/include/pakfire/key.h \
src/libpakfire/include/pakfire/linter.h \
src/libpakfire/include/pakfire/logging.h \
+ src/libpakfire/include/pakfire/mirror.h \
+ src/libpakfire/include/pakfire/mirrorlist.h \
src/libpakfire/include/pakfire/mount.h \
+ src/libpakfire/include/pakfire/os.h \
src/libpakfire/include/pakfire/package.h \
src/libpakfire/include/pakfire/packager.h \
src/libpakfire/include/pakfire/packagelist.h \
src/libpakfire/include/pakfire/pakfire.h \
+ src/libpakfire/include/pakfire/parse.h \
src/libpakfire/include/pakfire/parser.h \
+ src/libpakfire/include/pakfire/path.h \
src/libpakfire/include/pakfire/private.h \
src/libpakfire/include/pakfire/problem.h \
- src/libpakfire/include/pakfire/progressbar.h \
+ src/libpakfire/include/pakfire/progress.h \
src/libpakfire/include/pakfire/pwd.h \
src/libpakfire/include/pakfire/repo.h \
src/libpakfire/include/pakfire/repolist.h \
src/libpakfire/include/pakfire/solution.h \
src/libpakfire/include/pakfire/string.h \
src/libpakfire/include/pakfire/transaction.h \
- src/libpakfire/include/pakfire/util.h
+ src/libpakfire/include/pakfire/util.h \
+ src/libpakfire/include/pakfire/xfer.h
libpakfire_la_CFLAGS = \
$(AM_CFLAGS) \
$(CURL_CFLAGS) \
$(ELF_CFLAGS) \
$(JSON_C_CFLAGS) \
+ $(KRB5_CFLAGS) \
$(MAGIC_CFLAGS) \
- $(MOUNT_CFLAGS) \
$(NL3_CFLAGS) \
$(NL3_ROUTE_CFLAGS) \
$(OPENSSL_CFLAGS) \
$(CURL_LIBS) \
$(ELF_LIBS) \
$(JSON_C_LIBS) \
+ $(KRB5_LIBS) \
$(LZMA_LIBS) \
$(MAGIC_LIBS) \
- $(MOUNT_LIBS) \
$(NL3_LIBS) \
$(NL3_ROUTE_LIBS) \
$(OPENSSL_LIBS) \
# ------------------------------------------------------------------------------
+bin_PROGRAMS += \
+ pakfire-client
+
+pakfire_client_SOURCES = \
+ src/cli/pakfire-client.c
+
+pakfire_client_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir)/src/libpakfire/include
+
+pakfire_client_CFLAGS = \
+ $(AM_CFLAGS)
+
+pakfire_client_LDFLAGS = \
+ $(AM_LDFLAGS)
+
+pakfire_client_LDADD = \
+ libpakfire.la \
+ libcli.la
+
+# ------------------------------------------------------------------------------
+
+#
+# Disabled because we cannot fully implement the build service communication in C
+#
+#bin_PROGRAMS += \
+# pakfire-daemon
+#
+#pakfire_daemon_SOURCES = \
+# src/cli/pakfire-daemon.c
+#
+#pakfire_daemon_CPPFLAGS = \
+# $(AM_CPPFLAGS) \
+# -I$(top_srcdir)/src/libpakfire/include
+#
+#pakfire_daemon_CFLAGS = \
+# $(AM_CFLAGS)
+#
+#pakfire_daemon_LDFLAGS = \
+# $(AM_LDFLAGS)
+#
+#pakfire_daemon_LDADD = \
+# libpakfire.la \
+# libcli.la
+
+# ------------------------------------------------------------------------------
+
noinst_LTLIBRARIES += \
libcli.la
libcli_la_SOURCES = \
+ src/cli/lib/assert.c \
+ src/cli/lib/assert.h \
src/cli/lib/build.c \
src/cli/lib/build.h \
src/cli/lib/check.c \
src/cli/lib/check.h \
src/cli/lib/clean.c \
src/cli/lib/clean.h \
+ src/cli/lib/client-build.c \
+ src/cli/lib/client-build.h \
src/cli/lib/color.c \
src/cli/lib/color.h \
src/cli/lib/command.c \
src/cli/lib/command.h \
+ src/cli/lib/config.c \
+ src/cli/lib/config.h \
+ src/cli/lib/daemon.c \
+ src/cli/lib/daemon.h \
src/cli/lib/dist.c \
src/cli/lib/dist.h \
src/cli/lib/dump.c \
src/cli/lib/info.h \
src/cli/lib/install.h \
src/cli/lib/install.c \
+ src/cli/lib/pakfire.c \
+ src/cli/lib/pakfire.h \
+ src/cli/lib/progressbar.c \
+ src/cli/lib/progressbar.h \
src/cli/lib/provides.h \
src/cli/lib/provides.c \
src/cli/lib/remove.c \
src/cli/lib/repo.h \
src/cli/lib/repo_compose.c \
src/cli/lib/repo_compose.h \
+ src/cli/lib/repo_create.c \
+ src/cli/lib/repo_create.h \
+ src/cli/lib/repo_delete.c \
+ src/cli/lib/repo_delete.h \
+ src/cli/lib/repo_list.c \
+ src/cli/lib/repo_list.h \
+ src/cli/lib/repo_show.c \
+ src/cli/lib/repo_show.h \
src/cli/lib/repolist.c \
src/cli/lib/repolist.h \
src/cli/lib/requires.c \
src/cli/lib/transaction.h \
src/cli/lib/update.c \
src/cli/lib/update.h \
+ src/cli/lib/upload.c \
+ src/cli/lib/upload.h \
+ src/cli/lib/upload_create.c \
+ src/cli/lib/upload_create.h \
+ src/cli/lib/upload_delete.c \
+ src/cli/lib/upload_delete.h \
+ src/cli/lib/upload_list.c \
+ src/cli/lib/upload_list.h \
src/cli/lib/version.c \
src/cli/lib/version.h
libcli_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
+ -DPAKFIRE_PRIVATE \
-I$(top_srcdir)/src/libpakfire/include
libcli_la_CFLAGS = \
- $(AM_CFLAGS)
+ $(AM_CFLAGS) \
+ $(JSON_C_CFLAGS)
libcli_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(AM_LDFLAGS) \
+ $(JSON_C_LIBS)
+
+libcli_la_LIBADD = \
+ libpakfire.la \
+ libpakfire-internal.la
# ------------------------------------------------------------------------------
tests/libpakfire/db \
tests/libpakfire/dependencies \
tests/libpakfire/digest \
- tests/libpakfire/downloader \
tests/libpakfire/file \
+ tests/libpakfire/httpclient \
tests/libpakfire/jail \
tests/libpakfire/key \
tests/libpakfire/makefile \
+ tests/libpakfire/os \
tests/libpakfire/package \
tests/libpakfire/packager \
tests/libpakfire/parser \
- tests/libpakfire/progressbar \
+ tests/libpakfire/path \
tests/libpakfire/repo \
tests/libpakfire/snapshot \
tests/libpakfire/string \
- tests/libpakfire/util
+ tests/libpakfire/util \
+ tests/libpakfire/xfer
dist_tests_libpakfire_main_SOURCES = \
tests/libpakfire/main.c
tests_libpakfire_digest_LDADD = \
$(TESTSUITE_LDADD)
-dist_tests_libpakfire_downloader_SOURCES = \
- tests/libpakfire/downloader.c
+dist_tests_libpakfire_file_SOURCES = \
+ tests/libpakfire/file.c
-tests_libpakfire_downloader_CPPFLAGS = \
+tests_libpakfire_file_CPPFLAGS = \
$(TESTSUITE_CPPFLAGS)
-tests_libpakfire_downloader_CFLAGS = \
+tests_libpakfire_file_CFLAGS = \
$(TESTSUITE_CFLAGS)
-tests_libpakfire_downloader_LDADD = \
+tests_libpakfire_file_LDADD = \
$(TESTSUITE_LDADD)
-dist_tests_libpakfire_file_SOURCES = \
- tests/libpakfire/file.c
+dist_tests_libpakfire_httpclient_SOURCES = \
+ tests/libpakfire/httpclient.c
-tests_libpakfire_file_CPPFLAGS = \
+tests_libpakfire_httpclient_CPPFLAGS = \
$(TESTSUITE_CPPFLAGS)
-tests_libpakfire_file_CFLAGS = \
+tests_libpakfire_httpclient_CFLAGS = \
$(TESTSUITE_CFLAGS)
-tests_libpakfire_file_LDADD = \
+tests_libpakfire_httpclient_LDADD = \
$(TESTSUITE_LDADD)
dist_tests_libpakfire_jail_SOURCES = \
tests_libpakfire_makefile_LDADD = \
$(TESTSUITE_LDADD)
+dist_tests_libpakfire_os_SOURCES = \
+ tests/libpakfire/os.c
+
+tests_libpakfire_os_CPPFLAGS = \
+ $(TESTSUITE_CPPFLAGS)
+
+tests_libpakfire_os_CFLAGS = \
+ $(TESTSUITE_CFLAGS)
+
+tests_libpakfire_os_LDADD = \
+ $(TESTSUITE_LDADD)
+
dist_tests_libpakfire_package_SOURECES = \
tests/libpakfire/package.c
tests_libpakfire_parser_LDADD = \
$(TESTSUITE_LDADD)
-dist_tests_libpakfire_progressbar_SOURCES = \
- tests/libpakfire/progressbar.c
+dist_tests_libpakfire_path_SOURCES = \
+ tests/libpakfire/path.c
-tests_libpakfire_progressbar_CPPFLAGS = \
+tests_libpakfire_path_CPPFLAGS = \
$(TESTSUITE_CPPFLAGS)
-tests_libpakfire_progressbar_CFLAGS = \
+tests_libpakfire_path_CFLAGS = \
$(TESTSUITE_CFLAGS)
-tests_libpakfire_progressbar_LDADD = \
+tests_libpakfire_path_LDADD = \
$(TESTSUITE_LDADD)
dist_tests_libpakfire_repo_SOURCES = \
tests_libpakfire_util_LDADD = \
$(TESTSUITE_LDADD)
+dist_tests_libpakfire_xfer_SOURCES = \
+ tests/libpakfire/xfer.c
+
+tests_libpakfire_xfer_CPPFLAGS = \
+ $(TESTSUITE_CPPFLAGS)
+
+tests_libpakfire_xfer_CFLAGS = \
+ $(TESTSUITE_CFLAGS)
+
+tests_libpakfire_xfer_LDADD = \
+ $(TESTSUITE_LDADD)
+
# ------------------------------------------------------------------------------
noinst_PROGRAMS += \
# ------------------------------------------------------------------------------
dist_configs_DATA = \
- contrib/config/client.conf \
- contrib/config/daemon.conf \
- contrib/config/general.conf
+ contrib/config/pakfire.conf
dist_configsdistros_DATA = \
contrib/config/distros/ipfire3.conf
$(AM_CPPFLAGS) \
$(PAKFIRE_CPPFLAGS) \
-DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\" \
+ -DTEST_CONFIG_FILE=\"$(abs_top_srcdir)/contrib/config/pakfire.conf\" \
-DTEST_DATA_DIR=\"$(abs_top_srcdir)/tests/data\" \
-DTEST_ROOTFS=\"$(TEST_ROOTFS)\" \
-DTEST_STUB_COMMAND=\"$(abs_top_builddir)/tests/stub/root/command\" \
libpakfire-internal.la
TESTS_ENVIRONMENT = \
+ TEST_CONFIG_FILE="$(abs_top_srcdir)/tests/pakfire.conf" \
TEST_DATA_DIR="$(abs_top_srcdir)/tests/data" \
TEST_STUB_ROOT="$(TEST_STUB_ROOT)" \
PAKFIRE_LOG=debug \
topdir="$(shell pwd)"
+# Test the library we just built
+TESTS_ENVIRONMENT += \
+ LD_LIBRARY_PATH=$(top_srcdir)/.libs:$(LD_LIBRARY_PATH)
+
+# Test the Python modules we just built
+TESTS_ENVIRONMENT += \
+ PYTHONPATH=$(top_srcdir)/src:$(top_srcdir)/.libs:$(PYTHONPATH)
+
dist_check_SCRIPTS = \
+ tests/python/archive.py \
+ tests/python/ctx.py \
tests/python/keys.py \
tests/python/jail.py \
- tests/python/package.py \
- tests/python/progressbar.py \
- tests/python/test.py
+ tests/python/package.py
+
+EXTRA_DIST += \
+ tests/python/tests.py
TESTS = \
$(check_PROGRAMS) \
projects / pakfire.git / blobdiff