Changeset 568

Timestamp:

Mar 12, 2008, 11:08:49 PM (16 years ago)

Author:

Peter Johansson

Message:

using AC_CONFIG_FILES to create shell scripts from *.in files.

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/check_repo_status.sh.in (modified) (1 diff)
• test/test_repo.sh.in (modified) (2 diffs)

trunk/Makefile.am

@@ -27 +27 @@
 clean-local: 
   rm -rf svndigest *~
+
+bajs.in: kiss
+  cp kiss bajs.in

trunk/configure.ac

@@ -40 +40 @@
 test $prefix = NONE && prefix=/usr/local
 
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([std-options check-news])
 
@@ -157 +157 @@
                 bin/Makefile
                 lib/Makefile
-                test/Makefile])
+                test/Makefile
+                test/test_repo.sh 
+                test/check_repo_status.sh], 
+               [chmod +x test/test_repo.sh; 
+                chmod +x test/check_repo_status.sh])
 
 # Print failure status information about selected items, and exit if

trunk/test/Makefile.am

@@ -49 +49 @@
 
 toy_project = toy_project
-
-# some tests need the test repo to be checked out
-stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
-
 rootdir = $(abs_srcdir)/$(toy_project)
 targetdir = $(abs_builddir)/generated_output
 repodir = $(abs_srcdir)/repo/trunk
 
-do_subst = $(SED) -e 's,%SHELL%,$(SHELL),g' \
-            -e 's,%SED%,$(SED),g' \
-            -e 's,%DISTFILES%,$(DISTFILES),g' \
-            -e 's,%GREP%,$(GREP),g' \
-            -e 's,%abs_srcdir%,$(abs_srcdir),g' \
-            -e 's,%repodir%,$(repodir),g' \
-            -e 's,%rootdir%,$(rootdir),g' \
-            -e 's,%targetdir%,$(targetdir),g' \
-            -e 's,%abs_top_builddir%,$(abs_top_builddir),g' 
 
-
-check_repo_status.sh: check_repo_status.sh.in Makefile
-  @$(do_subst) < $< > $@
-  @chmod +x $@
-  @echo creating $@
-
-test_repo.sh: test_repo.sh.in Makefile $(toy_project)
-  @$(do_subst) < $< > $@
-  @chmod +x $@
-  @echo creating $@
+# some tests need the test repo to be checked out
+stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
 
 $(toy_project):
@@ -84 +63 @@
 clean-local: 
   rm -rf *.png *.tmp *~ check_repo_status.sh test_repo.sh \
-  $(targetdir)  
+  $(targetdir)

trunk/test/check_repo_status.sh.in

@@ -1 @@
-#!%SHELL%
+#!@SHELL@
+# @configure_input@
+
 # $Id$
 

trunk/test/test_repo.sh.in

@@ -1 @@
-#!%SHELL%
+#!@SHELL@
+# @configure_input@
+
 # $Id$
 
 # Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+# Copyright (C) 2008 Peter Johansson
 #
 # This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -21 +24 @@
 # 02111-1307, USA.
 
-svn update %rootdir% > /dev/null;
+rootdir=@abs_srcdir@/toy_project
+targetdir=@abs_builddir@/generated_output
+repodir=@abs_srcdir@/repo/trunk
 
-if [ ! -d %targetdir% ]; then
-    mkdir %targetdir%;
+svn update $rootdir > /dev/null;
+
+if [ ! -d $targetdir ]; then
+    mkdir $targetdir;
 fi
 
-%abs_top_builddir%/bin/svndigest -r %rootdir% -t %targetdir% -f \
+@abs_top_builddir@/bin/svndigest -r $rootdir -t $targetdir -f \
 --ignore-cache --no-report $1;
 
-%abs_top_builddir%/bin/svndigest -r %rootdir% -t %targetdir% -f --copyright $1;
+@abs_top_builddir@/bin/svndigest -r $rootdir -t $targetdir -f --copyright $1;