shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

build: Make libsoup optional again

Browse Source 
The "remote cookies" code broke this.  While I'm not sure anyone is
actually using ostree-without-http, it isn't too hard to keep the
build time conditional going.  Further, this work is preparatory for
libcurl porting.

Closes: #621
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-12-07 21:16:52 -05:00 committed by Atomic Bot
parent 7519457382
commit 7f2830cb4e
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile-ostree.am
View File

@ -80,17 +80,22 @@ ostree_SOURCES += \
ostree_SOURCES += \ ostree_SOURCES += \
src/ostree/ot-remote-builtins.h \ src/ostree/ot-remote-builtins.h \
src/ostree/ot-remote-builtin-add.c \ src/ostree/ot-remote-builtin-add.c \
src/ostree/ot-remote-builtin-add-cookie.c \
src/ostree/ot-remote-builtin-delete.c \ src/ostree/ot-remote-builtin-delete.c \
src/ostree/ot-remote-builtin-delete-cookie.c \
src/ostree/ot-remote-builtin-gpg-import.c \ src/ostree/ot-remote-builtin-gpg-import.c \
src/ostree/ot-remote-builtin-list.c \ src/ostree/ot-remote-builtin-list.c \
src/ostree/ot-remote-builtin-list-cookies.c \
src/ostree/ot-remote-builtin-show-url.c \ src/ostree/ot-remote-builtin-show-url.c \
src/ostree/ot-remote-builtin-refs.c \ src/ostree/ot-remote-builtin-refs.c \
src/ostree/ot-remote-builtin-summary.c \ src/ostree/ot-remote-builtin-summary.c \
$(NULL) $(NULL)
if USE_LIBSOUP
ostree_SOURCES += \
src/ostree/ot-remote-builtin-add-cookie.c \
src/ostree/ot-remote-builtin-delete-cookie.c \
src/ostree/ot-remote-builtin-list-cookies.c \
$(NULL)
endif
src/ostree/parse-datetime.c: src/ostree/parse-datetime.y Makefile src/ostree/parse-datetime.c: src/ostree/parse-datetime.y Makefile
$(AM_V_GEN) $(YACC) $< -o $@ $(AM_V_GEN) $(YACC) $< -o $@

5
Makefile-tests.am
View File

@ -44,7 +44,6 @@ dist_test_scripts = \
tests/test-pull-subpath.sh \ tests/test-pull-subpath.sh \
tests/test-archivez.sh \ tests/test-archivez.sh \
tests/test-remote-add.sh \ tests/test-remote-add.sh \
tests/test-remote-cookies.sh \
tests/test-remote-headers.sh \ tests/test-remote-headers.sh \
tests/test-remote-gpg-import.sh \ tests/test-remote-gpg-import.sh \
tests/test-commit-sign.sh \ tests/test-commit-sign.sh \
@ -101,6 +100,10 @@ else
EXTRA_DIST += tests/test-rofiles-fuse.sh EXTRA_DIST += tests/test-rofiles-fuse.sh
endif endif
if USE_LIBSOUP
dist_test_scripts += tests/test-remote-cookies.sh
endif
# This one uses corrupt-repo-ref.js # This one uses corrupt-repo-ref.js
js_tests = tests/test-corruption.sh js_tests = tests/test-corruption.sh
if BUILDOPT_GJS if BUILDOPT_GJS

8
src/ostree/ot-builtin-remote.c
View File

@ -33,13 +33,15 @@ typedef struct {
static OstreeRemoteCommand remote_subcommands[] = { static OstreeRemoteCommand remote_subcommands[] = {
{ "add", ot_remote_builtin_add }, { "add", ot_remote_builtin_add },
{ "add-cookie", ot_remote_builtin_add_cookie },
{ "delete", ot_remote_builtin_delete }, { "delete", ot_remote_builtin_delete },
{ "delete-cookie", ot_remote_builtin_delete_cookie },
{ "show-url", ot_remote_builtin_show_url }, { "show-url", ot_remote_builtin_show_url },
{ "list", ot_remote_builtin_list }, { "list", ot_remote_builtin_list },
{ "list-cookies", ot_remote_builtin_list_cookies },
{ "gpg-import", ot_remote_builtin_gpg_import }, { "gpg-import", ot_remote_builtin_gpg_import },
#ifdef HAVE_LIBSOUP
{ "add-cookie", ot_remote_builtin_add_cookie },
{ "delete-cookie", ot_remote_builtin_delete_cookie },
{ "list-cookies", ot_remote_builtin_list_cookies },
#endif
{ "refs", ot_remote_builtin_refs }, { "refs", ot_remote_builtin_refs },
{ "summary", ot_remote_builtin_summary }, { "summary", ot_remote_builtin_summary },
{ NULL, NULL } { NULL, NULL }

6
src/ostree/ot-remote-builtins.h
View File

@ -25,12 +25,14 @@
G_BEGIN_DECLS G_BEGIN_DECLS
gboolean ot_remote_builtin_add (int argc, char **argv, GCancellable *cancellable, GError **error); gboolean ot_remote_builtin_add (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_add_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_delete (int argc, char **argv, GCancellable *cancellable, GError **error); gboolean ot_remote_builtin_delete (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_delete_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_gpg_import (int argc, char **argv, GCancellable *cancellable, GError **error); gboolean ot_remote_builtin_gpg_import (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_list (int argc, char **argv, GCancellable *cancellable, GError **error); gboolean ot_remote_builtin_list (int argc, char **argv, GCancellable *cancellable, GError **error);
#ifdef HAVE_LIBSOUP
gboolean ot_remote_builtin_add_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_list_cookies (int argc, char **argv, GCancellable *cancellable, GError **error); gboolean ot_remote_builtin_list_cookies (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_delete_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
#endif
gboolean ot_remote_builtin_show_url (int argc, char **argv, GCancellable *cancellable, GError **error); gboolean ot_remote_builtin_show_url (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_refs (int argc, char **argv, GCancellable *cancellable, GError **error); gboolean ot_remote_builtin_refs (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError **error); gboolean ot_remote_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError **error);