Skip to content

Commit

Permalink
Bumped version and modified version checker
Browse files Browse the repository at this point in the history
  • Loading branch information
vagrant committed May 18, 2015
1 parent ce7e0c0 commit 4d499e8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions include/SalmonConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions src/VersionChecker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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();
}
}
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4d499e8

Please sign in to comment.