changeset 881:adeede06b2f3

misc: merge from stable-3
author David Demelier <markand@malikania.fr>
date Thu, 15 Aug 2019 22:38:16 +0200
parents bf2bdb41f181 (current diff) ff11e26d798c (diff)
children 6704e7ded799
files
diffstat 7 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Thu Aug 15 19:47:53 2019 +0200
+++ b/.hgsigs	Thu Aug 15 22:38:16 2019 +0200
@@ -7,3 +7,4 @@
 ae054128f365f9c91aa0f112a0b2c4c99265c00a 0 iQEcBAABAgAGBQJZWI5EAAoJEKHa+bhAI/MfWOIIAK7paY/J/qmm8tWi1zz981MqaJbXaL0+uLZCWNDXp3WjC237IHPa3bhLf5NL5bU4UnVwpBJSx9Sow4jrHZckuDSx+1I1cRoPngvsHDwo6YnekYHF2XX4ZI7NFQ+3D/IDYx+PQEKbQmw/XzxLGAfDzMLLo6mLfL8I/zak4fMprQ309Ka0lvsTdxiAzimYYVRN6MRVhVyv3udxQRGVU+waNCwzgfFZTjFHacFjBkY7PQWdVdtuf5uRyOiVF5HpBFf/Xi8eyfkRwRwKsSqsphkXPJctu8xeF9AYtu5/9x+T5L8SPK4fST1dRLdq0TZUFPhU/mgcVXiiqXpOagNQolKdjW0=
 b347b10d24c1f21737c677b5dcfbdcce97a2e945 0 iQEcBAABAgAGBQJZewPlAAoJEKHa+bhAI/MfXvcIAKX+kjUlKUxLqTkEPJYSTavlLwjdBoee1tesN7r4rMkxzy+WEHZnFEZToRgOqq4bcPS02J3XQcgZdHEysI43SezV44ZQVjdYyN2p2T98RuaXYXScE/pN7m0OFhiQHK6ozbeIRdDmx3i0l7ROYBiUmDWew0PZ4YULaLcSUnzELPYQfajCi2Vx4tmuKp42OG4gZQdgK60T2prl/tkzplS0TOErnPwCN0Vg+zJkD9JR9f9hsd7A2+3bkVyn7qe3HcgHzl6OsPt/P75siDpQv9lXA7s2mSYlzTmuffrviyms90K5ogbEkW56QQ8H8DGvtM5mLsIgNiatfAuXxAJfNj6FJj4=
 d5bfaf362ded7a15e1c9da50805a7ee6a95b4875 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAlvhaEkACgkQodr5uEAj8x+EWwf/aeFmJ5JkHc/LsLSiHHwHQDIcnuyvRemz5VX/6um41jygTx3VUPYFC+mrtyql+ot5bstsI/9l8C1hFEAAimiIy7bhbALWdbqieJjBhXaUVSsJFq+YzOVR+k/6BZSJHTWL4lf4+Jic1ACsBWPXEQpyqxxdGpbmb7EXmx0ZZlXJIb1Xd0l/eev+ONIW9NwbabqvaoaUFab5BnrOu4LeZA1Ny2u7Wm2KJtyJAiJzwKfRjyDmJ7D0ljg7n24SzuxCC0vJS+drLd38dCaaYrLrL9WlndPql+IxTDByAGs9g/SkdJRis4ubDMXV92rLxZtdJZEyzoanethrFQn/s0Y0EOnGsg==
+fb0adda67228d8f1de259eaf00ecde102f99666b 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl1VwjIACgkQodr5uEAj8x8WTwf9Hs+G8kCIjrXJXlHlPTEjEPH+icIPvXxcT+1CsIp2v4QxBgjocxBH4APdhH7iTXQ1GnOBA5txuYOonDJBL/cfkv60F366YZTNKeZt89QSty8gIIyR3WMGMlTnidhFziu3O950YOc4tjDXfQI4JuLIHNJSwEwDSzAsaXv8QNg+3VnXqX0EybGMT93Vi5eJZSUocluzWEF8eVgF6simgDUguiFPZZyYymVQTt7SZS2fevfBHOp+mtj5zdsH27N7TFU+1i3j4qfn3Yp0fYHieFeihpo3Tb9V8A1SK+3gOMp+7pEEV786XhwGaPr1XFZ/pBBdUReIfupPcdVjKoUnnIqx3w==
--- a/.hgtags	Thu Aug 15 19:47:53 2019 +0200
+++ b/.hgtags	Thu Aug 15 22:38:16 2019 +0200
@@ -7,3 +7,4 @@
 315460895f853f525f2a5427109a6a05436429d7 2.1.2
 c3f46ad1ece6c9eccfe42f0f683f01aa3a29da9f 2.1.3
 76aaaf7cd5a3410c97c644d3aa90bd2372c56aa4 2.2.0
+6baa070e083cb7cecb4cb64c2d2729575c72b3c1 3.0.0
--- a/CHANGES.md	Thu Aug 15 19:47:53 2019 +0200
+++ b/CHANGES.md	Thu Aug 15 22:38:16 2019 +0200
@@ -1,7 +1,7 @@
 IRC Client Daemon CHANGES
 =========================
 
-irccd current
+irccd 3.0.0 2019-08-15
 ----------------------
 
 irccd:
--- a/cmake/IrccdPackage.cmake	Thu Aug 15 19:47:53 2019 +0200
+++ b/cmake/IrccdPackage.cmake	Thu Aug 15 22:38:16 2019 +0200
@@ -16,7 +16,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION_RAW}")
 set(CPACK_SOURCE_GENERATOR TXZ ZIP)
 set(CPACK_SOURCE_IGNORE_FILES "/[.]hg" "/CMakeLists[.]txt[.]user")
 
@@ -46,8 +46,8 @@
 	set(CPACK_GENERATOR "NSIS")
 
 	if (IRCCD_64BITS)
-		set(CPACK_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION}-amd64")
+		set(CPACK_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION_RAW}-amd64")
 	else ()
-		set(CPACK_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION}-x86")
+		set(CPACK_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION_RAW}-x86")
 	endif ()
 endif ()
--- a/cmake/IrccdVersion.cmake	Thu Aug 15 19:47:53 2019 +0200
+++ b/cmake/IrccdVersion.cmake	Thu Aug 15 22:38:16 2019 +0200
@@ -31,7 +31,8 @@
 set(IRCCD_VERSION_MAJOR "3")
 set(IRCCD_VERSION_MINOR "0")
 set(IRCCD_VERSION_PATCH "0")
-set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}-dev${HG_REV}")
+set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}${HG_REV}")
+set(IRCCD_VERSION_RAW "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}")
 set(IRCCD_VERSION_SHLIB "1")
 
 #
@@ -42,9 +43,9 @@
 # IRCCD_RELEASE_DATE_DAY        2 digits (01 = first day of month)
 #
 set(IRCCD_RELEASE_DATE_YEAR 2019)
-set(IRCCD_RELEASE_DATE_MONTH 09)
-set(IRCCD_RELEASE_DATE_DAY 26)
+set(IRCCD_RELEASE_DATE_MONTH 08)
+set(IRCCD_RELEASE_DATE_DAY 15)
 set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}")
 
 # Irccd release data (manual version).
-set(IRCCD_MAN_DATE "September 26, 2019")
+set(IRCCD_MAN_DATE "August 15, 2019")
--- a/cmake/function/IrccdDefineLibrary.cmake	Thu Aug 15 19:47:53 2019 +0200
+++ b/cmake/function/IrccdDefineLibrary.cmake	Thu Aug 15 22:38:16 2019 +0200
@@ -30,7 +30,7 @@
 #   HEADERS             (Optional) directory of headers to install
 #   FLAGS               (Optional) C/C++ flags (without -D)
 #   LIBRARIES           (Optional) libraries to link
-#   LOCAL_INCLUDES      (Optional) local includes for the target only
+#   PRIVATE_INCLUDES    (Optional) local includes for the target only
 #   PUBLIC_INCLUDES     (Optional) includes to share with target dependencies
 # )
 #
@@ -43,7 +43,7 @@
 # The argument SOURCES should contains the C++ source files and HEADERS should
 # points to a directory to be installed verbatim in the include directory.
 #
-# Optional argument FLAGS, LOCAL_INCLUDES, PUBLIC_INCLUDES, LIBRARIES may be
+# Optional argument FLAGS, PRIVATE_INCLUDES, PUBLIC_INCLUDES, LIBRARIES may be
 # passed to set compile flags, private includes, public includes and libraries
 # respectively.
 #
@@ -55,7 +55,7 @@
 function(irccd_define_library)
 	set(options EXPORT)
 	set(oneValueArgs TARGET)
-	set(multiValueArgs HEADERS SOURCES FLAGS LIBRARIES LOCAL_INCLUDES PUBLIC_INCLUDES)
+	set(multiValueArgs HEADERS SOURCES FLAGS LIBRARIES PRIVATE_INCLUDES PUBLIC_INCLUDES)
 
 	cmake_parse_arguments(LIB "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -69,7 +69,7 @@
 	add_library(${LIB_TARGET} ${LIB_SOURCES} ${LIB_HEADERS})
 	target_include_directories(
 		${LIB_TARGET}
-		PRIVATE ${LIB_LOCAL_INCLUDES}
+		PRIVATE ${LIB_PRIVATE_INCLUDES}
 		PUBLIC ${LIB_PUBLIC_INCLUDES}
 	)
 	target_compile_definitions(
--- a/doc/doxygen/pages.dox	Thu Aug 15 19:47:53 2019 +0200
+++ b/doc/doxygen/pages.dox	Thu Aug 15 22:38:16 2019 +0200
@@ -364,7 +364,7 @@
  *   HEADERS             (Optional) directory of headers to install
  *   FLAGS               (Optional) C/C++ flags (without -D)
  *   LIBRARIES           (Optional) libraries to link
- *   LOCAL_INCLUDES      (Optional) local includes for the target only
+ *   PRIVATE_INCLUDES    (Optional) local includes for the target only
  *   PUBLIC_INCLUDES     (Optional) includes to share with target dependencies
  * )
  * ```
@@ -378,8 +378,9 @@
  * The argument SOURCES should contains the C++ source files and HEADERS should
  * points to a directory to be installed verbatim in the include directory.
  *
- * Optional argument FLAGS, LOCAL_INCLUDES, PUBLIC_INCLUDES may be passed to set
- * compile flags, private includes, public includes and libraries respectively.
+ * Optional argument FLAGS, PRIVATE_INCLUDES, PUBLIC_INCLUDES may be passed to
+ * set compile flags, private includes, public includes and libraries
+ * respectively.
  *
  * If export boolean parameter is set, the library is exported and installed.
  *