Increase the version number to 1.0

diff --git a/configure.ac b/configure.ac
index 2bf552a45d2c4bb52ac89773a195b0ee4310d2f1..ada27424785c5b8be3e752b42af3b6ca278dfb00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u
 dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62
 AC_PREREQ([2.62])
 dnl Keep the version number in sync with main.h!
-AC_INIT([znc], [0.207])
+AC_INIT([znc], [1.0])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/znc.cpp])
 AC_LANG([C++])

diff --git a/include/znc/version.h b/include/znc/version.h
index d1cbd758618f214185a4bc6327d9e43d787be78c..97297aae777b0ef657bc5cd7b81651cf42f06212 100644 (file)
--- a/include/znc/version.h
+++ b/include/znc/version.h
@@ -2,10 +2,10 @@
 #define _VERSION_H
 
 // The following defines are for #if comparison (preprocessor only likes ints)
-#define VERSION_MAJOR  0
-#define VERSION_MINOR  207
+#define VERSION_MAJOR  1
+#define VERSION_MINOR  0
 // This one is for display purpose
-#define VERSION        (VERSION_MAJOR + VERSION_MINOR / 1000.0)
+#define VERSION        (VERSION_MAJOR + VERSION_MINOR / 10.0)
 
 // You can add -DVERSION_EXTRA="stuff" to your CXXFLAGS!
 extern const char* ZNC_VERSION_EXTRA;

diff --git a/src/znc.cpp b/src/znc.cpp
index 7559aa9a746577d2055224b7ff0d8238f8042fa3..94697900581ee502f5e3291d9e50feacff22c8d5 100644 (file)
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -79,7 +79,7 @@ CZNC::~CZNC() {
 CString CZNC::GetVersion() {
        char szBuf[128];
 
-       snprintf(szBuf, sizeof(szBuf), "%1.3f%s", VERSION, ZNC_VERSION_EXTRA);
+       snprintf(szBuf, sizeof(szBuf), "%1.1f%s", VERSION, ZNC_VERSION_EXTRA);
        // If snprintf overflows (which I doubt), we want to be on the safe side
        szBuf[sizeof(szBuf) - 1] = '\0';
 
@@ -94,7 +94,7 @@ CString CZNC::GetTag(bool bIncludeVersion, bool bHTML) {
        }
 
        char szBuf[128];
-       snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f%s - ", VERSION, ZNC_VERSION_EXTRA);
+       snprintf(szBuf, sizeof(szBuf), "ZNC %1.1f%s - ", VERSION, ZNC_VERSION_EXTRA);
        // If snprintf overflows (which I doubt), we want to be on the safe side
        szBuf[sizeof(szBuf) - 1] = '\0';
 
@@ -422,7 +422,7 @@ bool CZNC::WriteConfig() {
        config.AddKeyValuePair("MaxBufferSize", CString(m_uiMaxBufferSize));
        config.AddKeyValuePair("SSLCertFile", CString(m_sSSLCertFile));
        config.AddKeyValuePair("ProtectWebSessions", CString(m_bProtectWebSessions));
-       config.AddKeyValuePair("Version", CString(VERSION, 3));
+       config.AddKeyValuePair("Version", CString(VERSION, 1));
 
        for (size_t l = 0; l < m_vpListeners.size(); l++) {
                CListener* pListener = m_vpListeners[l];
@@ -535,7 +535,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
        VCString vsLines;
 
        vsLines.push_back(MakeConfigHeader());
-       vsLines.push_back("Version = " + CString(VERSION, 3));
+       vsLines.push_back("Version = " + CString(VERSION, 1));
 
        m_sConfigFile = ExpandConfigPath(sConfigFile);
        CUtils::PrintMessage("Building new config");
@@ -1083,7 +1083,7 @@ bool CZNC::DoRehash(CString& sError)
                        sSavedVersion = "< 0.203";
                }
                CUtils::PrintMessage("Found old config from ZNC " + sSavedVersion + ". Saving a backup of it.");
-               BackupConfigOnce("pre-" + CString(VERSION, 3));
+               BackupConfigOnce("pre-" + CString(VERSION, 1));
        } else if (fSavedVersion > VERSION + 0.000001) {
                CUtils::PrintError("Config was saved from ZNC " + sSavedVersion + ". It may or may not work with current ZNC " + GetVersion());
        }