From afe9f62c8b03f18b1b7c29081dc63a3d306c3a8f Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Tue, 12 Sep 2006 18:08:19 +0000 Subject: [PATCH] Match distdefs exactly. --- apps/autodist/CHANGES | 4 ++-- apps/autodist/autodist.in | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES index 163b58a..29702ee 100644 --- a/apps/autodist/CHANGES +++ b/apps/autodist/CHANGES @@ -1,6 +1,6 @@ -Wed Nov 16 17:53:55 EET 2005 Pekka Riikonen +Sat Jun 24 23:38:24 EEST 2006 Pekka Riikonen - * Don't try to log with -s option. + * Match distdef names exactly (/^foo$/ instead of /^foo/). Wed May 4 10:58:24 EEST 2005 Pekka Riikonen diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in index 8ecb68d..8b30e67 100755 --- a/apps/autodist/autodist.in +++ b/apps/autodist/autodist.in @@ -1554,9 +1554,9 @@ ad_process_file() # This also handles the #ifdef's #else (ie. #ifndef) branch. if test x$found = xfalse; then ad_debug "ifdef $d will be excluded (it is NOT defined)" - echo "/^#ifdef $d/,/^#else !$d|^#endif $d/ { next; }" >> $f + echo "/^#ifdef $d$/,/^#else !$d$|^#endif $d$/ { next; }" >> $f else - echo "/^#else !$d/,/^#endif $d/ { next; }" >> $f + echo "/^#else !$d$/,/^#endif $d$/ { next; }" >> $f fi done @@ -1577,9 +1577,9 @@ ad_process_file() # This also handles the #ifndef's #else (ie. #ifdef) branch. if test x$found = xtrue; then ad_debug "ifndef $d will be excluded (it IS defined)" - echo "/^#ifndef $d/,/^#else $d|^#endif $d/ { next; }" >> $f + echo "/^#ifndef $d$/,/^#else $d$|^#endif $d$/ { next; }" >> $f else - echo "/^#else $d/,/^#endif $d/ { next; }" >> $f + echo "/^#else $d$/,/^#endif $d$/ { next; }" >> $f fi done @@ -1665,9 +1665,9 @@ ad_process_source_file() # This also handles the #ifdef's #else (ie. #ifndef) branch. if test x$found = xfalse; then ad_debug "ifdef $d will be excluded (it is NOT defined)" - echo "/^#ifdef $d/,/^#else \/\* \!$d|^#endif \/\* $d/ { next; }" >> $f + echo "/^#ifdef $d$/,/^#else \/\* \!$d |^#endif \/\* $d / { next; }" >> $f else - echo "/^#else \/\* \!$d/,/^#endif \/\* $d/ { next; }" >> $f + echo "/^#else \/\* \!$d /,/^#endif \/\* $d / { next; }" >> $f fi done @@ -1688,9 +1688,9 @@ ad_process_source_file() # This also handles the #ifndef's #else (ie. #ifdef) branch. if test x$found = xtrue; then ad_debug "ifndef $d will be excluded (it IS defined)" - echo "/^#ifndef $d/,/^#else \/\* $d|^#endif \/\* $d/ { next; }" >> $f + echo "/^#ifndef $d$/,/^#else \/\* $d |^#endif \/\* $d / { next; }" >> $f else - echo "/^#else \/\* $d/,/^#endif \/\* $d/ { next; }" >> $f + echo "/^#else \/\* $d /,/^#endif \/\* $d / { next; }" >> $f fi done @@ -1871,7 +1871,6 @@ while test $# -gt 0; do -s | --distdefs) shift; - nolog=true if test $# -eq 0; then ad_parse_distribution $distribution false echo "Distribution: ${distribution}" 1>&2; -- 2.24.0