For release generate version file with target version.

remotes/origin/4.2 4.2.0
Darko Poljak 9 years ago
parent 804570d874
commit c456284cef
  1. 7
      bin/build-helper
  2. 7
      bin/build-helper.freebsd

@ -245,7 +245,7 @@ eof
"$0" pep8 "$0" pep8
# Generate version file to be included in packaging # Generate version file to be included in packaging
"$0" version "$0" target-version
# Ensure the git status is clean, else abort # Ensure the git status is clean, else abort
if ! git diff-index --name-only --exit-code HEAD ; then if ! git diff-index --name-only --exit-code HEAD ; then
@ -382,6 +382,11 @@ eof
echo "VERSION = \"$(git describe)\"" > cdist/version.py echo "VERSION = \"$(git describe)\"" > cdist/version.py
;; ;;
target-version)
target_version=$($0 changelog-version)
echo "VERSION = \"${target_version}\"" > cdist/version.py
;;
*) *)
echo "Unknown helper target $@ - aborting" echo "Unknown helper target $@ - aborting"
exit 1 exit 1

@ -280,7 +280,7 @@ eof
"$0" pep8 "$0" pep8
# Generate version file to be included in packaging # Generate version file to be included in packaging
"$0" version "$0" target-version
# Ensure the git status is clean, else abort # Ensure the git status is clean, else abort
if ! git diff-index --name-only --exit-code HEAD ; then if ! git diff-index --name-only --exit-code HEAD ; then
@ -444,6 +444,11 @@ eof
echo "VERSION = \"$(git describe)\"" > cdist/version.py echo "VERSION = \"$(git describe)\"" > cdist/version.py
;; ;;
target-version)
target_version=$($0 changelog-version)
echo "VERSION = \"${target_version}\"" > cdist/version.py
;;
*) *)
echo "Unknown helper target $@ - aborting" echo "Unknown helper target $@ - aborting"
exit 1 exit 1

Loading…
Cancel
Save