> Well, it seriously look ugly though... Ok, I admit it might be a PITA cuz in
> Windows we can't simply do a `cat VERSION` and get that number in somewhere,
> but boy that wa_version header looks ugly...

I admited that it is ugly.  See below.

> 
> Just the fact that we somehow have an "area to modify" and one not, _is_
> complicating things around...
> 
> Secondly, I don't want to have alpha/beta/gamma/whatever compiled in the
> code: for releasing purpose, a code is x.x.x-dev if it's not associated with
> a tag, and x.x.x when it actually _IS_ associated with a tag...
> 
> When we tag a release, we call it 1.2.0, and then depending on how "well" it
> goes, we can promote it from beta to gamma to whatever, but we will NOT
> rebuild the binaries...
> 
> I'll commit a patch...

See the attached wa_version I originally proposed.  I initially copied 
this from httpd-2.0.

See this thread:
http://marc.theaimsgroup.com/?l=tomcat-dev&m=100878406017530&w=2
The reason I change to mod_jk way is that JF suggested, and I followed.

Hope this help.

> 
>     Pier

Punky

/* ========================================================================= *
 *                                                                           *
 *                 The Apache Software License,  Version 1.1                 *
 *                                                                           *
 *          Copyright (c) 1999-2001 The Apache Software Foundation.          *
 *                           All rights reserved.                            *
 *                                                                           *
 * ========================================================================= *
 *                                                                           *
 * Redistribution and use in source and binary forms,  with or without modi- *
 * fication, are permitted provided that the following conditions are met:   *
 *                                                                           *
 * 1. Redistributions of source code  must retain the above copyright notice *
 *    notice, this list of conditions and the following disclaimer.          *
 *                                                                           *
 * 2. Redistributions  in binary  form  must  reproduce the  above copyright *
 *    notice,  this list of conditions  and the following  disclaimer in the *
 *    documentation and/or other materials provided with the distribution.   *
 *                                                                           *
 * 3. The end-user documentation  included with the redistribution,  if any, *
 *    must include the following acknowlegement:                             *
 *                                                                           *
 *       "This product includes  software developed  by the Apache  Software *
 *        Foundation <http://www.apache.org/>."                              *
 *                                                                           *
 *    Alternately, this acknowlegement may appear in the software itself, if *
 *    and wherever such third-party acknowlegements normally appear.         *
 *                                                                           *
 * 4. The names  "The  Jakarta  Project",  "WebApp",  and  "Apache  Software *
 *    Foundation"  must not be used  to endorse or promote  products derived *
 *    from this  software without  prior  written  permission.  For  written *
 *    permission, please contact <[EMAIL PROTECTED]>.                        *
 *                                                                           *
 * 5. Products derived from this software may not be called "Apache" nor may *
 *    "Apache" appear in their names without prior written permission of the *
 *    Apache Software Foundation.                                            *
 *                                                                           *
 * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
 * INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY *
 * AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL *
 * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
 * DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL *
 * DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS *
 * OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) *
 * HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, *
 * STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
 * ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE *
 * POSSIBILITY OF SUCH DAMAGE.                                               *
 *                                                                           *
 * ========================================================================= *
 *                                                                           *
 * This software  consists of voluntary  contributions made  by many indivi- *
 * duals on behalf of the  Apache Software Foundation.  For more information *
 * on the Apache Software Foundation, please see <http://www.apache.org/>.   *
 *                                                                           *
 * ========================================================================= */

#ifndef _WA_VERSION_H_
#define _WA_VERSION_H_

/*
 * Before releasing mod_webapp, "-dev" from WA_BASEREVISION should be removed
 */
#define WA_BASEPRODUCT "mod_webapp"
#define WA_BASEREVISION "1.2.0-dev"
#define WA_BASEVERSION WA_BASEPRODUCT "/" WA_BASEREVISION

/*
 * WA_VERSION should be used for version information
 */
#define WA_VERSION WA_BASEVERSION
 
#endif /* _WA_VERSION_H_ */

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to