Install a shared library

This required a fair bit of surgery because previously ostree.h
included otutil.h, but that's supposed to be a private library.

src/libostree/ostree-1.pc.in

@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: OSTree
+Description: Git for operating system binaries
+Version: @VERSION@
+Requires: gio-unix-2.0
+Libs: -L${libdir} -lostree-1
+Cflags: -I${includedir}/ostree-1

src/libostree/ostree-chain-input-stream.c

@@ -20,9 +20,8 @@
 
 #include "config.h"
 
-
-#include <gio/gio.h>
 #include "ostree-chain-input-stream.h"
+#include "libgsystem.h"
 
 enum {
   PROP_0,

src/libostree/ostree-checksum-input-stream.c

@@ -20,9 +20,8 @@
 
 #include "config.h"
 
-
-#include <gio/gio.h>
 #include "ostree-checksum-input-stream.h"
+#include "libgsystem.h"
 
 enum {
   PROP_0,

src/libostree/ostree-core.c

@@ -22,15 +22,15 @@
 
 #include "config.h"
 
-#include "ostree.h"
-#include "otutil.h"
-
-#include <gio/gfiledescriptorbased.h>
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <gio/gfiledescriptorbased.h>
 #include <attr/xattr.h>
+#include "ostree.h"
+#include "ostree-chain-input-stream.h"
+#include "otutil.h"
+#include "libgsystem.h"
 
 #define ALIGN_VALUE(this, boundary) \
   (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))

src/libostree/ostree-core.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <otutil.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 

src/libostree/ostree-diff.c

@@ -24,6 +24,7 @@
 
 #include "ostree.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 static gboolean
 get_file_checksum (GFile  *f,

src/libostree/ostree-fetcher.c

@@ -24,6 +24,8 @@
 
 #include "ostree-fetcher.h"
 #include "ostree.h"
+#include "otutil.h"
+#include "libgsystem.h"
 
 typedef enum {
   OSTREE_FETCHER_STATE_PENDING,

src/libostree/ostree-libarchive-input-stream.c

@@ -24,6 +24,7 @@
 #include <archive.h>
 #include <gio/gio.h>
 #include "ostree-libarchive-input-stream.h"
+#include "libgsystem.h"
 
 enum {
   PROP_0,

src/libostree/ostree-mutable-tree.c

@@ -25,6 +25,7 @@
 #include "ostree-mutable-tree.h"
 #include "otutil.h"
 #include "ostree-core.h"
+#include "libgsystem.h"
 
 struct OstreeMutableTree
 {

src/libostree/ostree-repo-checkout.c

@@ -22,6 +22,9 @@
 
 #include "config.h"
 
+#include <glib-unix.h>
+#include "otutil.h"
+
 #include "ostree-repo-file.h"
 #include "ostree-repo-private.h"
 

src/libostree/ostree-repo-file-enumerator.c

@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include "libgsystem.h"
 #include "ostree-repo-file-enumerator.h"
 #include <string.h>
 

src/libostree/ostree-repo-file.c

@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include "otutil.h"
 #include "ostree-repo-file-enumerator.h"
 #include "ostree-repo.h"
 

src/libostree/ostree-repo-libarchive.c

@@ -31,6 +31,8 @@
 #include "ostree-libarchive-input-stream.h"
 #endif
 
+#include "otutil.h"
+
 #ifdef HAVE_LIBARCHIVE
 
 static GFileInfo *

src/libostree/ostree-repo-prune.c

@@ -22,7 +22,8 @@
 
 #include "config.h"
 
-#include "ostree-repo.h"
+#include "ostree.h"
+#include "otutil.h"
 
 typedef struct {
   OstreeRepo *repo;

src/libostree/ostree-repo-pull.c

@@ -69,6 +69,7 @@
 
 #include "ostree.h"
 #include "ostree-fetcher.h"
+#include "otutil.h"
 
 typedef struct {
   enum {

src/libostree/ostree-repo-refs.c

@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "ostree-repo-private.h"
+#include "otutil.h"
 
 static gboolean
 add_ref_to_set (const char       *remote,
@@ -350,6 +351,17 @@ resolve_refspec (OstreeRepo     *self,
   return ret;
 }
 
+/**
+ * ostree_repo_resolve_rev:
+ * @self:
+ * @refspec: A refspec
+ * @allow_noent: Do not throw an error if refspec does not exist
+ * @out_rev: (out) (transfer full): A checksum,or %NULL if @allow_noent is true and it does not exist
+ * @error:
+ *
+ * Look up the given refspec, returning the checksum it references in
+ * the parameter @out_rev.
+ */
 gboolean
 ostree_repo_resolve_rev (OstreeRepo     *self,
                          const char     *refspec,

src/libostree/ostree-repo-traverse.c

@@ -24,6 +24,7 @@
 
 #include "ostree.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 GHashTable *
 ostree_repo_traverse_new_reachable (void)

src/libostree/ostree-repo.c

@@ -22,12 +22,6 @@
 
 #include "config.h"
 
-#include "ostree-repo-private.h"
-#include "ostree-mutable-tree.h"
-#include "ostree-checksum-input-stream.h"
-#include "otutil.h"
-#include "ostree-repo-file-enumerator.h"
-
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 #include <glib/gstdio.h>
@@ -35,6 +29,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "ostree-repo-private.h"
+#include "ostree-mutable-tree.h"
+#include "ostree-checksum-input-stream.h"
+#include "otutil.h"
+#include "libgsystem.h"
+#include "ostree-repo-file-enumerator.h"
+
 typedef struct {
   GObjectClass parent_class;
 } OstreeRepoClass;
@@ -2292,6 +2293,11 @@ ostree_repo_load_variant_if_exists (OstreeRepo       *self,
 
 /**
  * ostree_repo_load_variant:
+ * @self:
+ * @objtype: Expected object type
+ * @sha256: Checksum string
+ * @out_variant: (out): (transfer full): Metadata object
+ * @error:
  * 
  * Load the metadata object @sha256 of type @objtype, storing the
  * result in @out_variant.

src/libostree/ostree-repo.h

@@ -164,7 +164,7 @@ gboolean      ostree_repo_stage_content_finish (OstreeRepo        *self,
 gboolean      ostree_repo_resolve_rev (OstreeRepo  *self,
                                        const char  *refspec,
                                        gboolean     allow_noent,
-                                       char       **out_resolved,
+                                       char       **out_rev,
                                        GError     **error);
 
 gboolean      ostree_repo_write_ref (OstreeRepo  *self,

src/libostree/ostree.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include <ostree-checksum-input-stream.h>
-#include <ostree-chain-input-stream.h>
 #include <ostree-core.h>
 #include <ostree-repo.h>
 #include <ostree-mutable-tree.h>

src/libotutil/otutil.h

@@ -24,6 +24,7 @@
 
 #include <gio/gio.h>
 #include <libgsystem.h>
+#include <string.h> /* Yeah...let's just do that here. */
 #include <gsystem-local-alloc.h>
 
 #define ot_gobject_refz(o) (o ? g_object_ref (o) : o)

src/ostree/ot-admin-builtin-cleanup.c

@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

src/ostree/ot-admin-builtin-deploy.c

@@ -27,6 +27,7 @@
 #include "ot-admin-deploy.h"
 #include "ot-ordered-hash.h"
 #include "ostree.h"
+#include "otutil.h"
 
 #include <glib/gi18n.h>
 

src/ostree/ot-admin-builtin-diff.c

@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

src/ostree/ot-admin-builtin-init-fs.c

@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

src/ostree/ot-admin-builtin-os-init.c

@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

src/ostree/ot-admin-builtin-status.c

@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

src/ostree/ot-admin-builtin-undeploy.c

@@ -20,13 +20,14 @@
 
 #include "config.h"
 
+#include <stdlib.h>
+
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ot-admin-deploy.h"
 #include "ot-ordered-hash.h"
 #include "ostree.h"
-
-#include <stdlib.h>
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }

src/ostree/ot-admin-builtin-upgrade.c

@@ -27,6 +27,7 @@
 #include "ot-admin-deploy.h"
 #include "ostree.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 #include <unistd.h>
 #include <stdlib.h>

src/ostree/ot-bootloader-syslinux.c

@@ -21,9 +21,9 @@
 #include "config.h"
 
 #include "ot-bootloader-syslinux.h"
-#include "libgsystem.h"
 #include "otutil.h"
 #include "ot-admin-functions.h"
+#include "libgsystem.h"
 
 #include <string.h>
 

src/ostree/ot-bootloader.c

@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "ot-bootloader.h"
+#include "libgsystem.h"
 
 G_DEFINE_INTERFACE (OtBootloader, ot_bootloader, G_TYPE_OBJECT)
 

src/ostree/ot-builtin-admin.c

@@ -28,6 +28,7 @@
 #include "ot-main.h"
 #include "ostree.h"
 #include "ostree-repo-file.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

src/ostree/ot-builtin-cat.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 #include <gio/gunixoutputstream.h>
 

src/ostree/ot-builtin-checkout.c

@@ -22,10 +22,12 @@
 
 #include "config.h"
 
+#include <string.h>
+#include <gio/gunixinputstream.h>
+
 #include "ot-builtins.h"
 #include "ostree.h"
-
-#include <gio/gunixinputstream.h>
+#include "otutil.h"
 
 static gboolean opt_user_mode;
 static gboolean opt_allow_noent;

src/ostree/ot-builtin-checksum.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static GOptionEntry options[] = {
   { NULL }

src/ostree/ot-builtin-commit.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static char *opt_subject;
 static char *opt_body;

src/ostree/ot-builtin-config.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }

src/ostree/ot-builtin-diff.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static gboolean opt_stats;
 static gboolean opt_fs_diff;

src/ostree/ot-builtin-fsck.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static gboolean opt_quiet;
 static gboolean opt_delete;

src/ostree/ot-builtin-init.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static gboolean opt_archive;
 static char *opt_mode = NULL;

src/ostree/ot-builtin-ls.c

@@ -25,6 +25,7 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 #include "ostree-repo-file.h"
+#include "otutil.h"
 
 static gboolean opt_dironly;
 static gboolean opt_recursive;

src/ostree/ot-builtin-prune.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static gboolean opt_no_prune;
 static gint opt_depth = -1;

src/ostree/ot-builtin-pull-local.c

@@ -27,6 +27,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static char *opt_remote;
 

src/ostree/ot-builtin-pull.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 gboolean opt_related;
 

src/ostree/ot-builtin-refs.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static gboolean opt_delete;
 

src/ostree/ot-builtin-remote.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }

src/ostree/ot-builtin-rev-parse.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }

src/ostree/ot-builtin-show.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static gboolean opt_print_related;
 static char* opt_print_variant_type;

src/ostree/ot-builtin-trivial-httpd.c

@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static char *opt_port_file = NULL;
 static gboolean opt_daemonize;

src/ostree/ot-builtin-write-refs.c

@@ -22,12 +22,13 @@
 
 #include "config.h"
 
-#include "ot-builtins.h"
-#include "ostree.h"
-
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 
+#include "ot-builtins.h"
+#include "ostree.h"
+#include "otutil.h"
+
 static GOptionEntry options[] = {
   { NULL }
 };

src/ostree/ot-deployment.c

@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "ot-deployment.h"
+#include "libgsystem.h"
 
 struct _OtDeployment
 {

src/ostree/ot-main.c

@@ -28,6 +28,7 @@
 
 #include "ot-main.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 int
 ostree_usage (char **argv,

src/ostree/ot-ordered-hash.c

@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "ot-ordered-hash.h"
+#include "libgsystem.h"
 
 OtOrderedHash *
 ot_ordered_hash_new (void)