From 0b6d8fdc28ed8af56e93157179c305fef037e0a0 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 27 Mar 2009 14:03:03 -0700 Subject: allow building against uninstalled guile; move some things to meta/ * README: Add more info about building against an uninstalled Guile. * meta/: New directory. The proximate cause of its creation is that I want to be able to build external packages against uninstalled Guile, and to do that I need guile-tools in the PATH, but I don't want $top_builddir/libtool in the path. But it seems like a good reorganization, for things that are /about/ Guile: pkg-config files, m4 files, guile-config... then we also include uninstalled info: the environment, the pre-inst-guile script, etc. * meta/guile-1.8-uninstalled.pc.in: New pkg-config template. pkg-config prefers -uninstalled pkg-config files, if they are in its path. * meta/Makefile.am: * meta/ChangeLog-2008: * meta/gdb-uninstalled-guile.in: * meta/guile-1.8.pc.in: * meta/guile-config.in: * meta/guile.m4: * meta/guile-tools.in: Moved to meta/. * meta/guile.in: This is the new name of pre-inst-guile.in. * meta/uninstalled-env.in: And this, pre-inst-guile-env.in. * Makefile.am: * am/guilec: * am/pre-inst-guile: * check-guile.in: * configure.in: * doc/ref/Makefile.am: * gc-benchmarks/run-benchmark.scm: * test-suite/standalone/Makefile.am: * test-suite/standalone/README: * testsuite/Makefile.am: Adapt to meta/ change. --- check-guile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'check-guile.in') diff --git a/check-guile.in b/check-guile.in index 9ee2ea3f6..1c0101275 100644 --- a/check-guile.in +++ b/check-guile.in @@ -1,6 +1,6 @@ #! /bin/sh # Usage: check-guile [-i GUILE-INTERPRETER] [GUILE-TEST-ARGS] -# If `-i GUILE-INTERPRETER' is omitted, use ${top_builddir}/pre-inst-guile. +# If `-i GUILE-INTERPRETER' is omitted, use ${top_builddir}/meta/guile. # See ${top_srcdir}/test-suite/guile-test for documentation on GUILE-TEST-ARGS. # # Example invocations: @@ -21,7 +21,7 @@ if [ x"$1" = x-i ] ; then shift shift else - guile=${top_builddir}/pre-inst-guile + guile=${top_builddir}/meta/guile fi GUILE_LOAD_PATH=$TEST_SUITE_DIR -- cgit v1.2.1 From 23ccb831ff1565072a1977d5fbc1f98aed388e57 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 27 Mar 2009 15:51:16 -0700 Subject: rely on getrlimit to DTRT, don't make stack calibration file * libguile/measure-hwm.scm: Remove. * .gitignore: Update for removal. * test-suite/standalone/test-fast-slot-ref.in: * test-suite/standalone/test-use-srfi.in: * am/guilec: * check-guile.in: Revert back to normal guile invocation. * libguile/Makefile.am: Don't make a stack calibration file, as the getrlimit-based limit setting should work fine. --- check-guile.in | 1 - 1 file changed, 1 deletion(-) (limited to 'check-guile.in') diff --git a/check-guile.in b/check-guile.in index 1c0101275..3162fa6fc 100644 --- a/check-guile.in +++ b/check-guile.in @@ -41,7 +41,6 @@ if [ ! -f guile-procedures.txt ] ; then fi exec $guile \ - -l ${top_builddir}/libguile/stack-limit-calibration.scm \ -e main -s "$TEST_SUITE_DIR/guile-test" \ --test-suite "$TEST_SUITE_DIR/tests" \ --log-file check-guile.log "$@" -- cgit v1.2.1 From 609edba7eaa2bb30df90a09541a48d97ab4a3bf8 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 20 Aug 2009 18:46:09 +0200 Subject: disable autocompilation in the test suite * check-guile.in: Disable autocompilation while working in the test suite, for now at least. We'll enable it again later. --- check-guile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'check-guile.in') diff --git a/check-guile.in b/check-guile.in index 3162fa6fc..dde51b37d 100644 --- a/check-guile.in +++ b/check-guile.in @@ -41,7 +41,7 @@ if [ ! -f guile-procedures.txt ] ; then fi exec $guile \ - -e main -s "$TEST_SUITE_DIR/guile-test" \ + --no-autocompile -e main -s "$TEST_SUITE_DIR/guile-test" \ --test-suite "$TEST_SUITE_DIR/tests" \ --log-file check-guile.log "$@" -- cgit v1.2.1