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.

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

Conversation

davidpanderson
Copy link
Contributor

... and have scheduler report server version, not client version

@lfield
Copy link
Contributor

lfield commented Feb 5, 2020

The build fails as version.h is created from version.h.in so the changes made to version.h in this pull requests are wiped. Note that we also have generate_svn_version.sh and svn_version.h. If we are not going to use this method to automatically get the version, we should delete these files so there is no confusion.

@davidpanderson
Copy link
Contributor Author

OK, so we need to rename BOINC_VERSION to CLIENT_VERSION everywhere, and add a SERVER_VERSION to configure.ac. I'll leave it to someone else to do this.

May as well keep svn_version.h; that provides higher resolution info.

@brevilo
Copy link
Contributor

brevilo commented Mar 16, 2020

Doesn't this mean that this PR should either be closed or at least be tagged as [WIP]?

@AenBleidd AenBleidd changed the title add server version to version.h [WIP] add server version to version.h Mar 16, 2020
@SETIguy
Copy link
Contributor

SETIguy commented Mar 16, 2020 via email

@mcandre
Copy link

mcandre commented Mar 26, 2020

CI build logs appear to show a compilation error:

sched_types.cpp: In member function ‘int SCHEDULER_REPLY::write(FILE*, SCHEDULER_REQUEST&)’:

sched_types.cpp:770:9: error: ‘SERVER_MAJOR_VERSION’ was not declared in this scope

         SERVER_MAJOR_VERSION*100+SERVER_MINOR_VERSION

         ^

sched_types.cpp:770:34: error: ‘SERVER_MINOR_VERSION’ was not declared in this scope

         SERVER_MAJOR_VERSION*100+SERVER_MINOR_VERSION

                                  ^

make[2]: *** [sched_types.o] Error 1

make[2]: Leaving directory `/home/travis/build/BOINC/boinc/sched'

make[1]: *** [all-recursive] Error 1

make[1]: Leaving directory `/home/travis/build/BOINC/boinc'

make: *** [all] Error 2

The command "if [[ "${BOINC_TYPE}" == "server" ]]; then ( ./configure --disable-client --disable-manager && make ) fi" exited with 2.

@AenBleidd
Copy link
Member

This PR is not ready to be merged because the whole idea should be revisited, please take a look at the conversation above

@AenBleidd AenBleidd marked this pull request as draft May 12, 2020 11:04
@AenBleidd
Copy link
Member

AenBleidd commented Oct 8, 2022

@lfield, since you're currently working on new server release, could you please take a look at this PR again and either close it if it's not needed anymore or provide more correct implementation of it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants