python: Pakfire.execute(): Fix parsing some arguments

[pakfire.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a98ec3f56cfb582ce2eb6ec51bf1fcbf917cccf0..2fbead80e7d75fca4f802133acb5fcb9b3f833cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,15 +103,12 @@ dist_doc_DATA = \
 # ------------------------------------------------------------------------------
 
 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
 
 # ------------------------------------------------------------------------------
@@ -119,11 +116,11 @@ CLEANFILES += \
 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
@@ -141,6 +138,10 @@ _pakfire_la_SOURCES = \
        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 \
@@ -166,6 +167,7 @@ _pakfire_la_CPPFLAGS = \
 _pakfire_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(PYTHON_DEVEL_CFLAGS) \
+       $(JSON_C_CFLAGS) \
        -Wno-cast-function-type
 
 _pakfire_la_LDFLAGS = \
@@ -219,14 +221,15 @@ libpakfire_la_SOURCES = \
        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 \
@@ -234,10 +237,12 @@ libpakfire_la_SOURCES = \
        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 \
@@ -250,7 +255,8 @@ libpakfire_la_SOURCES = \
        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 \
@@ -262,14 +268,15 @@ pkginclude_HEADERS += \
        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 \
@@ -278,10 +285,12 @@ pkginclude_HEADERS += \
        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 \
@@ -295,7 +304,8 @@ pkginclude_HEADERS += \
        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) \
@@ -307,7 +317,6 @@ libpakfire_la_CFLAGS = \
        $(JSON_C_CFLAGS) \
        $(KRB5_CFLAGS) \
        $(MAGIC_CFLAGS) \
-       $(MOUNT_CFLAGS) \
        $(NL3_CFLAGS) \
        $(NL3_ROUTE_CFLAGS) \
        $(OPENSSL_CFLAGS) \
@@ -341,7 +350,6 @@ libpakfire_la_LIBADD = \
        $(KRB5_LIBS) \
        $(LZMA_LIBS) \
        $(MAGIC_LIBS) \
-       $(MOUNT_LIBS) \
        $(NL3_LIBS) \
        $(NL3_ROUTE_LIBS) \
        $(OPENSSL_LIBS) \
@@ -453,6 +461,31 @@ pakfire_client_LDADD = \
 
 # ------------------------------------------------------------------------------
 
+#
+# 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
 
@@ -473,6 +506,8 @@ libcli_la_SOURCES = \
        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 \
@@ -497,6 +532,14 @@ libcli_la_SOURCES = \
        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 \
@@ -554,11 +597,12 @@ check_PROGRAMS += \
        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 \
@@ -566,7 +610,8 @@ check_PROGRAMS += \
        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
@@ -688,28 +733,28 @@ tests_libpakfire_digest_CFLAGS = \
 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 = \
@@ -748,6 +793,18 @@ tests_libpakfire_makefile_CFLAGS = \
 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
 
@@ -844,6 +901,18 @@ tests_libpakfire_util_CFLAGS = \
 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 += \
@@ -1060,16 +1129,29 @@ TESTSUITE_LDADD = \
        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/test.py
+       tests/python/package.py
+
+EXTRA_DIST += \
+       tests/python/tests.py
 
 TESTS = \
        $(check_PROGRAMS) \