Update to how build process grabs version number #148
Merged
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
added 3 commits
May 2, 2019 17:37
caitlinross
added a commit
that referenced
this pull request
May 16, 2019
* ROSS cleanup (#135) This commit fixes warnings when building with -Wall and -Wextra. In addition, removes old unused code related to prior pthread versions of ROSS as well as removing the ROSS_MEMORY related code, due to no longer being fully functional. * fixing warnings when building with Wall, etc * fixing warnings in buddy.c * fixing warnings in the rest of ROSS core * fixing warnings in instrumentation * fixing warnings with phold * fixing undefined reference causing linking error * adding warning flags to Travis builds * fixing some additional warnings that appear in release builds * minor changes to travis builds * removing old, unnecessary pthread related code * fixing ifdefs for ROSS_MEMORY * removing tw-memory related stuff for now * removing some unused stuff and unnecessary function arguments * lots of documentation for network-mpi and removing some unnecessary stuff * keeping the ROSS models submodule from being used in Travis tests * minor fix for C++ Travis build * adding installing phold to bin * adding some RPATH commands to CMakeLists.txt for Spack * removed ROSS-Models and template model submodule * update readme for submodule details * rpath in pkg-config * adding develop branch to Travis safelist * simplifying the build of static or shared libraries (#147) * Update to the way the build process grabs version number (#148) * updating the way the version number is grabbed, so we can have the actual version and not the git commit * fixing an error that caused coveralls to fail * updating README and removing out-of-date README-vis (current info is on webpage) * few more updates to README * changing damaris submodule/directory to risa * see if gcov and clang versions match (#150) * see if gcov and clang versions match * maybe we should be using lcov... since we apt-get it * whitespace * what version is llvm-cov? * use llvm-cov * llvm-cov gcov * remove cov version checks * removing ROSS_obj from Cmake build - no longer necessary with single library creation * removing some files that are actually unnecessary for version numbers as well as having ROSS output both version number and commit, instead of just version
Merged
gonsie
added a commit
that referenced
this pull request
Dec 2, 2019
Merge release-7.2.0: * New default clock: get-time-of-day (#170) * STime API (#159) * Add ARMv7l arch support to ROSS (#155) * Fix to generate covage stats (#150) * changing damaris submodule/directory to risa * Updated README * Update to the way the build process grabs version number (#148) * simplifying the build of static or shared libraries (#147) * ROSS cleanup: -Wall, -Wextra, and more (#135)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Since we started supporting actual version numbers for ROSS instead of using the git commit as a version number, I wanted to update ROSS runs and the package config file to output the correct version number. It's based on this post which just required a few changes to the original approach we used.
If this merge represents a feature addition to ROSS, the following items must be completed before the branch will be merged:
Include a link to your blog post in the Pull Request.