* guile-gnome, devel: fix make distcheck
@ 2015-06-02 14:17 David Pirotte
0 siblings, 0 replies; only message in thread
From: David Pirotte @ 2015-06-02 14:17 UTC (permalink / raw)
To: guile-devel
[-- Attachment #1: Type: text/plain, Size: 107 bytes --]
Hello,
guile-gnome
devel: fix make distcheck
Patch attached, review welcome...
Happy hacking,
David
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-fix-make-distcheck.patch --]
[-- Type: text/x-patch, Size: 7731 bytes --]
From e9b37df5d73ed54662047e4f9a5597e12032168d Mon Sep 17 00:00:00 2001
From: David Pirotte <david@altosw.be>
Date: Tue, 2 Jun 2015 11:12:11 -0300
Subject: [PATCH] fix make distcheck
* tests.mk: Adding GUILE_FLAGS, TESTS_ENVIRONMENT to use
$(SCM_LOG_COMPILER), plus some other [cosmetic] changes.
* glib/test-suite/Makefile.am: (a) Adding a license header, (b) using
$(top_srcdir)/tests.mk, removing defs that are in tests.mk,
redefining TESTS_ENVIRONMENT [specific to glib only], some other
[cosmetic] changes.
* NEWS: Updated wrt the above fix, bumping the date.
---
NEWS | 12 ++++---
glib/test-suite/Makefile.am | 83 ++++++++++++++++++++++++++++-----------------
tests.mk | 22 ++++++++----
3 files changed, 75 insertions(+), 42 deletions(-)
diff --git a/NEWS b/NEWS
index ce9aa75..7b1c67e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
guile-gnome-platform NEWS --- history of user-visible changes.
-Copyright (C) 2004,2005,2006,2007,2008,2011,2012 Free Software Foundation, Inc.
+
+
+Copyright (C) 2004-2008, 2011-2012, 2014-2015
+Free Software Foundation, Inc.
See the end for copying conditions of this file.
@@ -7,7 +10,7 @@ guile-gnome-platform is a binding between Guile Scheme and the Gnome
stack of libraries. See the README, for more information.
-guile-gnome-platform 2.16.3 - David Pirotte, 2014-10-08
+guile-gnome-platform 2.16.3 - David Pirotte, 2015-06-02
=======================================================
The primary objectives, working towards this release, were (1) to
@@ -25,8 +28,9 @@ None 'specific' changes
* Toplevel calls moved into an eval-when conditions exp...
-* make check has been fixed to work with recent automake versions
- [thanks to Ludovic Courtés]
+* make check and make distcheck both have been fixed to work with
+ recent automake versions [thanks to Ludovic Courtés for his help wrt
+ to make check]
corba
-----
diff --git a/glib/test-suite/Makefile.am b/glib/test-suite/Makefile.am
index 1ea349e..cfdedc1 100644
--- a/glib/test-suite/Makefile.am
+++ b/glib/test-suite/Makefile.am
@@ -1,4 +1,27 @@
+# guile-gnome
+
+# Copyright (C) 2007, 2011, 2015
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact:
+
+# Free Software Foundation Voice: +1-617-542-5942
+# 59 Temple Place - Suite 330 Fax: +1-617-542-2652
+# Boston, MA 02111-1307, USA gnu@gnu.org
+
include $(top_srcdir)/common.mk
+include $(top_srcdir)/tests.mk
noinst_LTLIBRARIES = libgw-guile-test-gobject.la libgw-guile-test-glib.la
@@ -22,9 +45,16 @@ noinst_HEADERS = test-gobject.h test-glib.h
SCM_TESTS = gobject.test gw-gobject.test
-EXTRA_DIST = lib.scm exceptions.scm gw-test-gobject-spec.scm \
- gw-test-glib-spec.scm test-gobject.defs test-glib.defs \
- guile-test-env guile-gobject-test $(SCM_TESTS)
+EXTRA_DIST+= \
+ lib.scm \
+ exceptions.scm \
+ gw-test-gobject-spec.scm \
+ gw-test-glib-spec.scm \
+ test-gobject.defs \
+ test-glib.defs \
+ guile-test-env \
+ guile-gobject-test \
+ $(SCM_TESTS)
CLEANFILES = $(wildcard gnome-*.log test-*.log) \
$(wildcard gw-test-gobject.* gw-test-glib.*) \
@@ -32,23 +62,15 @@ CLEANFILES = $(wildcard gnome-*.log test-*.log) \
wrapset_stem = glib
-top_module_name = (gnome $(wrapset_stem))
-gw_module_name = (gnome gw $(wrapset_stem))
-extra_module_names =
-wrapset_modules = ($(top_module_name) $(gw_module_name) $(extra_module_names))
-DEV_ENV = $(top_builddir)/dev-environ
-GUILE=guile
-
-TESTS_ENVIRONMENT=\
- API_FILE=$(srcdir)/gobject.api \
- DOC_SCM=$(srcdir)/../doc/gobject/guile-gnome-gobject.scm \
- WRAPSET_MODULES="$(wrapset_modules)" \
- WRAPSET_API_FILE=$(srcdir)/wrapset.api \
- LTDL_LIBRARY_PATH=.:${LTDL_LIBRARY_PATH} \
- GUILE_LOAD_PATH=".:${srcdir:-.}/..:..:${GUILE_LOAD_PATH}" \
- $(DEV_ENV)
-SCM_LOG_COMPILER = $(GUILE) $(GUILE_FLAGS) -e main -s
-TEST_EXTENSIONS = .scm
+# it is not possible to prepend a previously defined variable
+# so we redefine it [see $(top_srcdir)/tests.mk]
+TESTS_ENVIRONMENT = \
+ API_FILE=$(srcdir)/gobject.api \
+ DOC_SCM=$(srcdir)/../doc/gobject/guile-gnome-gobject.scm \
+ $(WRAPSET_TESTS_ENV) \
+ LTDL_LIBRARY_PATH=.:${LTDL_LIBRARY_PATH} \
+ GUILE_LOAD_PATH=".:${srcdir:-.}/..:..:${GUILE_LOAD_PATH}" \
+ $(DEV_ENV) $(SCM_LOG_COMPILER)
script := '(load (getenv "DOC_SCM"))\
(for-each \
@@ -61,24 +83,21 @@ gobject.api.update:
$(shell DOC_SCM=$(srcdir)/../doc/gobject/guile-gnome-gobject.scm \
guile -c $(script)) > $(srcdir)/gobject.api
-wrapset.api.update:
- WRAPSET_MODULES="$(wrapset_modules)" \
- WRAPSET_API_FILE=$(srcdir)/wrapset.api \
- $(top_builddir)/dev-environ guile --debug -e update-api -s $(srcdir)/wrapset.scm
-
%.check: %
$(TESTS_ENVIRONMENT) $(srcdir)/$*
-EXTRA_DIST+=gobject.api api.scm wrapset.api wrapset.scm
+EXTRA_DIST+= \
+ gobject.api \
+ api.scm
-TESTS = guile-gobject-test \
- api.scm \
- wrapset.scm
+TESTS+= \
+ guile-gobject-test \
+ api.scm
gw-test-%.scm gw-test-%.c: gw-test-%-spec.scm
echo GLP=$(GUILE_LOAD_PATH)
guile $(GUILE_FLAGS) -c \
- "(use-modules (g-wrap)) \
- (use-modules (g-wrap guile)) \
- (use-modules (gw-test-$*-spec)) \
+ "(use-modules (g-wrap) \
+ (g-wrap guile) \
+ (gw-test-$*-spec)) \
(generate-wrapset 'guile 'test-$* \"gw-test-$*\")"
diff --git a/tests.mk b/tests.mk
index 017ca8c..d9a1e98 100644
--- a/tests.mk
+++ b/tests.mk
@@ -1,5 +1,5 @@
# guile-gnome
-# Copyright (C) 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2011, 2015 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -22,7 +22,9 @@
#
# Makefile snippet
#
-EXTRA_DIST = wrapset.api wrapset.scm
+EXTRA_DIST = \
+ wrapset.api \
+ wrapset.scm
wrapset_stem = set-wrapset_stem-in-your-makefile
@@ -30,16 +32,24 @@ top_module_name = (gnome $(wrapset_stem))
gw_module_name = (gnome gw $(wrapset_stem))
extra_module_names =
wrapset_modules = ($(top_module_name) $(gw_module_name) $(extra_module_names))
-WRAPSET_TESTS_ENV = WRAPSET_MODULES="$(wrapset_modules)" WRAPSET_API_FILE=$(srcdir)/wrapset.api
+
+WRAPSET_TESTS_ENV = \
+ WRAPSET_MODULES="$(wrapset_modules)" \
+ WRAPSET_API_FILE=$(srcdir)/wrapset.api
+
DEV_ENV = $(top_builddir)/dev-environ
GUILE = guile
-
-TESTS_ENVIRONMENT=$(WRAPSET_TESTS_ENV) $(DEV_ENV)
+GUILE_FLAGS = --debug
SCM_LOG_COMPILER = $(GUILE) $(GUILE_FLAGS) -e main -s
+
+TESTS_ENVIRONMENT = \
+ $(WRAPSET_TESTS_ENV) $(DEV_ENV) $(SCM_LOG_COMPILER)
+
TEST_EXTENSIONS = .scm
wrapset.api.update:
- $(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) -e update-api -s $(srcdir)/wrapset.scm
+ $(WRAPSET_TESTS_ENV) $(DEV_ENV) \
+ $(GUILE) $(GUILE_FLAGS) -e update-api -s $(srcdir)/wrapset.scm
%.check: %
$(TESTS_ENVIRONMENT) $(srcdir)/$*
--
2.1.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-02 14:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-02 14:17 guile-gnome, devel: fix make distcheck David Pirotte
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).