Changeset 4ced41e

Timestamp:

Mar 15, 2016, 10:48:13 PM (9 years ago)

Author:

Karl Ramm <xyzzy-github@1ts.org>

Branches:

master, release-1.10

Children:

392b5cf

Parents:

39caad0 (diff), bc308eb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #156 from andersk/dist

scripts/do-release: Build distribution with ‘make distcheck’

Files:

• Makefile.am (modified) (3 diffs)
• scripts/dist-ignore (added)
• scripts/do-release (modified) (3 diffs)
• .travis.yml (modified) (2 diffs)
• cpanfile (added)
• filterproc.c (modified) (2 diffs)

Makefile.am

@@ -2 +2 @@
 
 GIT_DESCRIPTION := $(if $(wildcard $(srcdir)/.git),$(shell cd $(srcdir) && git describe --match='barnowl-*' HEAD 2>/dev/null))
-VERSION = $(if $(GIT_DESCRIPTION),$(GIT_DESCRIPTION:barnowl-%=%),@VERSION@)
--include BUILD_VERSION.mk
+VERSION = $(if $(GIT_DESCRIPTION),$(GIT_DESCRIPTION:barnowl-%=%),$(DIST_VERSION))
+DIST_VERSION = @VERSION@
+-include $(srcdir)/DIST_VERSION.mk BUILD_VERSION.mk
 
 FORCE:
 BUILD_VERSION.mk: $(if $(filter-out $(BUILD_VERSION),$(VERSION)),FORCE)
         echo 'BUILD_VERSION = $(VERSION)' > $@
+dist-hook:: $(if $(filter-out @VERSION@,$(VERSION)),dist-hook-version)
+dist-hook-version:
+        echo 'DIST_VERSION = $(VERSION)' > $(distdir)/DIST_VERSION.mk
 
 bin_PROGRAMS = bin/barnowl
@@ -14 +18 @@
 endif
 
-zcrypt_SOURCES = zcrypt.c filterproc.c version.c
+zcrypt_SOURCES = zcrypt.c filterproc.c
+nodist_zcrypt_SOURCES = version.c
 
 check_PROGRAMS = bin/tester
@@ -104 +109 @@
 
 CLEANFILES = $(BUILT_SOURCES) $(GEN_C) $(noinst_SCRIPTS) $(check_SCRIPTS) BUILD_VERSION.mk
+MAINTAINERCLEANFILES = DIST_VERSION.mk
 EXTRA_DIST = \
     autogen.sh \

scripts/do-release

@@ -1 @@
-#!/bin/sh -e
+#!/bin/bash
+set -eu
 
 die() {
@@ -55 +56 @@
 fi
 
+[ -e Makefile.in ] || autoreconf -fvi
+[ -e config.status ] || ./configure
+make -j4 distcheck VERSION="$VERS"
+
+echo 'Checking distributed files against Git:'
+if comm -3 <(tar -tzf "$TAG.tar.gz" | grep -v '/$' | sed "s%^$TAG/%%" | sort) \
+    <(git ls-files | sort) | grep -vxf scripts/dist-ignore; then
+    echo
+    echo 'Error: Please fix Makefile.am and/or scripts/dist-ignore.'
+    exit 1
+fi
+echo 'ok'
+
+mv "$TAG.tar.gz" "$TGZ.tgz"
+
 if ! [ "$no_tag" ]; then
     if git cat-file -t "$TAG" > /dev/null 2>&1; then
@@ -65 +81 @@
 fi
 
-exittrap() { :; }
-for sig in 1 2 13 15; do trap "exit $(($sig + 128))" $sig; done
-trap 'exittrap' EXIT
-
-TMPDIR=$(mktemp -d /tmp/barnowl.XXXXXX)
-
-exittrap() { rm -rf "$TMPDIR"; }
-
-git archive --format=tar --prefix="$TGZ/" "$TAG" | tar -x -C "$TMPDIR"
-
-CODIR=$(pwd)
-cd "$TMPDIR/$TGZ"
-[ "$git" ] && perl -i -pe 's{^(AC_INIT\(\[[^\]]+\],\s*)\[([^\]]+)\]}{${1}['$VERS']}' configure.ac
-autoreconf -fvi
-rm -r autom4te.cache/
-cd "$TMPDIR"
-tar czvf "$TGZ.tgz" "$TGZ"
-cd "$CODIR"
-
-mv "$TMPDIR/$TGZ.tgz" .
-rm -rf "$TMPDIR"
-
-exittrap() { :; }
-
-echo "Created release tarball for BarnOwl $VERS in $(pwd)"
+echo "Created release tarball for BarnOwl $VERS at $(pwd)/$TGZ.tgz"
 echo "Remember to bump OWL_VERSION_STRING for future development."
 

.travis.yml

@@ -1 @@
-
 language: perl
+sudo: false
 compiler:
   - clang
@@ -11 +11 @@
   - "5.18"
   - "5.20"
-install:
-  - sudo apt-get update -q
-# we actually want debhelper >= 7, libperl-dev >= 5.10.1-8, libzephyr-dev >= 3.0~beta
-  - sudo apt-get install -q autoconf autotools-dev debhelper dh-autoreconf libglib2.0-dev libkrb5-dev libncurses5-dev libncursesw5-dev libssl-dev libzephyr-dev pkg-config zip
+addons:
+  apt:
+    # we actually want debhelper >= 7, libperl-dev >= 5.10.1-8, libzephyr-dev >= 3.0~beta
+    packages:
+    - autoconf
+    - autotools-dev
+    - debhelper
+    - dh-autoreconf
+    - libglib2.0-dev
+    - libkrb5-dev
+    - libncurses5-dev
+    - libncursesw5-dev
+    - libssl-dev
+    - libzephyr-dev
+    - pkg-config
+    - zip
 # perl things
 # In lp:~barnowl/barnowl/packaging, we use apt-get.  Here, we use cpanm.
 #  - sudo apt-get install libanyevent-perl libclass-accessor-perl libextutils-depends-perl libglib-perl libmodule-install-perl libnet-twitter-lite-perl libpar-perl libperl-dev
-  - cpanm AnyEvent Class::Accessor ExtUtils::Depends Glib Module::Install Net::Twitter::Lite PAR
-script: "./autogen.sh && ./configure && make distcheck"
+# It's taken care of by the default install script
+script: ./autogen.sh && ./configure && make distcheck

filterproc.c

@@ -1 +1 @@
 #include "filterproc.h"
 #include <sys/wait.h>
-#include <fcntl.h>
+#include <string.h>
 #include <glib.h>
-#include <poll.h>
-#include <string.h>
-#include <unistd.h>
 
-/* Even in case of error, send_receive is responsible for closing wfd
- * (to EOF the child) and rfd (for consistency). */
-static int send_receive(int rfd, int wfd, const char *out, char **in)
+struct filter_data {
+  const char **in;
+  const char *in_end;
+  GString *out_str;
+  GMainLoop *loop;
+  int err;
+};
+
+static gboolean filter_stdin(GIOChannel *channel, GIOCondition condition, gpointer data_)
 {
-  GString *str = g_string_new("");
-  char buf[1024];
-  nfds_t nfds;
-  int err = 0;
-  struct pollfd fds[2];
+  struct filter_data *data = data_;
+  gboolean done = condition & (G_IO_ERR | G_IO_HUP);
 
-  fcntl(rfd, F_SETFL, O_NONBLOCK | fcntl(rfd, F_GETFL));
-  fcntl(wfd, F_SETFL, O_NONBLOCK | fcntl(wfd, F_GETFL));
-
-  fds[0].fd = rfd;
-  fds[0].events = POLLIN;
-  fds[1].fd = wfd;
-  fds[1].events = POLLOUT;
-
-  if(!out || !*out) {
-    /* Nothing to write. Close our end so the child doesn't hang waiting. */
-    close(wfd); wfd = -1;
-    out = NULL;
+  if (condition & G_IO_OUT) {
+    gsize n;
+    GIOStatus ret = g_io_channel_write_chars(channel, *data->in, data->in_end - *data->in, &n, NULL);
+    *data->in += n;
+    if (ret == G_IO_STATUS_ERROR)
+      data->err = 1;
+    if (ret == G_IO_STATUS_ERROR || *data->in == data->in_end)
+      done = TRUE;
   }
 
-  while(1) {
-    if(out && *out) {
-      nfds = 2;
-    } else {
-      nfds = 1;
-    }
-    err = poll(fds, nfds, -1);
-    if(err < 0) {
-      break;
-    }
-    if(out && *out) {
-      if(fds[1].revents & POLLOUT) {
-        err = write(wfd, out, strlen(out));
-        if(err > 0) {
-          out += err;
-        }
-        if(err < 0) {
-          out = NULL;
-        }
-      }
-      if(!out || !*out || fds[1].revents & (POLLERR | POLLHUP)) {
-        close(wfd); wfd = -1;
-        out = NULL;
-      }
-    }
-    if(fds[0].revents & POLLIN) {
-      err = read(rfd, buf, sizeof(buf));
-      if(err <= 0) {
-        break;
-      }
-      g_string_append_len(str, buf, err);
-    } else if(fds[0].revents & (POLLHUP | POLLERR)) {
-      err = 0;
-      break;
+  if (condition & G_IO_ERR)
+    data->err = 1;
+
+  if (done)
+    g_io_channel_shutdown(channel, TRUE, NULL);
+  return !done;
+}
+
+static gboolean filter_stdout(GIOChannel *channel, GIOCondition condition, gpointer data_)
+{
+  struct filter_data *data = data_;
+  gboolean done = condition & (G_IO_ERR | G_IO_HUP);
+
+  if (condition & (G_IO_IN | G_IO_HUP)) {
+    gchar *buf;
+    gsize n;
+    GIOStatus ret = g_io_channel_read_to_end(channel, &buf, &n, NULL);
+    g_string_append_len(data->out_str, buf, n);
+    g_free(buf);
+    if (ret == G_IO_STATUS_ERROR) {
+      data->err = 1;
+      done = TRUE;
     }
   }
 
-  if (wfd >= 0) close(wfd);
-  close(rfd);
-  *in = g_string_free(str, err < 0);
-  return err;
+  if (condition & G_IO_ERR)
+    data->err = 1;
+
+  if (done) {
+    g_io_channel_shutdown(channel, TRUE, NULL);
+    g_main_loop_quit(data->loop);
+  }
+  return !done;
 }
 
 int call_filter(const char *const *argv, const char *in, char **out, int *status)
 {
-  int err;
   GPid child_pid;
   int child_stdin, child_stdout;
@@ -89 +76 @@
   }
 
-  err = send_receive(child_stdout, child_stdin, in, out);
-  if (err == 0) {
-    waitpid(child_pid, status, 0);
-  }
-  return err;
+  if (in == NULL) in = "";
+  GMainContext *context = g_main_context_new();
+  struct filter_data data = {&in, in + strlen(in), g_string_new(""), g_main_loop_new(context, FALSE), 0};
+
+  GIOChannel *channel = g_io_channel_unix_new(child_stdin);
+  g_io_channel_set_encoding(channel, NULL, NULL);
+  g_io_channel_set_flags(channel, g_io_channel_get_flags(channel) | G_IO_FLAG_NONBLOCK, NULL);
+  GSource *source = g_io_create_watch(channel, G_IO_OUT | G_IO_ERR | G_IO_HUP);
+  g_io_channel_unref(channel);
+  g_source_set_callback(source, (GSourceFunc)filter_stdin, &data, NULL);
+  g_source_attach(source, context);
+  g_source_unref(source);
+
+  channel = g_io_channel_unix_new(child_stdout);
+  g_io_channel_set_encoding(channel, NULL, NULL);
+  g_io_channel_set_flags(channel, g_io_channel_get_flags(channel) | G_IO_FLAG_NONBLOCK, NULL);
+  source = g_io_create_watch(channel, G_IO_IN | G_IO_ERR | G_IO_HUP);
+  g_io_channel_unref(channel);
+  g_source_set_callback(source, (GSourceFunc)filter_stdout, &data, NULL);
+  g_source_attach(source, context);
+  g_source_unref(source);
+
+  g_main_loop_run(data.loop);
+
+  g_main_loop_unref(data.loop);
+  g_main_context_unref(context);
+
+  waitpid(child_pid, status, 0);
+  g_spawn_close_pid(child_pid);
+  *out = g_string_free(data.out_str, data.err);
+  return data.err;
 }