From d07dd8d74c2721766a9231ad28d379413dfd1a97 Mon Sep 17 00:00:00 2001 From: "Roy T. Fielding" Date: Sat, 24 Mar 2001 11:04:38 +0000 Subject: [PATCH] Remove files that now reside in srclib/apr/build git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88571 13f79535-47bb-0310-9956-ffa450edef68 --- build/MakeEtags | 39 --------------- build/PrintPath | 116 --------------------------------------------- build/binbuild.sh | 6 +-- build/cvstodsp5.pl | 43 ----------------- build/dsp5tocvs.pl | 46 ------------------ 5 files changed, 3 insertions(+), 247 deletions(-) delete mode 100755 build/MakeEtags delete mode 100755 build/PrintPath delete mode 100644 build/cvstodsp5.pl delete mode 100644 build/dsp5tocvs.pl diff --git a/build/MakeEtags b/build/MakeEtags deleted file mode 100755 index 86a6db24ce..0000000000 --- a/build/MakeEtags +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# This file illustrates how to generate a useful TAGS file via etags -# for emacs. This should be invoked from the src directory i.e.: -# > build/MakeEtags -# and will create a TAGS file in the src directory. - -# This script falls under the Apache License. -# See http://www.apache.org/docs/LICENSE - -# Once you have created src/TAGS in emacs you'll need to setup -# tag-table-alist with an entry to assure it finds the single src/TAGS -# file from the many source directories. Something along these lines: -# (setq tag-table-alist -# '(("/home/me/work/apache-1.3/src/" -# . "/home/me/work/apache-1.3/src/") -# )) - -# This requires a special version of etags, i.e. the -# one called "Exuberant ctags" available at: -# http://fly.hiwaay.net/~darren/ctags/ -# Once that is setup you'll need to point to the -# executable here: - -etags=~/local/bin/etags - -# Exuberant etags is necessary since it can ignore some defined symbols -# that obscure the function signatures. - -ignore=AP_DECLARE,AP_DECLARE_NONSTD,__declspec - -# Create an etags file at the root of the source -# tree, then create symbol links to it from each -# directory in the source tree. By passing etags -# absolute pathnames we get a tag file that is -# NOT portable when we move the directory tree. - -find . -name '*.[ch]' -print | $etags -I "$ignore" -L - - diff --git a/build/PrintPath b/build/PrintPath deleted file mode 100755 index 68435f3744..0000000000 --- a/build/PrintPath +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh -# Look for program[s] somewhere in $PATH. -# -# Options: -# -s -# Do not print out full pathname. (silent) -# -pPATHNAME -# Look in PATHNAME instead of $PATH -# -# Usage: -# PrintPath [-s] [-pPATHNAME] program [program ...] -# -# Initially written by Jim Jagielski for the Apache configuration mechanism -# (with kudos to Kernighan/Pike) -# -# This script falls under the Apache License. -# See http://www.apache.org/docs/LICENSE - -## -# Some "constants" -## -pathname=$PATH -echo="yes" - -## -# Find out what OS we are running for later on -## -os=`(uname) 2>/dev/null` - -## -# Parse command line -## -for args in $* -do - case $args in - -s ) echo="no" ;; - -p* ) pathname="`echo $args | sed 's/^..//'`" ;; - * ) programs="$programs $args" ;; - esac -done - -## -# Now we make the adjustments required for OS/2 and everyone -# else :) -# -# First of all, all OS/2 programs have the '.exe' extension. -# Next, we adjust PATH (or what was given to us as PATH) to -# be whitespace seperated directories. -# Finally, we try to determine the best flag to use for -# test/[] to look for an executable file. OS/2 just has '-r' -# but with other OSs, we do some funny stuff to check to see -# if test/[] knows about -x, which is the prefered flag. -## - -if [ "x$os" = "xOS/2" ] -then - ext=".exe" - pathname=`echo -E $pathname | - sed 's/^;/.;/ - s/;;/;.;/g - s/;$/;./ - s/;/ /g - s/\\\\/\\//g' ` - test_exec_flag="-r" -else - ext="" # No default extensions - pathname=`echo $pathname | - sed 's/^:/.:/ - s/::/:.:/g - s/:$/:./ - s/:/ /g' ` - # Here is how we test to see if test/[] can handle -x - testfile="pp.t.$$" - - cat > $testfile </dev/null`; then - test_exec_flag="-x" - else - test_exec_flag="-r" - fi - rm -f $testfile -fi - -for program in $programs -do - for path in $pathname - do - if [ $test_exec_flag $path/${program}${ext} ] && \ - [ ! -d $path/${program}${ext} ]; then - if [ "x$echo" = "xyes" ]; then - echo $path/${program}${ext} - fi - exit 0 - fi - -# Next try without extension (if one was used above) - if [ "x$ext" != "x" ]; then - if [ $test_exec_flag $path/${program} ] && \ - [ ! -d $path/${program} ]; then - if [ "x$echo" = "xyes" ]; then - echo $path/${program} - fi - exit 0 - fi - fi - done -done -exit 1 - diff --git a/build/binbuild.sh b/build/binbuild.sh index 04e184971c..e78a0cc415 100755 --- a/build/binbuild.sh +++ b/build/binbuild.sh @@ -11,9 +11,9 @@ CONFIGPARAM="--with-layout=BinaryDistribution --prefix=`pwd`/bindist" APDIR=`pwd` APDIR=`basename $APDIR` VER=`echo $APDIR |sed s/apache_//` -TAR="`build/PrintPath tar`" -GTAR="`build/PrintPath gtar`" -GZIP="`build/PrintPath gzip`" +TAR="`srclib/apr/build/PrintPath tar`" +GTAR="`srclib/apr/build/PrintPath gtar`" +GZIP="`srclib/apr/build/PrintPath gzip`" if [ x$1 != x ]; then USER=$1 diff --git a/build/cvstodsp5.pl b/build/cvstodsp5.pl deleted file mode 100644 index d37442735f..0000000000 --- a/build/cvstodsp5.pl +++ /dev/null @@ -1,43 +0,0 @@ -use IO::File; -use File::Find; - -chdir '..'; -find(\&tovc5, '.'); - -sub tovc5 { - - if (m|.dsp$|) { - $oname = $_; - $tname = '.#' . $_; - $verchg = 0; - $srcfl = new IO::File $oname, "r" || die; - $dstfl = new IO::File $tname, "w" || die; - while ($src = <$srcfl>) { - if ($src =~ s|Format Version 6\.00|Format Version 5\.00|) { - $verchg = -1; - } - if ($src =~ s|^(# ADD CPP .*)/ZI (.*)|$1/Zi $2|) { - $verchg = -1; - } - if ($src =~ s|^(# ADD BASE CPP .*)/ZI (.*)|$1/Zi $2|) { - $verchg = -1; - } - if ($src !~ m|^# PROP AllowPerConfigDependencies|) { - print $dstfl $src; } - else { - $verchg = -1; - - } - } - undef $srcfl; - undef $dstfl; - if ($verchg) { - unlink $oname || die; - rename $tname, $oname || die; - print "Converted VC6 project " . $oname . " to VC5 in " . $File::Find::dir . "\n"; - } - else { - unlink $tname; - } - } -} \ No newline at end of file diff --git a/build/dsp5tocvs.pl b/build/dsp5tocvs.pl deleted file mode 100644 index 9686b43634..0000000000 --- a/build/dsp5tocvs.pl +++ /dev/null @@ -1,46 +0,0 @@ -use IO::File; -use File::Find; - -chdir '..'; -find(\&tovc6, '.'); - -sub tovc6 { - - if (m|.dsp$|) { - $oname = $_; - $tname = '.#' . $_; - $verchg = 0; - $srcfl = new IO::File $_, "r" || die; - $dstfl = new IO::File $tname, "w" || die; - while ($src = <$srcfl>) { - if ($src =~ s|Format Version 5\.00|Format Version 6\.00|) { - $verchg = -1; - } - if ($src =~ s|^(# ADD CPP .*)/Zi (.*)|$1/ZI $2|) { - $verchg = -1; - } - if ($src =~ s|^(# ADD BASE CPP .*)/Zi (.*)|$1/ZI $2|) { - $verchg = -1; - } - if ($src =~ s|^(!MESSAGE .*)\\\n|$1|) { - $cont = <$srcfl>; - $src = $src . $cont; - $verchg = -1; - } - print $dstfl $src; - if ($verchg && $src =~ m|^# Begin Project|) { - print $dstfl "# PROP AllowPerConfigDependencies 0\n"; - } - } - undef $srcfl; - undef $dstfl; - if ($verchg) { - unlink $oname || die; - rename $tname, $oname || die; - print "Converted VC5 project " . $oname . " to VC6 in " . $File::Find::dir . "\n"; - } - else { - unlink $tname; - } - } -} -- 2.50.1