REORG: include: move version.h to haproxy/
Few files were affected. The release scripts was updated.
This commit is contained in:
parent
fd4bffe7c0
commit
d678805783
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* include/common/version.h
|
||||
* include/haproxy/version.h
|
||||
* This file serves as a template for future include files.
|
||||
*
|
||||
* Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
|
||||
* Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@ -19,8 +19,8 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef _COMMON_VERSION_H
|
||||
#define _COMMON_VERSION_H
|
||||
#ifndef _HAPROXY_VERSION_H
|
||||
#define _HAPROXY_VERSION_H
|
||||
|
||||
#include <haproxy/api.h>
|
||||
|
||||
@ -82,5 +82,5 @@ extern char haproxy_version[];
|
||||
extern char haproxy_date[];
|
||||
extern char stats_version_string[];
|
||||
|
||||
#endif /* _COMMON_VERSION_H */
|
||||
#endif /* _HAPROXY_VERSION_H */
|
||||
|
@ -197,7 +197,7 @@ sed -e "s:Copyright 2000-[0-9]*\s*Willy Tarreau.*>:Copyright 2000-$YEAR Willy Ta
|
||||
|
||||
echo "Updating version.h ..."
|
||||
sed -e "s:^\(#define\s*PRODUCT_BRANCH\s*\)\"[^\"]*\":\1\"$BRANCH\":" \
|
||||
-i include/common/version.h
|
||||
-i include/haproxy/version.h
|
||||
|
||||
if [ -n "$INTERACTIVE" ]; then
|
||||
vi CHANGELOG VERSION VERDATE \
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <common/ticks.h>
|
||||
#include <common/time.h>
|
||||
#include <common/uri_auth.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
#include <common/base64.h>
|
||||
|
||||
#include <types/applet.h>
|
||||
|
@ -94,7 +94,7 @@
|
||||
#include <common/standard.h>
|
||||
#include <common/time.h>
|
||||
#include <common/uri_auth.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
#include <common/hathreads.h>
|
||||
|
||||
#include <types/capture.h>
|
||||
|
@ -22,7 +22,7 @@
|
||||
#include <common/http.h>
|
||||
#include <common/memory.h>
|
||||
#include <common/standard.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <types/global.h>
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include <common/memory.h>
|
||||
#include <common/standard.h>
|
||||
#include <common/uri_auth.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <types/capture.h>
|
||||
#include <types/global.h>
|
||||
|
@ -22,7 +22,7 @@
|
||||
#include <common/http.h>
|
||||
#include <common/memory.h>
|
||||
#include <common/standard.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <types/capture.h>
|
||||
#include <types/global.h>
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include <common/htx.h>
|
||||
#include <common/memory.h>
|
||||
#include <common/standard.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <types/global.h>
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
||||
#include <common/http.h>
|
||||
#include <common/memory.h>
|
||||
#include <common/standard.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <types/capture.h>
|
||||
#include <types/global.h>
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include <haproxy/api.h>
|
||||
#include <common/standard.h>
|
||||
#include <common/time.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <types/cli.h>
|
||||
#include <types/global.h>
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <haproxy/api.h>
|
||||
#include <common/cfgparse.h>
|
||||
#include <common/mini-clist.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <types/cli.h>
|
||||
#include <types/global.h>
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include <common/mini-clist.h>
|
||||
#include <common/standard.h>
|
||||
#include <common/time.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <types/global.h>
|
||||
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include <common/mini-clist.h>
|
||||
#include <common/standard.h>
|
||||
#include <common/time.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <types/global.h>
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <common/ticks.h>
|
||||
#include <common/time.h>
|
||||
#include <common/uri_auth.h>
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
#include <common/base64.h>
|
||||
|
||||
#include <types/applet.h>
|
||||
|
@ -4,7 +4,7 @@
|
||||
* code version.
|
||||
*/
|
||||
|
||||
#include <common/version.h>
|
||||
#include <haproxy/version.h>
|
||||
|
||||
/* These ones are made variables and not constants so that they are stored into
|
||||
* the data region and prominently appear in core files.
|
||||
|
Loading…
x
Reference in New Issue
Block a user