sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
43d9eb2522
blender/build_files/cmake/buildinfo.cmake

96 lines
3.6 KiB
CMake
Raw Normal View History

Make buildinfo not fail with git-svn as suggested by Nicholas Bishop. Improve formating and comments a bit.
2011-02-25 04:02:58 +00:00
# This is called by cmake as an extermal process from
fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision.
2011-02-24 17:57:35 +00:00
# ./source/creator/CMakeLists.txt to write ./source/creator/buildinfo.h
Make buildinfo not fail with git-svn as suggested by Nicholas Bishop. Improve formating and comments a bit.
2011-02-25 04:02:58 +00:00
# Extract working copy information for SOURCE_DIR into MY_XXX variables
# with a default in case anything fails, for examble when using git-svn
Fixes for buildinfo of exported source tree - Better to set branch/hash to "unknown" so it's clear build is done from exported tree. - SCons used to reference undefined variable.
2013-11-16 18:00:02 +00:00
set(MY_WC_HASH "unknown")
set(MY_WC_BRANCH "unknown")
Further tweaks to buildinfo Summary: Old idea with changes since previous release tag didn't work good enough. In most of the cases tag was done in a branch hence not actually reachable from the master branch. Now change since release is gone, and date of the latest commit is used instead. The date is displayed in format YYYY-MM-DD HH:mm in the splash. New bpy.app fields: - build_commit_timestamp is an unix timestamp of the commit blender was build from. - build_commit_date is a date of that commit. - build_commit_time is a time of that commit. Reviewers: campbellbarton Differential Revision: http://developer.blender.org/D5
2013-11-15 11:11:59 +00:00
set(MY_WC_COMMIT_TIMESTAMP 0)
Made buildinfo aware of builds from GIT - Use commit number since last annotated tag as a revision number replacement. It'll eb followed by 'M' symbol if there're local modification in the source tree. - Commit short SHA1 is included. Helps getting information about commit used to build blender with much faster. - If build is not done from master branch, this also will be noticed in the splash screen. This commit also replaces revision stored in the files with git-specific fields (change and hash). This is kind of breaks compatibility, meaning files which were saved before this change wouldn't display any information about which revision they were saved with. When we'll finally switch to git, we'll see proper hash and change number since previous release in the files, for until then svn version will be used as a change number and hash will be empty. Not a huge deal, since this field was only used by developers to help torubleshooting things and isn't needed for blender itself. Some additional tweaks are probably needed :)
2013-11-04 13:21:39 +00:00
Make buildinfo not fail with git-svn as suggested by Nicholas Bishop. Improve formating and comments a bit.
2011-02-25 04:02:58 +00:00
# Guess if this is a SVN working copy and then look up the revision
Fix for previous fix (tm) commit Ok, this is nasty. SOURCE_DIR is somehow being defined from CMakeLists.txt in source/creator by the looks of it and actual issue as extra slash in the end of path which was passing to EXISTS command.
2013-11-27 20:05:06 +00:00
if(EXISTS ${SOURCE_DIR}/.git)
Fixes for buildinfo - It was using SOURCE_DIR which is undefined on windows. No idea why it was defined on Linux, could be some co-incident. Correct usage is CMAKE_SOURCE_DIR. - Remove usages of SVN's revision.
2013-11-27 19:41:53 +00:00
# The FindGit.cmake module is part of the standard distribution
Remove nested check for .git folder exists in buildinfo.cmake Title says it all :) Pointer by IRIE Shinsuke in the ML, thanks!
2013-11-16 13:40:26 +00:00
include(FindGit)
if(GIT_FOUND)
Fixes for buildinfo - It was using SOURCE_DIR which is undefined on windows. No idea why it was defined on Linux, could be some co-incident. Correct usage is CMAKE_SOURCE_DIR. - Remove usages of SVN's revision.
2013-11-27 19:41:53 +00:00
message("-- Found Git: ${GIT_EXECUTABLE}")
Show hash from latest pushed commit in buildinfo Before this hash of latest local commit was used, which is not so much useful since nobody can access that commit hash.
2013-11-25 10:25:35 +00:00
execute_process(COMMAND git rev-parse --short @{u}
Fix for previous fix (tm) commit Ok, this is nasty. SOURCE_DIR is somehow being defined from CMakeLists.txt in source/creator by the looks of it and actual issue as extra slash in the end of path which was passing to EXISTS command.
2013-11-27 20:05:06 +00:00
WORKING_DIRECTORY ${SOURCE_DIR}
Remove nested check for .git folder exists in buildinfo.cmake Title says it all :) Pointer by IRIE Shinsuke in the ML, thanks!
2013-11-16 13:40:26 +00:00
OUTPUT_VARIABLE MY_WC_HASH
Buildinfo: suppress error prints when building local branches Before this console output contained messages about branch is not configured to use any upstream branch which is not useful information at all.
2013-11-29 12:19:42 +00:00
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
Remove nested check for .git folder exists in buildinfo.cmake Title says it all :) Pointer by IRIE Shinsuke in the ML, thanks!
2013-11-16 13:40:26 +00:00
Fix buildinfo hash for cases there's no upstream set for the branch
2013-11-27 20:25:09 +00:00
if (MY_WC_HASH STREQUAL "")
# Local branch, not set to upstream.
# Well, let's use HEAD for now
execute_process(COMMAND git rev-parse --short HEAD
WORKING_DIRECTORY ${SOURCE_DIR}
OUTPUT_VARIABLE MY_WC_HASH
Buildinfo: suppress error prints when building local branches Before this console output contained messages about branch is not configured to use any upstream branch which is not useful information at all.
2013-11-29 12:19:42 +00:00
OUTPUT_STRIP_TRAILING_WHITESPACE)
Fix buildinfo hash for cases there's no upstream set for the branch
2013-11-27 20:25:09 +00:00
endif()
Remove nested check for .git folder exists in buildinfo.cmake Title says it all :) Pointer by IRIE Shinsuke in the ML, thanks!
2013-11-16 13:40:26 +00:00
execute_process(COMMAND git rev-parse --abbrev-ref HEAD
Fix for previous fix (tm) commit Ok, this is nasty. SOURCE_DIR is somehow being defined from CMakeLists.txt in source/creator by the looks of it and actual issue as extra slash in the end of path which was passing to EXISTS command.
2013-11-27 20:05:06 +00:00
WORKING_DIRECTORY ${SOURCE_DIR}
Remove nested check for .git folder exists in buildinfo.cmake Title says it all :) Pointer by IRIE Shinsuke in the ML, thanks!
2013-11-16 13:40:26 +00:00
OUTPUT_VARIABLE MY_WC_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND git log -1 --format=%ct
Fix for previous fix (tm) commit Ok, this is nasty. SOURCE_DIR is somehow being defined from CMakeLists.txt in source/creator by the looks of it and actual issue as extra slash in the end of path which was passing to EXISTS command.
2013-11-27 20:05:06 +00:00
WORKING_DIRECTORY ${SOURCE_DIR}
Remove nested check for .git folder exists in buildinfo.cmake Title says it all :) Pointer by IRIE Shinsuke in the ML, thanks!
2013-11-16 13:40:26 +00:00
OUTPUT_VARIABLE MY_WC_COMMIT_TIMESTAMP
OUTPUT_STRIP_TRAILING_WHITESPACE)
# Update GIT index before getting dirty files
execute_process(COMMAND git update-index -q --refresh
Fix for previous fix (tm) commit Ok, this is nasty. SOURCE_DIR is somehow being defined from CMakeLists.txt in source/creator by the looks of it and actual issue as extra slash in the end of path which was passing to EXISTS command.
2013-11-27 20:05:06 +00:00
WORKING_DIRECTORY ${SOURCE_DIR}
Remove nested check for .git folder exists in buildinfo.cmake Title says it all :) Pointer by IRIE Shinsuke in the ML, thanks!
2013-11-16 13:40:26 +00:00
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND git diff-index --name-only HEAD --
Fix for previous fix (tm) commit Ok, this is nasty. SOURCE_DIR is somehow being defined from CMakeLists.txt in source/creator by the looks of it and actual issue as extra slash in the end of path which was passing to EXISTS command.
2013-11-27 20:05:06 +00:00
WORKING_DIRECTORY ${SOURCE_DIR}
Remove nested check for .git folder exists in buildinfo.cmake Title says it all :) Pointer by IRIE Shinsuke in the ML, thanks!
2013-11-16 13:40:26 +00:00
OUTPUT_VARIABLE _git_changed_files
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT _git_changed_files STREQUAL "")
Buildinfo fixes - Use -M suffix if working tree does have uncommitted modifications. - Local commits are considered local changes as well
2013-11-19 16:01:43 +00:00
set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
else()
# Unpushed commits are also considered local odifications
execute_process(COMMAND git log @{u}..
Fix for previous fix (tm) commit Ok, this is nasty. SOURCE_DIR is somehow being defined from CMakeLists.txt in source/creator by the looks of it and actual issue as extra slash in the end of path which was passing to EXISTS command.
2013-11-27 20:05:06 +00:00
WORKING_DIRECTORY ${SOURCE_DIR}
Buildinfo fixes - Use -M suffix if working tree does have uncommitted modifications. - Local commits are considered local changes as well
2013-11-19 16:01:43 +00:00
OUTPUT_VARIABLE _git_unpushed_log
Buildinfo: suppress error prints when building local branches Before this console output contained messages about branch is not configured to use any upstream branch which is not useful information at all.
2013-11-29 12:19:42 +00:00
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
Buildinfo fixes - Use -M suffix if working tree does have uncommitted modifications. - Local commits are considered local changes as well
2013-11-19 16:01:43 +00:00
if(NOT _git_unpushed_log STREQUAL "")
set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
endif()
unset(_git_unpushed_log)
Made buildinfo aware of builds from GIT - Use commit number since last annotated tag as a revision number replacement. It'll eb followed by 'M' symbol if there're local modification in the source tree. - Commit short SHA1 is included. Helps getting information about commit used to build blender with much faster. - If build is not done from master branch, this also will be noticed in the splash screen. This commit also replaces revision stored in the files with git-specific fields (change and hash). This is kind of breaks compatibility, meaning files which were saved before this change wouldn't display any information about which revision they were saved with. When we'll finally switch to git, we'll see proper hash and change number since previous release in the files, for until then svn version will be used as a change number and hash will be empty. Not a huge deal, since this field was only used by developers to help torubleshooting things and isn't needed for blender itself. Some additional tweaks are probably needed :)
2013-11-04 13:21:39 +00:00
endif()
Remove nested check for .git folder exists in buildinfo.cmake Title says it all :) Pointer by IRIE Shinsuke in the ML, thanks!
2013-11-16 13:40:26 +00:00
unset(_git_changed_files)
Made buildinfo aware of builds from GIT - Use commit number since last annotated tag as a revision number replacement. It'll eb followed by 'M' symbol if there're local modification in the source tree. - Commit short SHA1 is included. Helps getting information about commit used to build blender with much faster. - If build is not done from master branch, this also will be noticed in the splash screen. This commit also replaces revision stored in the files with git-specific fields (change and hash). This is kind of breaks compatibility, meaning files which were saved before this change wouldn't display any information about which revision they were saved with. When we'll finally switch to git, we'll see proper hash and change number since previous release in the files, for until then svn version will be used as a change number and hash will be empty. Not a huge deal, since this field was only used by developers to help torubleshooting things and isn't needed for blender itself. Some additional tweaks are probably needed :)
2013-11-04 13:21:39 +00:00
endif()
fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision.
2011-02-24 17:57:35 +00:00
endif()
# BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
Make buildinfo not fail with git-svn as suggested by Nicholas Bishop. Improve formating and comments a bit.
2011-02-25 04:02:58 +00:00
# but BUILD_DATE and BUILD_TIME are plataform dependant
fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision.
2011-02-24 17:57:35 +00:00
if(UNIX)
execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
SVN maintenance.
2011-02-25 00:02:08 +00:00
execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision.
2011-02-24 17:57:35 +00:00
endif()
if(WIN32)
execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
SVN maintenance.
2011-02-25 00:02:08 +00:00
execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision.
2011-02-24 17:57:35 +00:00
endif()
Make buildinfo not fail with git-svn as suggested by Nicholas Bishop. Improve formating and comments a bit.
2011-02-25 04:02:58 +00:00
# Write a file with the SVNVERSION define
fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision.
2011-02-24 17:57:35 +00:00
file(WRITE buildinfo.h.txt
Made buildinfo aware of builds from GIT - Use commit number since last annotated tag as a revision number replacement. It'll eb followed by 'M' symbol if there're local modification in the source tree. - Commit short SHA1 is included. Helps getting information about commit used to build blender with much faster. - If build is not done from master branch, this also will be noticed in the splash screen. This commit also replaces revision stored in the files with git-specific fields (change and hash). This is kind of breaks compatibility, meaning files which were saved before this change wouldn't display any information about which revision they were saved with. When we'll finally switch to git, we'll see proper hash and change number since previous release in the files, for until then svn version will be used as a change number and hash will be empty. Not a huge deal, since this field was only used by developers to help torubleshooting things and isn't needed for blender itself. Some additional tweaks are probably needed :)
2013-11-04 13:21:39 +00:00
"#define BUILD_HASH \"${MY_WC_HASH}\"\n"
Further tweaks to buildinfo Summary: Old idea with changes since previous release tag didn't work good enough. In most of the cases tag was done in a branch hence not actually reachable from the master branch. Now change since release is gone, and date of the latest commit is used instead. The date is displayed in format YYYY-MM-DD HH:mm in the splash. New bpy.app fields: - build_commit_timestamp is an unix timestamp of the commit blender was build from. - build_commit_date is a date of that commit. - build_commit_time is a time of that commit. Reviewers: campbellbarton Differential Revision: http://developer.blender.org/D5
2013-11-15 11:11:59 +00:00
"#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
Made buildinfo aware of builds from GIT - Use commit number since last annotated tag as a revision number replacement. It'll eb followed by 'M' symbol if there're local modification in the source tree. - Commit short SHA1 is included. Helps getting information about commit used to build blender with much faster. - If build is not done from master branch, this also will be noticed in the splash screen. This commit also replaces revision stored in the files with git-specific fields (change and hash). This is kind of breaks compatibility, meaning files which were saved before this change wouldn't display any information about which revision they were saved with. When we'll finally switch to git, we'll see proper hash and change number since previous release in the files, for until then svn version will be used as a change number and hash will be empty. Not a huge deal, since this field was only used by developers to help torubleshooting things and isn't needed for blender itself. Some additional tweaks are probably needed :)
2013-11-04 13:21:39 +00:00
"#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n"
buildinfo is now quoted from the build systems, avoids stripping quotes on startup. tested with linux/cmake linux/scons windows/cmake/mingw windows/cmake/msvc
2011-08-22 12:24:14 +00:00
"#define BUILD_DATE \"${BUILD_DATE}\"\n"
"#define BUILD_TIME \"${BUILD_TIME}\"\n"
fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision.
2011-02-24 17:57:35 +00:00
)
Make buildinfo not fail with git-svn as suggested by Nicholas Bishop. Improve formating and comments a bit.
2011-02-25 04:02:58 +00:00
# Copy the file to the final header only if the version changes
# and avoid needless rebuilds
Fix buildinfo, as pointed by IRIE Shinsuke. Added a note about doubtful "copy if different".
2011-02-25 06:03:01 +00:00
# TODO: verify this comment is true, as BUILD_TIME probably changes
fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision.
2011-02-24 17:57:35 +00:00
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
buildinfo.h.txt buildinfo.h)
Copy Permalink