From 4d499e82486bdb047bab7fd40d521872fa005bcb Mon Sep 17 00:00:00 2001 From: vagrant Date: Mon, 18 May 2015 00:06:08 +0000 Subject: [PATCH] Bumped version and modified version checker --- CMakeLists.txt | 2 +- include/SalmonConfig.hpp | 4 ++-- src/VersionChecker.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e783b62c..b016e3e8a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project (Salmon) set(CPACK_PACKAGE_VERSION "0.3.2") set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR 3") -set(CPACK_PACKAGE_VERSION_PATCH 24") +set(CPACK_PACKAGE_VERSION_PATCH 2") set(CPACK_GENERATOR "TGZ") set(CPACK_SOURCE_GENERATOR "TGZ") set(CPACK_PACKAGE_VENDOR Stony Brook University") diff --git a/include/SalmonConfig.hpp b/include/SalmonConfig.hpp index 9a6fdcb07..de60b6fff 100644 --- a/include/SalmonConfig.hpp +++ b/include/SalmonConfig.hpp @@ -28,8 +28,8 @@ namespace salmon { constexpr char majorVersion[] = "0"; constexpr char minorVersion[] = "3"; - constexpr char patchVersion[] = "0"; - constexpr char version[] = "0.3.0"; + constexpr char patchVersion[] = "2"; + constexpr char version[] = "0.3.2"; } #endif // SALMON_CONFIG_HPP diff --git a/src/VersionChecker.cpp b/src/VersionChecker.cpp index 15aa56300..694230e6a 100644 --- a/src/VersionChecker.cpp +++ b/src/VersionChecker.cpp @@ -30,7 +30,7 @@ VersionChecker::VersionChecker(boost::asio::io_service& io_service, request_stream << "Connection: close\r\n\r\n"; deadline_.async_wait(boost::bind(&VersionChecker::cancel_upgrade_check, this, boost::asio::placeholders::error)); - deadline_.expires_from_now(boost::posix_time::seconds(5)); + deadline_.expires_from_now(boost::posix_time::seconds(7)); // Start an asynchronous resolve to translate the server and service names // into a list of endpoints. @@ -50,7 +50,7 @@ void VersionChecker::cancel_upgrade_check(const boost::system::error_code& err) if ( err != boost::asio::error::operation_aborted ) { deadline_.cancel(); messageStream_ << "Could not resolve upgrade information in the alotted time.\n"; - messageStream_ << "Check for upgrades manually at www.cs.cmu.edu/~ckingsf/sailfish.\n"; + messageStream_ << "Check for upgrades manually at https://combine-lab.github.io/salmon\n"; socket_.close(); } } @@ -166,8 +166,8 @@ void VersionChecker::handle_read_content(const boost::system::error_code& err) { } std::string getVersionMessage() { - std::string baseSite{"www.cs.cmu.edu"}; - std::string path{"/~ckingsf/software/sailfish/version_info/"}; + std::string baseSite{"combine-lab.github.io"}; + std::string path{"/salmon/version_info/"}; path += salmon::version; std::stringstream ss;