Skip to content

WIP: Drop --tags from git describe #97

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.

Sign up for GitHub

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

Open
agx wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Drop --tags from git describe #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5992c5c
build: Use annotated tags
agx Apr 10, 2019
15777d0
build: Drop '--tags'
agx Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libuuu/gen_ver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ if [ "${APPVEYOR_BUILD_VERSION}" = "" ];
then
echo build not in appveyor
else
git tag uuu_${APPVEYOR_BUILD_VERSION}
git tag -m"uuu ${APPVEYOR_BUILD_VERSION}" uuu_${APPVEYOR_BUILD_VERSION}
fi

# Test if we are in a repo
if [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ];
then
#echo "In a repo"
# Get the version of the last commit of the repo
version=`git describe --tags --long`
version=`git describe --long`
echo "#define GIT_VERSION \"lib$version\"" > $file_to_write
fi
6 changes: 3 additions & 3 deletions msvc/createversion.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ IF ERRORLEVEL 1 (
IF "%APPVEYOR_BUILD_VERSION%" == "" (
echo build not from appveryor
) ELSE (
git tag uuu_%APPVEYOR_BUILD_VERSION%
git tag -m "uuu %APPVEYOR_BUILD_VERSION%" uuu_%APPVEYOR_BUILD_VERSION%
)

FOR /F "tokens=*" %%a in ('call git describe --tags --long') do (
FOR /F "tokens=*" %%a in ('call git describe --long') do (
echo #define GIT_VERSION "lib%%a" > %1/gitversion.h
)
)
)