This repository has been archived by the owner on Mar 27, 2019. It is now read-only.
Update version info for trackable automated deployment #9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If the CPUID check code failed, it would generate very weird CMake errors due to variables being unset. This change provides a more clear error message.
|
Here is the passed "deploy" queue build: http://devmaths-lx-1:8012/builders/deploy/builds/31 |
This consists of a human-suited time in the localtime field, and one more suited to machines in the timestamp field.
|
I've added unix timestamps and a human-readable time field to the version info. New deploy queue pass: http://devmaths-lx-1:8012/builders/deploy/builds/32 |
| try_run(CPUID_FLAG CPUID_COMPILE_RESULT | ||
| ${CMAKE_BINARY_DIR} | ||
| ${CMAKE_SOURCE_DIR}/CMAKE/cmcpuid.c) | ||
|
|
||
| if(NOT ${CPUID_COMPILE_RESULT}) | ||
| message(FATAL_ERROR "Failed to compile CPUID check binary") | ||
| endif() |
|
This does what is intended, am happy to merge. |
stuartarchibald
added a commit
that referenced
this pull request
Apr 30, 2014
Update version info for trackable automated deployment
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR will go with a PR in OG-Maths and is for supporting trackable automated builds and deployments with the buildbot.
The version info file consists of the project name, revision, build number, and platform. This file is picked up later on by the OG-Maths build system and incorporated into the finished Jar's version info file.
Whilst working on this I noted that CheckCPUID.cmake was not detecting failed compilations, resulting in weird error messages. This is also fixed on this branch.
A buildbot pass is only sensibly possible for this work on the deploy queue, and is presently running. I will paste a link to it here once it is finished.