cvs commit: apache-1.3/src/helpers binbuild.sh
lars00/01/29 16:36:58 Modified:src/helpers binbuild.sh Log: remove one space... Revision ChangesPath 1.16 +1 -1 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- binbuild.sh 2000/01/13 16:02:09 1.15 +++ binbuild.sh 2000/01/30 00:36:55 1.16 @@ -229,7 +229,7 @@ echo\ echo echo \Ready.\ \ echo echo \ ++\ \ - echo echo \ | You now have successfully installed the Apache $VER |\ \ + echo echo \ | You now have successfully installed the Apache $VER |\ \ echo echo \ | HTTP server. To verify that Apache actually works |\ \ echo echo \ | correctly you should first check the (initially |\ \ echo echo \ | created or preserved) configuration files: |\ \
cvs commit: apache-1.3/src/helpers binbuild.sh
stoddard00/01/13 08:02:11 Modified:src/helpers binbuild.sh Log: Fix OS/390 binbuild break Submitted by: Greg Ames Revision ChangesPath 1.15 +2 -2 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- binbuild.sh 1999/12/09 17:19:42 1.14 +++ binbuild.sh 2000/01/13 16:02:09 1.15 @@ -8,7 +8,7 @@ OS=`src/helpers/GuessOS` case x$OS in - x*390) CONFIGPARAM=--with-layout=BinaryDistribution --enable-module=most --enable-module=log_agent --enable-module=log_referer --enable-module=example --enable-module=mmap_static;; + x*390*) CONFIGPARAM=--with-layout=BinaryDistribution --enable-module=most;; *) CONFIGPARAM=--with-layout=BinaryDistribution --enable-module=most --enable-shared=max;; esac APDIR=`pwd` @@ -272,7 +272,7 @@ if [ x$TAR != x ] then case x$OS in -x*390) $TAR -cfU ../apache_$VER-$OS.tar -C .. apache_$VER;; +x*390*) $TAR -cfU ../apache_$VER-$OS.tar -C .. apache_$VER;; *) $TAR -cf ../apache_$VER-$OS.tar -C .. apache_$VER;; esac if [ x$GZIP != x ]
cvs commit: apache-1.3/src/helpers binbuild.sh
randy 99/08/12 20:26:30 Modified:src CHANGES src/helpers binbuild.sh Log: Add -R flag to apachectl for binary builds to work around lack of absolute path to ./libexec directory for SHARED_CORE architectures that need to load libhttp.ep. Revision ChangesPath 1.1417+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1416 retrieving revision 1.1417 diff -u -r1.1416 -r1.1417 --- CHANGES 1999/08/12 18:09:58 1.1416 +++ CHANGES 1999/08/13 03:26:21 1.1417 @@ -1,5 +1,10 @@ Changes with Apache 1.3.9 + *) For binary builds, add -R flag to apachectl to work around the +lack of an absolute path to the ./libexec directory where +libhttp.ep file is needed for SHARED_CORE architectures. +[Randy Terbush [EMAIL PROTECTED] + *) Roll back (re)naming in the uuencode/decode section. The ap/ap_ routines are now called ap_base64* and are 'plain'. I.e. no pool access or anything clever. Inside apache the routines 1.13 +1 -1 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- binbuild.sh 1999/08/10 16:06:52 1.12 +++ binbuild.sh 1999/08/13 03:26:29 1.13 @@ -223,7 +223,7 @@ echo -e \s;[EMAIL PROTECTED]@;\$SR/conf;\ bindist/bin/apxs \$SR/bin/apxs \ echo sed -e \s;^#!/.*;#!\$PERL;\ bindist/bin/dbmmanage \$SR/bin/dbmmanage \ echo sed -e \s%/usr/local/apache%\$SR%\ \$SR/conf/httpd.conf.default \$SR/conf/httpd.conf \ - echo sed -e \s%PIDFILE=%PIDFILE=\$SR/%\ -e \s%HTTPD=%HTTPD=$SR/%\ -e \s%httpd\$%httpd -d \$SR\\\%\ bindist/bin/apachectl \$SR/bin/apachectl \ + echo sed -e \s%PIDFILE=%PIDFILE=\$SR/%\ -e \s%HTTPD=%HTTPD=$SR/%\ -e \s%httpd\$%httpd -d \$SR -R \$SR/libexec\\\%\ bindist/bin/apachectl \$SR/bin/apachectl \ echo\ echo echo \Ready.\ \ echo echo \ ++\ \
cvs commit: apache-1.3/src/helpers binbuild.sh
randy 99/08/10 09:06:57 Modified:src/helpers binbuild.sh Log: Fix some changed assumptions in config file format. Submitted by: Tony Finch Reviewed by: Randy Terbush Revision ChangesPath 1.12 +5 -4 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- binbuild.sh 1999/05/02 16:44:24 1.11 +++ binbuild.sh 1999/08/10 16:06:52 1.12 @@ -222,7 +222,7 @@ echo -e \s;[EMAIL PROTECTED]@;\$SR/libexec;\ -e \s;[EMAIL PROTECTED]@;\$SR/include;\ \\ \ echo -e \s;[EMAIL PROTECTED]@;\$SR/conf;\ bindist/bin/apxs \$SR/bin/apxs \ echo sed -e \s;^#!/.*;#!\$PERL;\ bindist/bin/dbmmanage \$SR/bin/dbmmanage \ - echo sed -e \s%/usr/local/apache%\$SR/%\ \$SR/conf/httpd.conf.default \$SR/conf/httpd.conf \ + echo sed -e \s%/usr/local/apache%\$SR%\ \$SR/conf/httpd.conf.default \$SR/conf/httpd.conf \ echo sed -e \s%PIDFILE=%PIDFILE=\$SR/%\ -e \s%HTTPD=%HTTPD=$SR/%\ -e \s%httpd\$%httpd -d \$SR\\\%\ bindist/bin/apachectl \$SR/bin/apachectl \ echo\ echo echo \Ready.\ \ @@ -246,9 +246,10 @@ ) install-bindist.sh chmod 755 install-bindist.sh -sed -e s%\/htdocs%\/usr/local/apache/htdocs% \ --e s%\/icons%\/usr/local/apache/icons% \ --e s%\/cgi-bin%\/usr/local/apache/cgi-bin% \ +sed -e s%\htdocs%\/usr/local/apache/htdocs% \ +-e s%\icons%\/usr/local/apache/icons% \ +-e s%\cgi-bin%\/usr/local/apache/cgi-bin% \ +-e s%\proxy%\/usr/local/apache/proxy% \ -e s%^ServerAdmin.*%ServerAdmin [EMAIL PROTECTED] \ -e s%#ServerName.*%#ServerName localhost% \ -e s%Port 8080%Port 80% \
cvs commit: apache-1.3/src/helpers binbuild.sh
randy 99/05/01 19:58:08
Modified:src CHANGES
src/helpers binbuild.sh
Log:
Add functionality to the install-bindist.sh script created by
binbuild.sh to use tar when copying distribution files to the
serverroot. This allows upgrading an existing installation
without nesting the new distribution in the old.
install-bindist.sh now detects the local perl5 path to install
apxs and dbmmanage with proper path to perl interpreter.
Add an install-binsupport target which copies the source files
for apxs and dbmmanage to bindist to allow these scripts to
be properly installed relative to the destination serverroot.
FWIW - abort during commit for changed files commited without
comments.
Revision ChangesPath
1.1339+13 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1338
retrieving revision 1.1339
diff -u -r1.1338 -r1.1339
--- CHANGES 1999/05/01 17:03:48 1.1338
+++ CHANGES 1999/05/02 02:57:59 1.1339
@@ -1,5 +1,18 @@
Changes with Apache 1.3.7
+ *) Add functionality to the install-bindist.sh script created by
+ binbuild.sh to use tar when copying distribution files to the
+ serverroot. This allows upgrading an existing installation
+ without nesting the new distribution in the old.
+
+ install-bindist.sh now detects the local perl5 path to install
+ apxs and dbmmanage with proper path to perl interpreter.
+
+ Add an install-binsupport target which copies the source files
+ for apxs and dbmmanage to bindist to allow these scripts to
+ be properly installed relative to the destination serverroot.
+ [Randy Terbush, Covalent Technologies, [EMAIL PROTECTED]
+
*) Fix intermittent SEGV in ap_proxy_cache_error() in
src/modules/proxy_util.c where a NULL filepointer and
temporary filename were closed and unlinked.
1.10 +68 -14apache-1.3/src/helpers/binbuild.sh
Index: binbuild.sh
===
RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- binbuild.sh 1999/03/22 23:41:40 1.9
+++ binbuild.sh 1999/05/02 02:58:07 1.10
@@ -129,6 +129,55 @@
echo # This script installs the Apache binary distribution and \
echo # was automatically created by binbuild.sh. \
echo\
+ echo lmkdir() \
+ echo { \
+ echo path=\\ \
+ echo dirs=\`echo \$1 | sed -e 's%/% %g'\` \
+ echo mode=\$2 \
+ echo\
+ echo set -- \${dirs} \
+ echo\
+ echo for d in \${dirs} \
+ echo do \
+ echo path=\\${path}/\$d\ \
+ echo if test ! -d \\${path}\ ; then \
+ echo mkdir \${path} \
+ echo if test \$? -ne 0 ; then \
+ echo echo \Failed to create directory: \${path}\ \
+ echo exit 1 \
+ echo fi \
+ echo chmod \${mode} \${path} \
+ echo fi \
+ echo done \
+ echo } \
+ echo\
+ echo lcopy() \
+ echo { \
+ echo from=\$1 \
+ echo to=\$2 \
+ echo dmode=\$3 \
+ echo fmode=\$4 \
+ echo\
+ echo test -d \${to} || lmkdir \${to} \${dmode} \
+ echo (cd \${from} tar -cf - *) | (cd \${to} tar -xf -) \
+ echo\
+ echo if test \X\${fmode}\ != X ; then \
+ echo find \${to} -type f -print | xargs chmod \${fmode} \
+ echo fi \
+ echo if test \X\${dmode}\ != X ; then \
+ echo find \${to} -type d -print | xargs chmod \${dmode} \
+ echo fi \
+ echo } \
+ echo\
+ echo ## \
+ echo ## determine path to (optional) Perl interpreter \
+ echo ## \
+ echo PERL=no-perl-on-this-system \
+ echo perlpath=\\`src/helpers/PrintPath perl5 perl miniperl\`\ \
+ echo if [ \x\$perlpath\ != \x\ ]; then \
+ echo PERL=\\$perlpath\ \
+ echo fi \
+ echo\
echo if [ .\$1 = . ] \
echo then \
echo SR=/usr/local/apache \
@@ -138,27 +187,32 @@
echo echo \Installing binary distribution for platform $OS\ \
echo echo \into directory \$SR ...\ \
echo ./src/helpers/mkdir.sh \$SR \
- echo cp -r bindist/proxy \$SR/proxy \
- echo cp -r bindist/man \$SR/man \
- echo cp -r bindist/logs \$SR/logs \
- echo cp -r bindist/libexec \$SR/libexec \
- echo cp -r bindist/include \$SR/include \
- echo cp -r bindist/icons \$SR/icons \
- echo cp -r bindist/cgi-bin \$SR/cgi-bin \
- echo cp -r bindist/bin \$SR/bin \
+ echo lmkdir \$SR/proxy 750 \
+ echo lmkdir \$SR/logs 750 \
+ echo lcopy bindist/man \$SR/man 755 644 \
+ echo lcopy bindist/libexec \$SR/libexec 750 644 \
+ echo lcopy bindist/include \$SR/include 755
cvs commit: apache-1.3/src/helpers binbuild.sh
randy 99/05/02 09:44:25
Modified:.Makefile.tmpl
Log:
I've waffled back and forth on whether we should be processing the source
of this script at all for bindist. The whole binary distribution thing
seems somewhat bipolar.
Make this script look like what install-bindist.sh expects. Doing this
here might make paths for binary distributions somewhat more flexible.
(might)
Revision ChangesPath
1.80 +4 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Makefile.tmpl 1999/05/02 14:40:36 1.79
+++ Makefile.tmpl 1999/05/02 16:42:30 1.80
@@ -384,7 +384,10 @@
apachectl=$(TARGET)ctl; \
fi; \
echo $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*]
$(root)$(sbindir)/$${apachectl}; \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl
$(root)$(sbindir)/$${apachectl}; \
+ sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
+ -e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
+ $(TOP)/$(SRC)/support/apachectl
$(TOP)/$(SRC)/.apaci.install.tmp \
+ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(sbindir)/$${apachectl}; \
echo $(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8; \
$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htpasswd
$(root)$(bindir)/htpasswd
Modified:src/helpers binbuild.sh
Log:
Make the install-bindist.sh script standalone. (don't require src/helpers)
This could allow us to do binary distributions without source if we choose
to.
PERL detection now makes sure it is perl5 since the 2 scripts in question
(dbmmanage and apxs) require perl5.
Fix some breakage I introduced when creating apachectl.
Revision ChangesPath
1.11 +17 -8 apache-1.3/src/helpers/binbuild.sh
Index: binbuild.sh
===
RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- binbuild.sh 1999/05/02 02:58:07 1.10
+++ binbuild.sh 1999/05/02 16:44:24 1.11
@@ -172,11 +172,20 @@
echo ## \
echo ## determine path to (optional) Perl interpreter \
echo ## \
- echo PERL=no-perl-on-this-system \
- echo perlpath=\\`src/helpers/PrintPath perl5 perl miniperl\`\ \
- echo if [ \x\$perlpath\ != \x\ ]; then \
- echo PERL=\\$perlpath\ \
- echo fi \
+ echo PERL=no-perl5-on-this-system \
+ echo perls='perl5 perl' \
+ echo path=\`echo \$PATH | sed -e 's/:/ /g'\` \
+ echo\
+ echo for dir in \${path} ; do \
+ echo for pperl in \${perls} ; do \
+ echo if test -f \\${dir}/\${pperl}\ ; then \
+ echo if \`\${dir}/\${pperl} -v | grep 'version 5\.' /dev/null
21\` ; then \
+ echo PERL=\\${dir}/\${pperl}\ \
+ echo break \
+ echo fi \
+ echo fi \
+ echo done \
+ echo done \
echo\
echo if [ .\$1 = . ] \
echo then \
@@ -186,7 +195,7 @@
echo fi \
echo echo \Installing binary distribution for platform $OS\ \
echo echo \into directory \$SR ...\ \
- echo ./src/helpers/mkdir.sh \$SR \
+ echo lmkdir \$SR 755 \
echo lmkdir \$SR/proxy 750 \
echo lmkdir \$SR/logs 750 \
echo lcopy bindist/man \$SR/man 755 644 \
@@ -213,8 +222,8 @@
echo -e \s;[EMAIL PROTECTED]@;\$SR/libexec;\ -e \s;[EMAIL
PROTECTED]@;\$SR/include;\ \\ \
echo -e \s;[EMAIL PROTECTED]@;\$SR/conf;\ bindist/bin/apxs
\$SR/bin/apxs \
echo sed -e \s;^#!/.*;#!\$PERL;\ bindist/bin/dbmmanage
\$SR/bin/dbmmanage \
- echo sed -e s%/usr/local/apache%\$SR/% \$SR/conf/httpd.conf.default
\$SR/conf/httpd.conf \
- echo sed -e s%PIDFILE=%PIDFILE=\$SR/% -e s%HTTPD=%HTTPD=$SR/% -e
\s%/httpd$%/httpd -d \$SR\\\%\ bindist/bin/apachectl \$SR/bin/apachectl
\
+ echo sed -e \s%/usr/local/apache%\$SR/%\ \$SR/conf/httpd.conf.default
\$SR/conf/httpd.conf \
+ echo sed -e \s%PIDFILE=%PIDFILE=\$SR/%\ -e
\s%HTTPD=%HTTPD=$SR/%\ -e \s%httpd\$%httpd -d \$SR\\\%\
bindist/bin/apachectl \$SR/bin/apachectl \
echo\
echo echo \Ready.\ \
echo echo \
++\ \
cvs commit: apache-1.3/src/helpers binbuild.sh
lars99/03/22 15:41:40 Modified:src/helpers binbuild.sh Log: Remove --user/--group tar options... they are not portable. Ignore it for now. I'll have to take a closer at it. Revision ChangesPath 1.9 +1 -1 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- binbuild.sh 1999/03/19 22:57:30 1.8 +++ binbuild.sh 1999/03/22 23:41:40 1.9 @@ -201,7 +201,7 @@ else if [ x$GTAR != x ] then -$GTAR -zcf ../apache_$VER-$OS.tar.gz -C .. --owner=root --group=root apache_$VER +$GTAR -zcf ../apache_$VER-$OS.tar.gz -C .. apache_$VER else if [ x$TAR != x ] then
cvs commit: apache-1.3/src/helpers binbuild.sh
lars99/03/19 14:57:31 Modified:src/helpers binbuild.sh Log: Add option to let the user specify an email address. Revision ChangesPath 1.8 +12 -3 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- binbuild.sh 1999/03/16 23:46:02 1.7 +++ binbuild.sh 1999/03/19 22:57:30 1.8 @@ -7,16 +7,22 @@ # See http://www.apache.org/docs/LICENSE +CONFIGPARAM=--with-layout=BinaryDistribution --enable-module=most --enable-shared=max APDIR=`pwd` APDIR=`basename $APDIR` VER=`echo $APDIR |sed s/apache_//` OS=`src/helpers/GuessOS` -USER=`src/helpers/buildinfo.sh -n [EMAIL PROTECTED] TAR=`src/helpers/PrintPath tar` GTAR=`src/helpers/PrintPath gtar` GZIP=`src/helpers/PrintPath gzip` -CONFIGPARAM=--with-layout=BinaryDistribution --enable-module=most --enable-shared=max +if [ x$1 != x ] +then + USER=$1 +else + USER=`src/helpers/buildinfo.sh -n [EMAIL PROTECTED] +fi + if [ ! -f ./ABOUT_APACHE ] then echo ERROR: The current directory contains no valid Apache distribution. @@ -58,8 +64,11 @@ echo ERROR: Failed to build Apache. See \build.log\ for details. exit 1; fi + +echo Binary image successfully created... + +./bindist/bin/httpd -v -echo Binary images successfully created... echo Creating supplementary files... ( echo\
cvs commit: apache-1.3/src/helpers binbuild.sh
lars99/03/16 15:46:03 Modified:src/helpers binbuild.sh Log: Oops... Revision ChangesPath 1.7 +10 -10apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- binbuild.sh 1999/01/16 22:00:46 1.6 +++ binbuild.sh 1999/03/16 23:46:02 1.7 @@ -9,7 +9,7 @@ APDIR=`pwd` APDIR=`basename $APDIR` -VER=`echo $APDIR |sed s/apache-//` +VER=`echo $APDIR |sed s/apache_//` OS=`src/helpers/GuessOS` USER=`src/helpers/buildinfo.sh -n [EMAIL PROTECTED] TAR=`src/helpers/PrintPath tar` @@ -90,7 +90,7 @@ ./bindist/bin/httpd -V \ echo -- \ ) README.bindist -cp README.bindist ../apache-$VER-$OS.README +cp README.bindist ../apache_$VER-$OS.README ( echo\ echo Apache $VER binary installation \ @@ -192,28 +192,28 @@ else if [ x$GTAR != x ] then -$GTAR -zcf ../apache-$VER-$OS.tar.gz -C .. --owner=root --group=root apache-$VER +$GTAR -zcf ../apache_$VER-$OS.tar.gz -C .. --owner=root --group=root apache_$VER else if [ x$TAR != x ] then - $TAR -cf ../apache-$VER-$OS.tar -C .. apache-$VER + $TAR -cf ../apache_$VER-$OS.tar -C .. apache_$VER if [ x$GZIP != x ] then -$GZIP ../apache-$VER-$OS.tar +$GZIP ../apache_$VER-$OS.tar fi else echo ERROR: Could not find a 'tar' program! echoPlease execute the following commands manually: - echo tar -cf ../apache-$VER-$OS.tar . - echo gzip ../apache-$VER-$OS.tar + echo tar -cf ../apache_$VER-$OS.tar . + echo gzip ../apache_$VER-$OS.tar fi fi - if [ -f ../apache-$VER-$OS.tar.gz ] [ -f ../apache-$VER-$OS.README ] + if [ -f ../apache_$VER-$OS.tar.gz ] [ -f ../apache_$VER-$OS.README ] then echo Ready. -echo You can find the binary archive (apache-$VER-$OS.tar.gz) -echo and the readme file (apache-$VER-$OS.README) in the +echo You can find the binary archive (apache_$VER-$OS.tar.gz) +echo and the readme file (apache_$VER-$OS.README) in the echo parent directory. exit 0; else
cvs commit: apache-1.3/src/helpers binbuild.sh findprg.sh
jim 99/01/15 07:01:16 Modified:src/helpers binbuild.sh Removed: src/helpers findprg.sh Log: First step in making binbuild.sh more universal as far as working with all/most shells. Remove the findprg.sh helper since PrintPath works just fine Revision ChangesPath 1.2 +3 -3 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- binbuild.sh 1999/01/05 05:14:52 1.1 +++ binbuild.sh 1999/01/15 15:01:16 1.2 @@ -11,9 +11,9 @@ VER=$(echo $APDIR |sed s/apache-//) OS=$(src/helpers/GuessOS) USER=$(src/helpers/buildinfo.sh -n [EMAIL PROTECTED]) -TAR=$(src/helpers/findprg.sh tar) -GTAR=$(src/helpers/findprg.sh gtar) -GZIP=$(src/helpers/findprg.sh gzip) +TAR=$(src/helpers/PrintPath tar) +GTAR=$(src/helpers/PrintPath gtar) +GZIP=$(src/helpers/PrintPath gzip) CONFIGPARAM=--with-layout=BinaryDistribution --enable-module=most --enable-shared=max if [ ! -f ./ABOUT_APACHE ]
cvs commit: apache-1.3/src/helpers binbuild.sh
jim 99/01/15 07:07:00 Modified:src/helpers binbuild.sh Log: Older shells don't support the newer method of shell execute ( ) Revision ChangesPath 1.3 +8 -7 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- binbuild.sh 1999/01/15 15:01:16 1.2 +++ binbuild.sh 1999/01/15 15:06:59 1.3 @@ -7,13 +7,14 @@ # See http://www.apache.org/docs/LICENSE -APDIR=$(basename $(pwd)) -VER=$(echo $APDIR |sed s/apache-//) -OS=$(src/helpers/GuessOS) -USER=$(src/helpers/buildinfo.sh -n [EMAIL PROTECTED]) -TAR=$(src/helpers/PrintPath tar) -GTAR=$(src/helpers/PrintPath gtar) -GZIP=$(src/helpers/PrintPath gzip) +APDIR=`pwd` +APDIR=`basename $APDIR` +VER=`echo $APDIR |sed s/apache-//` +OS=`src/helpers/GuessOS` +USER=`src/helpers/buildinfo.sh -n [EMAIL PROTECTED] +TAR=`src/helpers/PrintPath tar` +GTAR=`src/helpers/PrintPath gtar` +GZIP=`src/helpers/PrintPath gzip` CONFIGPARAM=--with-layout=BinaryDistribution --enable-module=most --enable-shared=max if [ ! -f ./ABOUT_APACHE ]
cvs commit: apache-1.3/src/helpers binbuild.sh findprg.sh
fielding99/01/04 21:14:52 Modified:.STATUS config.layout src CHANGES Added: src/helpers binbuild.sh findprg.sh Log: Added binbuild.sh and findprg.sh helpers to make it easier for us to build binary distributions. This is Lars' take 2 version of 12/26. Submitted by: Lars Eilebrecht Reviewed by: Roy Fielding, Randy Terbush Revision ChangesPath 1.589 +17 -56apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.588 retrieving revision 1.589 diff -u -r1.588 -r1.589 --- STATUS1999/01/05 01:03:03 1.588 +++ STATUS1999/01/05 05:14:49 1.589 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/01/05 01:03:03 $] + Last modified at [$Date: 1999/01/05 05:14:49 $] Release: @@ -33,59 +33,24 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: -* How should an Apache binary release tarball look? +* Randy's proposed changes for binbuild: - - A proposed solution is available. -See: [EMAIL PROTECTED] - [EMAIL PROTECTED] - - 1. The old way where it is just a source release tarball - plus a pre-compiled src/httpd-gnutriple. It is created - via the apache-devsite/binbuild.sh script which - - creates the build tree - - creates the src/Configuration file with standard modules - - runs make - - renames src/httpd to src/httpd-gnutriple - - runs make clean - - packs the build tree stuff together - Already known discussion points: - - should src/httpd be renamed or not because a lot - of PRs say they cannot find the httpd :-( - Status: Ralf -0, Ken +0, Randy -1 - - 2. The way some other projects release binary tarballs, i.e. - a package containing the installed (binary) files. - It can be created by a script which - - creates the build tree - - runs ./configure --prefix=/usr/local/apache \ - --enable-shared=remain \ - --disable-module=auth_db \ - --enable-suexec ... - - runs make install root=apache-root - - packs the stuff together from ./apache-root only!! - Already known discussion points: - - should there be a prefix usr/local/apache in - the tarball or not? Some people think - it's useful while others dislike it a lot. - - it doesn't include the source. - - the paths don't match the original Apache style, nor the Win32 -paths - - should suexec be prebuilt in a binary tarball? - Status: Randy, +1, Ralf +1, Martin +1, Roy -1, - Ken +1 (IFF source is included, - there's no usr/local/apache prefix in the tarball, AND the - old-style [common with Win32] paths are used) - - 3. A source release tarball with three extra directories: -lib: for the shared library object files -bin: for the httpd and support executables -man: for the man files (if desired) - as if the server was installed in those directories. - Status: Roy +1, Jim +1 (still need to define which modules - are built) - Ralf -0 (I dislike mixed source+binary tarballs) - Randy -1 (those wanting binary dists don't want source) + 1. Change to build binary only distribution + 2. Use standard Apache layout + [It is currently using the BinaryDistribution layout that mimics + the standard Apache layout _without_ any absolute paths in it + (apart from HTTPD_ROOT /usr/local/apache). This makes it possible + for a user to install it in _any_ directory.] + [Roy: I don't understand what Randy wants to change here.] + + 3. Add 'make dist' target to call binbuild.sh + [Roy: That would require a Makefile, which is what binbuild creates. + I don't see any point in that.] + + 4. Create toplevel 'setup' script for install to mirror win32 name + [It is currently creating install-bindist.sh] + Documentation that needs writing: * Need a document explaining mod_rewrite/UseCanonicalName off based @@ -95,10 +60,6 @@ vhost-xxx.html document out of it. -- rse Available Patches: - -* Lars' 'binbuild' patch -Message-ID: [EMAIL PROTECTED] -Status: Lars +1 * Jim Patterson's patch to make mod_info work on Win32 Message-ID: PR#1442 1.3 +16 -0 apache-1.3/config.layout Index: config.layout
