Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] add server version to version.h #3448

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
+14 −11
Draft

[WIP] add server version to version.h #3448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fab3d5
update project list
davidpanderson Jan 24, 2020
d03c68c
Merge branch 'master' of github.com:BOINC/boinc
davidpanderson Jan 25, 2020
4e74ff4
Merge branch 'master' of github.com:BOINC/boinc
davidpanderson Jan 28, 2020
47a3dc2
Merge branch 'master' of github.com:BOINC/boinc
davidpanderson Feb 4, 2020
3f0d305
Add server version to version.h, and have scheduler report server ver…
davidpanderson Feb 4, 2020
982d36a
server: build fix
davidpanderson Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions html/inc/server_version.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// the server code release number (major/minor/release).
// Update this when you do a server release.

// This should agree with version.h

// public releases have even minor #,
// and are assumed to have a branch on github.
// dev versions (e.g. master) have an odd minor #
Expand Down
3 changes: 2 additions & 1 deletion sched/sched_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <string>
#include <cstring>

#include "version.h"
#include "parse.h"
#include "error_numbers.h"
#include "str_util.h"
Expand Down Expand Up @@ -766,7 +767,7 @@ int SCHEDULER_REPLY::write(FILE* fout, SCHEDULER_REQUEST& sreq) {
"Content-type: text/xml\n\n"
"<scheduler_reply>\n"
"<scheduler_version>%d</scheduler_version>\n",
BOINC_MAJOR_VERSION*100+BOINC_MINOR_VERSION
SERVER_MAJOR_VERSION*100+SERVER_MINOR_VERSION
);
if (sreq.core_client_version >= 70028) {
fprintf(fout, "<dont_use_dcf/>\n");
Expand Down
20 changes: 10 additions & 10 deletions version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
#ifndef BOINC_VERSION_H
#define BOINC_VERSION_H

/* Major part of BOINC version number */
/* client version number */
#define BOINC_MAJOR_VERSION 7

/* Minor part of BOINC version number */
#define BOINC_MINOR_VERSION 17

/* Release part of BOINC version number */
#define BOINC_RELEASE 0
#define BOINC_VERSION_STRING "7.17.0"

/* Release part of wrapper version number */
/* server version: must match html/inc/server_version.inc */
#define SERVER_MAJOR_VERSION 1
#define SERVER_MINOR_VERSION 1
#define SERVER_RELEASE 0
#define SERVER_VERSION_STRING "1.1.0"

/* wrapper version number */
#define WRAPPER_RELEASE 26016

/* Release part of vboxwrapper version number */
/* vboxwrapper version number */
#define VBOXWRAPPER_RELEASE 26202

/* String representation of BOINC version number */
#define BOINC_VERSION_STRING "7.17.0"

/* Package is a pre-release (Alpha/Beta) package */
#define BOINC_PRERELEASE 1

Expand Down