Author: sebor
Date: Thu May 15 09:34:55 2008
New Revision: 656725
URL: http://svn.apache.org/viewvc?rev=656725&view=rev
Log:
2008-05-15 Martin Sebor <[EMAIL PROTECTED]>
* bin/xbuildgen (mydir, rootdir): Added global constants defined
to the name of the directory the script is located in (assuming
it's invoked using a relative pathname) and the root directory
of the stdcxx source tree.
(xcomp): Defined relative to rootdir instead of using $HOME and
invoked directly instead of passing the name of the awk script
as an argument to awk.
* bin/xcomp.awk: Allowed script to be invoked directly.
Modified:
stdcxx/branches/4.2.x/bin/xbuildgen
stdcxx/branches/4.2.x/bin/xcomp.awk
Modified: stdcxx/branches/4.2.x/bin/xbuildgen
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/bin/xbuildgen?rev=656725&r1=656724&r2=656725&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/bin/xbuildgen (original)
+++ stdcxx/branches/4.2.x/bin/xbuildgen Thu May 15 09:34:55 2008
@@ -86,6 +86,12 @@
# set program name (used in diagnostic messages)
readonly myname=`basename $0`
+# the directory where the script is located to get a hold of other
+# files at locations relative to this one (assumes the script resides
+# within the stdcxx source tree)
+readonly mydir=`dirname $0`
+readonly rootdir=$mydir/..
+
readonly today=`LC_ALL="C" date`
# URL to the ViewVC directory
@@ -98,7 +104,10 @@
readonly svnpath="$viewvc/stdcxx/trunk"
# expected failures
-readonly xfailfile=$HOME/stdcxx/etc/config/xfail.txt
+readonly xfailfile=$rootdir/etc/config/xfail.txt
+
+# xcross-component awk script
+readonly xcomp=$mydir/xcomp.awk
######################################################################
# global variables
@@ -931,11 +940,6 @@
######################################################################
-# xcross-component script
-xcomp=$HOME/stdcxx/bin/xcomp.awk
-
-######################################################################
-
# check to see
if [ -r $xfailfile ]; then
xfails=$xfailfile
@@ -943,7 +947,7 @@
xfails=""
fi
-awk -f $xcomp bodyonly=1 logdir=$logdir $xfails $textlogs | output
+$xcomp bodyonly=1 logdir=$logdir $xfails $textlogs | output
######################################################################
# output the rest of the HTML file
Modified: stdcxx/branches/4.2.x/bin/xcomp.awk
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/bin/xcomp.awk?rev=656725&r1=656724&r2=656725&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/bin/xcomp.awk (original)
+++ stdcxx/branches/4.2.x/bin/xcomp.awk Thu May 15 09:34:55 2008
@@ -1,4 +1,4 @@
-#!/bin/awk
+#!/usr/bin/awk -f
#
# $Id$
#
