From f26e95d4c728dcfe777b26b87a04494bb20bb194 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sat, 14 Apr 2018 18:58:27 +0200 Subject: [PATCH] Bump version. --- docs/d0/dd7/_version_8h_source.html | 2 +- src/Config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/d0/dd7/_version_8h_source.html b/docs/d0/dd7/_version_8h_source.html index f96d5ee..78f5e61 100644 --- a/docs/d0/dd7/_version_8h_source.html +++ b/docs/d0/dd7/_version_8h_source.html @@ -67,7 +67,7 @@ $(function() {
Version.h
-
1 // MuldeR's Utilities for Qt
3 // Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
4 //
5 // This library is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU Lesser General Public
7 // License as published by the Free Software Foundation; either
8 // version 2.1 of the License, or (at your option) any later version.
9 //
10 // This library is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 // Lesser General Public License for more details.
14 //
15 // You should have received a copy of the GNU Lesser General Public
16 // License along with this library; if not, write to the Free Software
17 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18 //
19 // http://www.gnu.org/licenses/lgpl-2.1.txt
21 
22 #pragma once
23 
24 //MUtils
25 #include <MUtils/Global.h>
26 
27 //Qt
28 #include <QString>
29 #include <QDate>
30 #include <QTime>
31 
32 namespace MUtils
33 {
34  class Version
35  {
36  public:
37  //Get Library Version Numbers
38  MUTILS_API static const quint32 &lib_version_major(void);
39  MUTILS_API static const quint32 &lib_version_minor(void);
40 
41  //Get Library Build Date/Time
42  MUTILS_API static const QDate lib_build_date(void);
43  MUTILS_API static const QTime lib_build_time(void);
44 
45  //Get Application Build Date/Time
46  MUTILS_API static const QDate app_build_date(const char *const date_str = build_date_raw());
47  MUTILS_API static const QTime app_build_time(const char *const time_str = build_time_raw());
48 
49  //Compiler detection
50  static const char *const compiler_version(void)
51  {
52  static const char *const COMPILER_VERS =
53  #if defined(__INTEL_COMPILER)
54  #if (__INTEL_COMPILER >= 1500)
55  "ICL 15." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
56  #elif (__INTEL_COMPILER >= 1400)
57  "ICL 14." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
58  #elif (__INTEL_COMPILER >= 1300)
59  "ICL 13." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
60  #elif (__INTEL_COMPILER >= 1200)
61  "ICL 12." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
62  #elif (__INTEL_COMPILER >= 1100)
63  "ICL 11.x";
64  #elif (__INTEL_COMPILER >= 1000)
65  "ICL 10.x";
66  #else
67  #error Compiler is not supported!
68  #endif
69  #elif defined(_MSC_VER)
70  #if (_MSC_VER == 1913)
71  #if((_MSC_FULL_VER >= 191326128) && (_MSC_FULL_VER <= 191326129))
72  "MSVC 2017.6";
73  #else
74  #error Compiler version is not supported yet!
75  #endif
76  #elif (_MSC_VER == 1912)
77  #if((_MSC_FULL_VER >= 191225830) && (_MSC_FULL_VER <= 191225835))
78  "MSVC 2017.5";
79  #else
80  #error Compiler version is not supported yet!
81  #endif
82  #elif (_MSC_VER == 1911)
83  #if((_MSC_FULL_VER >= 191125542) && (_MSC_FULL_VER <= 191125547))
84  "MSVC 2017.4";
85  #elif((_MSC_FULL_VER >= 191125506) && (_MSC_FULL_VER <= 191125508))
86  "MSVC 2017.3";
87  #else
88  #error Compiler version is not supported yet!
89  #endif
90  #elif (_MSC_VER == 1910)
91  #if ((_MSC_FULL_VER >= 191025017) && (_MSC_FULL_VER <= 191025019))
92  "MSVC 2017.2";
93  #else
94  #error Compiler version is not supported yet!
95  #endif
96  #elif (_MSC_VER == 1900)
97  #if (_MSC_FULL_VER == 190023026)
98  "MSVC 2015";
99  #elif (_MSC_FULL_VER == 190023506)
100  "MSVC 2015.1";
101  #elif (_MSC_FULL_VER == 190023918)
102  "MSVC 2015.2";
103  #elif (_MSC_FULL_VER == 190024210) || (_MSC_FULL_VER == 190024215)
104  "MSVC 2015.3";
105  #else
106  #error Compiler version is not supported yet!
107  #endif
108  #elif (_MSC_VER == 1800)
109  #if (_MSC_FULL_VER == 180021005)
110  "MSVC 2013";
111  #elif (_MSC_FULL_VER == 180030501)
112  "MSVC 2013.2";
113  #elif (_MSC_FULL_VER == 180030723)
114  "MSVC 2013.3";
115  #elif (_MSC_FULL_VER == 180031101)
116  "MSVC 2013.4";
117  #elif (_MSC_FULL_VER == 180040629)
118  "MSVC 2013.5";
119  #else
120  #error Compiler version is not supported yet!
121  #endif
122  #elif (_MSC_VER == 1700)
123  #if (_MSC_FULL_VER == 170050727)
124  "MSVC 2012";
125  #elif (_MSC_FULL_VER == 170051106)
126  "MSVC 2012.1";
127  #elif (_MSC_FULL_VER == 170060315)
128  "MSVC 2012.2";
129  #elif (_MSC_FULL_VER == 170060610)
130  "MSVC 2012.3";
131  #elif (_MSC_FULL_VER == 170061030)
132  "MSVC 2012.4";
133  #else
134  #error Compiler version is not supported yet!
135  #endif
136  #elif (_MSC_VER == 1600)
137  #if (_MSC_FULL_VER >= 160040219)
138  "MSVC 2010-SP1";
139  #else
140  "MSVC 2010";
141  #endif
142  #elif (_MSC_VER == 1500)
143  #if (_MSC_FULL_VER >= 150030729)
144  "MSVC 2008-SP1";
145  #else
146  "MSVC 2008";
147  #endif
148  #else
149  #error Compiler is not supported!
150  #endif
151  #else
152  #error Compiler is not supported!
153  #endif
154  return COMPILER_VERS;
155  }
156 
157  //Architecture detection
158  static const char *const compiler_arch(void)
159  {
160  static const char *const COMPILER_ARCH =
161  #if defined(_M_X64)
162  "x64";
163  #elif defined(_M_IX86)
164  "x86";
165  #else
166  #error Architecture is not supported!
167  #endif
168  return COMPILER_ARCH;
169  }
170 
171  private:
172  //Raw Build date
173  static const char *const build_date_raw(void)
174  {
175  static const char *const RAW_BUILD_DATE = __DATE__;
176  return RAW_BUILD_DATE;
177  }
178 
179  //Raw Build time
180  static const char *const build_time_raw(void)
181  {
182  static const char *const RAW_BUILD_TIME = __TIME__;
183  return RAW_BUILD_TIME;
184  }
185 
186  //Disable construction
187  Version(void) { throw 666; }
188  Version(const Version&) { throw 666; }
189  };
190 }
191 
MUtils::Version
Definition: Version.h:34
+
1 // MuldeR's Utilities for Qt
3 // Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
4 //
5 // This library is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU Lesser General Public
7 // License as published by the Free Software Foundation; either
8 // version 2.1 of the License, or (at your option) any later version.
9 //
10 // This library is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 // Lesser General Public License for more details.
14 //
15 // You should have received a copy of the GNU Lesser General Public
16 // License along with this library; if not, write to the Free Software
17 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18 //
19 // http://www.gnu.org/licenses/lgpl-2.1.txt
21 
22 #pragma once
23 
24 //MUtils
25 #include <MUtils/Global.h>
26 
27 //Qt
28 #include <QString>
29 #include <QDate>
30 #include <QTime>
31 
32 namespace MUtils
33 {
34  class Version
35  {
36  public:
37  //Get Library Version Numbers
38  MUTILS_API static const quint32 &lib_version_major(void);
39  MUTILS_API static const quint32 &lib_version_minor(void);
40 
41  //Get Library Build Date/Time
42  MUTILS_API static const QDate lib_build_date(void);
43  MUTILS_API static const QTime lib_build_time(void);
44 
45  //Get Application Build Date/Time
46  MUTILS_API static const QDate app_build_date(const char *const date_str = build_date_raw());
47  MUTILS_API static const QTime app_build_time(const char *const time_str = build_time_raw());
48 
49  //Compiler detection
50  static const char *const compiler_version(void)
51  {
52  static const char *const COMPILER_VERS =
53  #if defined(__INTEL_COMPILER)
54  #if (__INTEL_COMPILER >= 1500)
55  "ICL 15." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
56  #elif (__INTEL_COMPILER >= 1400)
57  "ICL 14." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
58  #elif (__INTEL_COMPILER >= 1300)
59  "ICL 13." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
60  #elif (__INTEL_COMPILER >= 1200)
61  "ICL 12." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
62  #elif (__INTEL_COMPILER >= 1100)
63  "ICL 11.x";
64  #elif (__INTEL_COMPILER >= 1000)
65  "ICL 10.x";
66  #else
67  #error Compiler is not supported!
68  #endif
69  #elif defined(_MSC_VER)
70  #if (_MSC_VER == 1913)
71  #if((_MSC_FULL_VER >= 191326128) && (_MSC_FULL_VER <= 191326131))
72  "MSVC 2017.6";
73  #else
74  #error Compiler version is not supported yet!
75  #endif
76  #elif (_MSC_VER == 1912)
77  #if((_MSC_FULL_VER >= 191225830) && (_MSC_FULL_VER <= 191225835))
78  "MSVC 2017.5";
79  #else
80  #error Compiler version is not supported yet!
81  #endif
82  #elif (_MSC_VER == 1911)
83  #if((_MSC_FULL_VER >= 191125542) && (_MSC_FULL_VER <= 191125547))
84  "MSVC 2017.4";
85  #elif((_MSC_FULL_VER >= 191125506) && (_MSC_FULL_VER <= 191125508))
86  "MSVC 2017.3";
87  #else
88  #error Compiler version is not supported yet!
89  #endif
90  #elif (_MSC_VER == 1910)
91  #if ((_MSC_FULL_VER >= 191025017) && (_MSC_FULL_VER <= 191025019))
92  "MSVC 2017.2";
93  #else
94  #error Compiler version is not supported yet!
95  #endif
96  #elif (_MSC_VER == 1900)
97  #if (_MSC_FULL_VER == 190023026)
98  "MSVC 2015";
99  #elif (_MSC_FULL_VER == 190023506)
100  "MSVC 2015.1";
101  #elif (_MSC_FULL_VER == 190023918)
102  "MSVC 2015.2";
103  #elif (_MSC_FULL_VER == 190024210) || (_MSC_FULL_VER == 190024215)
104  "MSVC 2015.3";
105  #else
106  #error Compiler version is not supported yet!
107  #endif
108  #elif (_MSC_VER == 1800)
109  #if (_MSC_FULL_VER == 180021005)
110  "MSVC 2013";
111  #elif (_MSC_FULL_VER == 180030501)
112  "MSVC 2013.2";
113  #elif (_MSC_FULL_VER == 180030723)
114  "MSVC 2013.3";
115  #elif (_MSC_FULL_VER == 180031101)
116  "MSVC 2013.4";
117  #elif (_MSC_FULL_VER == 180040629)
118  "MSVC 2013.5";
119  #else
120  #error Compiler version is not supported yet!
121  #endif
122  #elif (_MSC_VER == 1700)
123  #if (_MSC_FULL_VER == 170050727)
124  "MSVC 2012";
125  #elif (_MSC_FULL_VER == 170051106)
126  "MSVC 2012.1";
127  #elif (_MSC_FULL_VER == 170060315)
128  "MSVC 2012.2";
129  #elif (_MSC_FULL_VER == 170060610)
130  "MSVC 2012.3";
131  #elif (_MSC_FULL_VER == 170061030)
132  "MSVC 2012.4";
133  #else
134  #error Compiler version is not supported yet!
135  #endif
136  #elif (_MSC_VER == 1600)
137  #if (_MSC_FULL_VER >= 160040219)
138  "MSVC 2010-SP1";
139  #else
140  "MSVC 2010";
141  #endif
142  #elif (_MSC_VER == 1500)
143  #if (_MSC_FULL_VER >= 150030729)
144  "MSVC 2008-SP1";
145  #else
146  "MSVC 2008";
147  #endif
148  #else
149  #error Compiler is not supported!
150  #endif
151  #else
152  #error Compiler is not supported!
153  #endif
154  return COMPILER_VERS;
155  }
156 
157  //Architecture detection
158  static const char *const compiler_arch(void)
159  {
160  static const char *const COMPILER_ARCH =
161  #if defined(_M_X64)
162  "x64";
163  #elif defined(_M_IX86)
164  "x86";
165  #else
166  #error Architecture is not supported!
167  #endif
168  return COMPILER_ARCH;
169  }
170 
171  private:
172  //Raw Build date
173  static const char *const build_date_raw(void)
174  {
175  static const char *const RAW_BUILD_DATE = __DATE__;
176  return RAW_BUILD_DATE;
177  }
178 
179  //Raw Build time
180  static const char *const build_time_raw(void)
181  {
182  static const char *const RAW_BUILD_TIME = __TIME__;
183  return RAW_BUILD_TIME;
184  }
185 
186  //Disable construction
187  Version(void) { throw 666; }
188  Version(const Version&) { throw 666; }
189  };
190 }
191 
MUtils::Version
Definition: Version.h:34
Global.h
This file contains miscellaneous functions that are generally useful for Qt-based applications...
MUtils
Global MUtils namespace.
Definition: CPUFeatures.h:37
diff --git a/src/Config.h b/src/Config.h index ce53357..ddf0fcd 100644 --- a/src/Config.h +++ b/src/Config.h @@ -31,4 +31,4 @@ #define VER_MUTILS_MAJOR 1 #define VER_MUTILS_MINOR_HI 0 -#define VER_MUTILS_MINOR_LO 8 +#define VER_MUTILS_MINOR_LO 9