fname=$DISTDEFS
rm -f $fname
- echo "/*" > $fname
- echo " Automatically generated by Autodist $ver. Do not edit." >> $fname
- echo >> $fname
- echo " Generated: `date` by `whoami`" >> $fname
- echo " Distribution: $distribution" >> $fname
- echo " License: $license" >> $fname
- echo "*/" >> $fname
- echo >> $fname
- echo "#ifndef _"$DP"_DISTDEFS_H" >> $fname
- echo "#define _"$DP"_DISTDEFS_H" >> $fname
- echo >> $fname
+ cat > $fname <<EOF
+/*
+ Automatically generated by Autodist $ver. Do not edit.
+
+ Generated: `date` by `whoami`
+ Distribution: $distribution
+ License: $license
+*/
+
+#ifndef _`echo $DP`_DISTDEFS_H
+#define _`echo $DP`_DISTDEFS_H
+
+EOF
for i in $distdefs
do
echo "#define $i 1" >>$fname
done
- echo >> $fname
- echo "#endif /* _"$DP"_DISTDEFS_H */" >> $fname
+ cat >> $fname <<EOF
+#endif /* _`echo $DP`_DISTDEFS_H */
+EOF
ad_debug "<ad_create_distdefs_h"
}
ad_fatal "The configure file '$1' does not exist"
fi
- check="`cat $1 | sed 's/^[ ]*//' | grep -v "^#" | grep -e "AD_INIT"`"
+ check="`sed 's/^[ ]*//' < $1 | grep -v "^#" | grep -e "AD_INIT"`"
if test -z $check; then
rm -f configure.ad.cfs
rm -f $fname $fname.tmp
done
if test -f configure.ad.cfs; then
- check="`cat $1 | sed 's/^[ ]*//' | grep -v "^#" | grep -e "AD_INCLUDE_CONFIGURE"`"
+ check="`sed 's/^[ ]*//' < $1 | grep -v "^#" | grep -e "AD_INCLUDE_CONFIGURE"`"
if test -z $check; then
rm -f configure.ad.cfs
ad_warning "configure.ad fragments found but 'AD_INCLUDE_CONFIGURE' is not set"
# Header for configure.ac
fname="configure.tmp.ac"
- echo "# Automatically generated by Autodist $ver. Do not edit." > $fname
- echo "# To make changes edit the configure.ad file in the source tree." >> $fname
- echo >> $fname
- echo "# Source: configure.ad" >> $fname
- echo "# Generated: `date` by `whoami`" >> $fname
- echo "# Distribution: $distribution" >> $fname
- echo "# License: $license" >> $fname
- echo >> $fname
+ cat > $fname <<EOF
+# Automatically generated by Autodist $ver. Do not edit.
+# To make changes edit the configure.ad file in the source tree.
+
+# Source: configure.ad
+# Generated: `date` by `whoami`
+# Distribution: $distribution
+# License: $license
+
+EOF
ad_debug "creating configure.ac"
if test -f configure.ad.cfs; then
# Remove any trailing backslashes
if test -f "$fname"; then
- cat $fname | sed -e :a -e '/\\$/N; s/[ ]*\\\n//; ta' > configure.ac
+ sed -e :a -e '/\\$/N; s/[ ]*\\\n//; ta' < $fname > configure.ac
else
cp -p $fname.tmp configure.ac
fi
fname=`echo $ff | sed s/\.ad//`
# Header for the Makefile.am
- echo "# Automatically generated by Autodist $ver from Makefile.ad. Do not edit." > $fname.am
- echo "# To make changes edit the $ff file in the source tree." >> $fname.am
- echo >> $fname.am
- echo "# Source: $ff" >> $fname.am
- echo "# Generated: `date` by `whoami`" >> $fname.am
- echo "# Distribution: $distribution" >> $fname.am
- echo "# License: $license" >> $fname.am
- echo >> $fname.am
+ cat > $fname.am <<EOF
+# Automatically generated by Autodist $ver from Makefile.ad. Do not edit.
+# To make changes edit the $ff file in the source tree.
+
+# Source: $ff
+# Generated: `date` by `whoami`
+# Distribution: $distribution
+# License: $license
+
+EOF
# Run the distribution processing for this Makefile.ad
ad_debug "Processing $ff to be $fname.am"
# Remove any trailing backslashes
if test -f "$fname.tmp"; then
- cat $fname.tmp | sed -e :a -e '/\\$/N; s/[ ]*\\\n//; ta' >> $fname.am
+ sed -e :a -e '/\\$/N; s/[ ]*\\\n//; ta' < $fname.tmp >> $fname.am
else
cat $ff >> $fname.am
fi
do
fname=`echo $i | sed s/\.ad//`
- # Header
- echo "# Automatically generated by Autodist $ver. Do not edit." > $fname
- echo "# To make changes edit the $i file in the source tree." >> $fname
- echo >> $fname
- echo "# Source: $i" >> $fname
- echo "# Generated: `date` by `whoami`" >> $fname
- echo "# Distribution: $distribution" >> $fname
- echo "# License: $license" >> $fname
- echo >> $fname
-
# Run the distribution processing for this file
ad_debug "Processing $i to be $fname"
ad_process_file $i $fname
fi
# Recursively call this function with expanded pathnames. The
- # reason why we don't let sh by default expand patnames is that
+ # reason why we don't let sh by default expand pathnames is that
# the include's destination is optional. If sh expands by default
# we don't know the destination. For this reason, we handle the
# expansion here ourselves.
{
ad_debug ">ad_process_tree: $1"
- # We take all files, other than *.ad, including source files, in case
- # they use the non-C-compiler-friendly format of distdefs, which is
- # possible.
-
- files=`find $am_distdir \! -name \*\.ad`
+ # Take files, except source and .ad files.
+ files=`find $am_distdir \! -name \*\.ad \( \
+ \! -name \*\.[cC] -a \
+ \! -name \*\.[cC][cCpP] -a \
+ \! -name \*\.[cC][xX][xX] -a \
+ \! -name \*\.[cC][pP][pP] -a \
+ \! -name \*\.[cC]++ -a \
+ \! -name \*\.m -a \
+ \! -name \*\.[hH] -a \
+ \! -name \*\.hh \)`
files=`echo $files | sed 's/$am_distdir//'`
# Take away noprocess list
if test -f autodist.noprocess; then
- files=`echo $files | sh autodist.noprocess` || exit 1
+ files=`echo $files" " | sh autodist.noprocess` || exit 1
fi
for ff in $files
# Take away noprocess list
if test -f autodist.noprocess; then
- files=`echo $files | sh autodist.noprocess` || exit 1
+ files=`echo $files" " | sh autodist.noprocess` || exit 1
fi
for ff in $files
fi
# Parse the requested distribution
- distribution=`cat autodist.dist | grep "dist:" | cut -d: -f2`
- dist_version=`cat autodist.dist | grep "ver:" | cut -d: -f2`
+ distribution=`grep "dist:" < autodist.dist | cut -d: -f2` || exit 1
+ dist_version=`grep "ver:" < autodist.dist | cut -d: -f2` || exit 1
+ am_distdir=`grep "distdir:" < autodist.dist | cut -d: -f2` || exit 1
ad_parse_distribution $distribution false
ad_process_distdefs
- am_distdir="$package-$dist_version"
if test x$opt_no_dist = xtrue; then
ad_fatal "The '$distribution' distribution cannot be packaged"
fi
# Get inherited
- inhs=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ inhs=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "inherit " | cut -d' ' -f2 | sort | uniq`
# Get distdefs
- defs=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ defs=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "define " | cut -d' ' -f2 | sort | uniq`
if test "$inhs" = "" && test "$defs" = ""; then
fi
# Get undefined distdefs
- undefs=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ undefs=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "undef " | cut -d' ' -f2 | sort | uniq`
# Get includes
- incs=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ incs=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "include " | sed 's/include / : /'`
# Get excludes
- excs=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ excs=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "exclude " | cut -d' ' -f2- | sort | uniq`
# Get noprocesses
- nops=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ nops=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "noprocess " | cut -d' ' -f2- | sort | uniq`
# Get options
- opts=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ opts=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "option " | cut -d' ' -f2- | sort | uniq`
# Check options
done
# Get license
- license=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ license=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "license " | cut -d' ' -f2`
- licenseh=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ licenseh=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "license-header " | sed 's/license-header / : /'`
ad_debug "license: $license"
if test x$2 = xfalse; then
# Get distribution name
- dname=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ dname=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "name " | cut -d' ' -f2-`
if test "$dname"; then
fi
# Get distribution package name (optional)
- dpname=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ dpname=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "package " | cut -d' ' -f2`
if test "$dpname"; then
fi
# Get Bug-report email address (optional)
- bugr=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ bugr=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "bug-report " | cut -d' ' -f2-`
if test "$bugr"; then
ad_debug "bug-report: $bug_report"
# Get hooks (optional)
- prh=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ prh=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "pre-hook " | cut -d' ' -f2-`
- poh=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
+ poh=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
| grep "post-hook " | cut -d' ' -f2-`
- prdh=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
- | grep "pre-dist-hook " | sed 's/^[ ]*//' | cut -d' ' -f2-`
- podh=`cat $distdir/$1 | grep -v "^#" \
- | grep "post-dist-hook " | sed 's/^[ ]*//' | cut -d' ' -f2-`
- prpdh=`cat $distdir/$1 | sed 's/^[ ]*//' | grep -v "^#" \
- | grep "pre-process-dist-hook " | sed 's/^[ ]*//' | cut -d' ' -f2-`
- popdh=`cat $distdir/$1 | grep -v "^#" \
- | grep "post-process-dist-hook " | sed 's/^[ ]*//' | cut -d' ' -f2-`
+ prdh=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
+ | grep "pre-dist-hook " | cut -d' ' -f2-`
+ podh=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
+ | grep "post-dist-hook " | cut -d' ' -f2-`
+ prpdh=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
+ | grep "pre-process-dist-hook " | cut -d' ' -f2-`
+ popdh=`sed 's/^[ ]*//' < $distdir/$1 | grep -v "^#" \
+ | grep "post-process-dist-hook " | cut -d' ' -f2-`
pre_hooks="$pre_hooks $prh"
post_hooks="$post_hooks $poh"
for i in $undistdefs
do
ad_debug "undefining $i distdef"
- distdefs=`echo $distdefs | sed s/$i//`
+ distdefs=`echo $distdefs | sed s/$i//g`
done
rm -f autodist.tmp.defs
do
echo $i >>autodist.tmp.defs
done
- distdefs=`cat autodist.tmp.defs | sort | uniq`
+ distdefs=`sort < autodist.tmp.defs | uniq`
distdefs=`echo $distdefs`
rm -f autodist.tmp.defs
ad_debug ">ad_process_noprocess"
+ cur=`pwd`
+ cd $am_distdir || exit 1
for i in $noprocess
do
# Escape
ie=`echo $i | sed 's/\\//\\\\\//g'` || exit 1
- n="$n -e 's/$am_distdir\\/$ie//'"
+ n="$n -e 's/$am_distdir\\/$ie //'"
np=true
done
+ cd $cur || exit 1
rm -f autodist.noprocess
if test x$np = xtrue; then
ad_debug "Creating autodist.dist"
echo "dist:$distfile" > autodist.dist
echo "ver:$dist_version" >> autodist.dist
-echo "$package-$dist_version" >> autodist.dist
+echo "distdir:$package-$dist_version" >> autodist.dist
#
# Run post-hooks
projects / autodist.git / blobdiff