REORG: include: move version.h to haproxy/

Few files were affected. The release scripts was updated.

diff --git a/include/common/version.h b/include/haproxy/version.h
similarity index 92%
rename from include/common/version.h
rename to include/haproxy/version.h
index b38104f288977604f9c4630028ff6ba634c34921..446ce5a1a8302f83ee451d6e9918859331dc613d 100644 (file)
--- a/include/common/version.h
+++ b/include/haproxy/version.h
@@ -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 */
 

diff --git a/scripts/create-release b/scripts/create-release
index bc87e82c3a97771b705421989c6b54e5cf9bdcc6..b8a867c1f00d19cde0502099a6d47b23ae49571b 100755 (executable)
--- a/scripts/create-release
+++ b/scripts/create-release
@@ -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 \

diff --git a/src/cli.c b/src/cli.c
index 381a9e6125cd5be36b7d475c67cdf5345dbdae98..9212651d97009227f7f4fc1a496f5406b939dc61 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -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>

diff --git a/src/haproxy.c b/src/haproxy.c
index 0e71ba72eb5c68a4882362166f366f1114fbb991..2351aed33502e875329c495eec0db7aa60b1864b 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -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>

diff --git a/src/http_acl.c b/src/http_acl.c
index 5a8c634b2e03140df9df35c40134d577bc866124..06c5d71f2b8a43806545d56c783865c415950025 100644 (file)
--- a/src/http_acl.c
+++ b/src/http_acl.c
@@ -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>
 

diff --git a/src/http_act.c b/src/http_act.c
index d116f1d17c4468a2c748269e8cd42daa51af2626..1918aa5839e36cabf4240d6313af9fbc0a026259 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -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>

diff --git a/src/http_conv.c b/src/http_conv.c
index d83541d342c70ee0c1dc22f267d5e1c24dfff398..83c6bb33b45fa5388775d87c8959aea717651c1a 100644 (file)
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -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>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 96c774be6a613bf5018ea01684f0117e48a72086..0ea509c41ed9279742145c56e14b4575aa7bdec8 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -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>
 

diff --git a/src/http_rules.c b/src/http_rules.c
index a2a4e05b4ff829ff807e72bb11761b337a147d90..2661062ee3cfc81e37409389ecf6d541381c0980 100644 (file)
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -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>

diff --git a/src/log.c b/src/log.c
index 87b12fc38661035fd468bae67ad7bc00421f1a80..a8bf820aada78d1b2da94a702aabcebcb0bfe96c 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -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>

diff --git a/src/mworker.c b/src/mworker.c
index f41ee9fa3553265020b4adb2e474b937f8971dea..95c06bba1a6717dfb94364eb1d89765afead386b 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -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>

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index a8b78caa48b4c8bcf0b84e42049441c1a864c7fc..8a0773c5b42a96223050431a707e898f95479d71 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -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>
 

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index d41e1c0a4146c5ba429380c139a563475de2b1bc..e9b85dd88b70a5d7c9290e771b4ac2c23dfac98c 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -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>
 

diff --git a/src/stats.c b/src/stats.c
index bfe7accb4491e11f51c3190ada5d2de11ec1610a..8cb1840eaae5082a338e586259a7a1e53374ca83 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -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>

diff --git a/src/version.c b/src/version.c
index dae7b3df0d4b454d49790e4e9c80b28539104746..99a85776f6851213391b2994458e5a14822f492a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -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.