chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple update_gitinfo tweaks.

Browse Source 
Change -C to --work-dir to work on earlier versions of git.
Add "+" to the revision number if there are uncommitted changes.
Only rewrite the git_info.h if there are changes, so that make doesn't think the file has changed.
This commit is contained in:
sawinglogz 2019-05-07 09:41:51 -04:00
parent 817d5603c1
commit 5923325917
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
oscar/update_gitinfo.bat
View File

@ -2,14 +2,24 @@
setlocal
set DIR=%~dp0
echo Updating %DIR%git_info.h
for /f %%i in ('git -C %DIR% rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
for /f %%i in ('git -C %DIR% rev-parse --short HEAD') do set GIT_REVISION=%%i
for /f %%i in ('git --work-tree %DIR% rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
for /f %%i in ('git --work-tree %DIR% rev-parse --short HEAD') do set GIT_REVISION=%%i
git --work-tree $DIR diff-index --quiet HEAD
if %ERRORLEVEL% neq 0 (
do set GIT_REVISION="%GIT_REVISION%+" # uncommitted changes
)
if "%GIT_BRANCH"=="" set GIT_BRANCH="Unknown";
if "%GIT_REVIISION"=="" set GIT_REVISION="Unknown";
if "%GIT_REVISION"=="" set GIT_REVISION="Unknown";
echo // This is an auto generated file > %DIR%git_info.h
echo const QString GIT_BRANCH="%GIT_BRANCH%"; >> %DIR%git_info.h
echo const QString GIT_REVISION="%GIT_REVISION%"; >> %DIR%git_info.h
echo // This is an auto generated file > %DIR%git_info.new
echo const QString GIT_BRANCH="%GIT_BRANCH%"; >> %DIR%git_info.new
echo const QString GIT_REVISION="%GIT_REVISION%"; >> %DIR%git_info.new
fc %DIR%git_info.h %DIR%git_info.new > nul
if errorlevel 0 (
del /y %DIR%git_info.new
) else (
echo Updating %DIR%git_info.h
move /y %DIR%git_info.new %DIR%git_info.h
)

22
oscar/update_gitinfo.sh Normal file → Executable file
View File

@ -2,14 +2,24 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR
echo Updating $DIR/git_info.h
GIT_BRANCH=`git -C $DIR rev-parse --abbrev-ref HEAD`
GIT_REVISION=`git -C $DIR rev-parse --short HEAD`
GIT_BRANCH=`git --work-tree $DIR rev-parse --abbrev-ref HEAD`
GIT_REVISION=`git --work-tree $DIR rev-parse --short HEAD`
$(git --work-tree $DIR diff-index --quiet HEAD)
if [ $? -ne 0 ]; then
GIT_REVISION="$GIT_REVISION+" # uncommitted changes
fi
[ -z "$GIT_BRANCH" ] && GIT_BRANCH="Unknown";
[ -z "$GIT_REVISION" ] && GIT_REVISION="Unknown";
echo // This is an auto generated file > $DIR/git_info.h
echo const QString GIT_BRANCH=\"$GIT_BRANCH\"\; >> $DIR/git_info.h
echo const QString GIT_REVISION=\"$GIT_REVISION\"\; >> $DIR/git_info.h
echo // This is an auto generated file > $DIR/git_info.h.new
echo const QString GIT_BRANCH=\"$GIT_BRANCH\"\; >> $DIR/git_info.h.new
echo const QString GIT_REVISION=\"$GIT_REVISION\"\; >> $DIR/git_info.h.new
if diff $DIR/git_info.h $DIR/git_info.h.new &> /dev/null; then
rm $DIR/git_info.h.new
else
echo Updating $DIR/git_info.h
mv $DIR/git_info.h.new $DIR/git_info.h
fi