You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2005/03/30 13:00:09 UTC
svn commit: r159475 - in httpd/httpd/branches/2.0.x: CHANGES STATUS
build/pkg/ build/pkg/README build/pkg/buildpkg.sh build/pkg/pkginfo.in
configure.in
Author: minfrin
Date: Wed Mar 30 03:00:06 2005
New Revision: 159475
URL: http://svn.apache.org/viewcvs?view=rev&rev=159475
Log:
Add a build script to create a solaris package. (packaging build script: lazy
consensus)
Added:
httpd/httpd/branches/2.0.x/build/pkg/ (with props)
httpd/httpd/branches/2.0.x/build/pkg/README (with props)
httpd/httpd/branches/2.0.x/build/pkg/buildpkg.sh (with props)
httpd/httpd/branches/2.0.x/build/pkg/pkginfo.in (with props)
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/STATUS
httpd/httpd/branches/2.0.x/configure.in
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?view=diff&r1=159474&r2=159475
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES (original)
+++ httpd/httpd/branches/2.0.x/CHANGES Wed Mar 30 03:00:06 2005
@@ -1,5 +1,7 @@
Changes with Apache 2.0.54
+ *) Add a build script to create a solaris package. [Graham Leggett]
+
*) worker MPM: Fix a problem which could cause httpd processes to
remain active after shutdown. [Jeff Trawick]
Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?view=diff&r1=159474&r2=159475
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Wed Mar 30 03:00:06 2005
@@ -94,10 +94,6 @@
identify exactly what the proposed changes are! ]
[ please append new backports at the end of this list not the top. ]
- *) Add a build script to create a solaris package.
- svn rev 124104
- +1: minfrin, trawick
-
*) util_ldap: Add the directive LDAPConnectionTimeout to control
the socket timeout value when binding to an LDAP server
svn rev 126565
Propchange: httpd/httpd/branches/2.0.x/build/pkg/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 30 03:00:06 2005
@@ -0,0 +1 @@
+pkginfo
Added: httpd/httpd/branches/2.0.x/build/pkg/README
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/build/pkg/README?view=auto&rev=159475
==============================================================================
--- httpd/httpd/branches/2.0.x/build/pkg/README (added)
+++ httpd/httpd/branches/2.0.x/build/pkg/README Wed Mar 30 03:00:06 2005
@@ -0,0 +1,16 @@
+The script in this directory will attempt to build a Solaris package
+out of a source tree for httpd.
+
+To build a package, make sure you are in the root of the source tree,
+and run:
+
+build/pkg/buildpkg.sh
+
+A Solaris package called httpd-<version>-<architecture>-local.gz will be
+created in the root of the source tree.
+
+By default, the script will attempt to find a system installed version of
+APR and APR-util v1. You may override the location of apr or apr-util like so:
+
+build/pkg/buildpkg.sh --with-apr=some/other/path --with-apr-util=some/other/path
+
Propchange: httpd/httpd/branches/2.0.x/build/pkg/README
------------------------------------------------------------------------------
svn:eol-style = native
Added: httpd/httpd/branches/2.0.x/build/pkg/buildpkg.sh
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/build/pkg/buildpkg.sh?view=auto&rev=159475
==============================================================================
--- httpd/httpd/branches/2.0.x/build/pkg/buildpkg.sh (added)
+++ httpd/httpd/branches/2.0.x/build/pkg/buildpkg.sh Wed Mar 30 03:00:06 2005
@@ -0,0 +1,94 @@
+#!/bin/sh
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
+# buildpkg.sh: This script builds a Solaris PKG from the source tree
+# provided.
+
+LAYOUT=Apache
+PREFIX=/usr/local/apache2
+TEMPDIR=/var/tmp/$USER/httpd-root
+rm -rf $TEMPDIR
+
+apr_config=`which apr-config`
+apu_config=`which apu-config`
+
+while test $# -gt 0
+do
+ # Normalize
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case "$1" in
+ --with-apr=*)
+ apr_config=$optarg
+ ;;
+ esac
+
+ case "$1" in
+ --with-apr-util=*)
+ apu_config=$optarg
+ ;;
+ esac
+
+ shift
+done
+
+if [ ! -f "$apr_config" -a ! -f "$apr_config/configure.in" ]; then
+ echo "The apr source directory / apr-1-config could not be found"
+ echo "Usage: buildpkg [--with-apr=[dir|file]] [--with-apr-util=[dir|file]]"
+ exit 1
+fi
+
+if [ ! -f "$apu_config" -a ! -f "$apu_config/configure.in" ]; then
+ echo "The apu source directory / apu-1-config could not be found"
+ echo "Usage: buildpkg [--with-apr=[dir|file]] [--with-apr-util=[dir|file]]"
+ exit 1
+fi
+
+./configure --enable-layout=$LAYOUT \
+ --with-apr=$apr_config \
+ --with-apr-util=$apu_config \
+ --enable-mods-shared=all \
+ --with-devrandom \
+ --with-ldap --enable-ldap --enable-authnz-ldap \
+ --enable-cache --enable-disk-cache --enable-mem-cache \
+ --enable-ssl --with-ssl \
+ --enable-deflate --enable-cgid \
+ --enable-proxy --enable-proxy-connect \
+ --enable-proxy-http --enable-proxy-ftp
+
+make
+make install DESTDIR=$TEMPDIR
+. build/pkg/pkginfo
+cp build/pkg/pkginfo $TEMPDIR$PREFIX
+
+current=`pwd`
+cd $TEMPDIR$PREFIX
+echo "i pkginfo=./pkginfo" > prototype
+find . -print | grep -v ./prototype | grep -v ./pkginfo | pkgproto | awk '{print $1" "$2" "$3" "$4" root bin"}' >> prototype
+mkdir $TEMPDIR/pkg
+pkgmk -r $TEMPDIR$PREFIX -d $TEMPDIR/pkg
+
+cd $current
+pkgtrans -s $TEMPDIR/pkg $current/$NAME-$VERSION-$ARCH-local
+gzip $current/$NAME-$VERSION-$ARCH-local
+
+rm -rf $TEMPDIR
+
Propchange: httpd/httpd/branches/2.0.x/build/pkg/buildpkg.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/httpd/branches/2.0.x/build/pkg/buildpkg.sh
------------------------------------------------------------------------------
svn:executable = *
Added: httpd/httpd/branches/2.0.x/build/pkg/pkginfo.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/build/pkg/pkginfo.in?view=auto&rev=159475
==============================================================================
--- httpd/httpd/branches/2.0.x/build/pkg/pkginfo.in (added)
+++ httpd/httpd/branches/2.0.x/build/pkg/pkginfo.in Wed Mar 30 03:00:06 2005
@@ -0,0 +1,11 @@
+PKG="ASFhttpd"
+NAME="httpd"
+ARCH="@target_cpu@"
+VERSION="@HTTPD_VERSION@"
+CATEGORY="application"
+VENDOR="Apache Software Foundation"
+EMAIL="dev@httpd.apache.org"
+PSTAMP="dev@httpd.apache.org"
+BASEDIR="@prefix@"
+CLASSES="none"
+
Propchange: httpd/httpd/branches/2.0.x/build/pkg/pkginfo.in
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/branches/2.0.x/configure.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/configure.in?view=diff&r1=159474&r2=159475
==============================================================================
--- httpd/httpd/branches/2.0.x/configure.in (original)
+++ httpd/httpd/branches/2.0.x/configure.in Wed Mar 30 03:00:06 2005
@@ -579,7 +579,11 @@
dnl Ensure that docs/conf is created.
test -d docs/conf||$mkdir_p docs/conf
-AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf docs/conf/ssl-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[
+dnl Ensure that the httpd version is included
+HTTPD_VERSION=`build/get-version.sh all include/ap_release.h AP_SERVER`
+AC_SUBST(HTTPD_VERSION)
+
+AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf docs/conf/ssl-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo,[true],[
APACHE_GEN_MAKEFILES
])