diff options
| author | dequis <dx@dxzone.com.ar> | 2020-04-05 14:09:17 +0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2020-04-05 14:09:17 +0300 |
| commit | ba83446c79918b782cdcd205e4b0f9caf2c66b8a (patch) | |
| tree | 82d49c04d72b2c5145607c2b609b1a3dcf0da0a8 | |
| parent | f64dd91e96265b9b2ecffdf7cfe73b6704e75f2b (diff) | |
Couple of buildsystem fixes I had stashed
- win32-build: fix version string format
- obs: put the ~ back in the version string for rpm packages
| -rwxr-xr-x | .travis/obs.sh | 3 | ||||
| -rwxr-xr-x | .travis/win32-build.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis/obs.sh b/.travis/obs.sh index a489426..197cddc 100755 --- a/.travis/obs.sh +++ b/.travis/obs.sh @@ -7,6 +7,7 @@ set -e GITREV=$(git rev-parse --short=7 HEAD) FULLVERS="$(date +%Y%m%d)-$(cat RELEASE_VERSION)-${GITREV}-${TRAVIS_BUILD_NUMBER}" +FULLVERS_RPM="$(echo ${FULLVERS} | sed 's/-/~/g')" FULLDATE=$(date -R) REPONAME=$(basename "${TRAVIS_REPO_SLUG}") @@ -23,7 +24,7 @@ sed -ri \ sed -ri \ -e "s/(^%setup -q.*)/\1 -n %\{name\}/" \ -e "s/(^Source0:.*)\-(.*)/\1_\2/" \ - -e "s/(^Version:).*/\1 ${FULLVERS}/" \ + -e "s/(^Version:).*/\1 ${FULLVERS_RPM}/" \ dist/*.spec cat <<EOF > debian/changelog diff --git a/.travis/win32-build.sh b/.travis/win32-build.sh index c058f0c..992a8a2 100755 --- a/.travis/win32-build.sh +++ b/.travis/win32-build.sh @@ -2,7 +2,7 @@ set -e GITREV=$(git rev-parse --short=7 HEAD) -FULLVERS="$(date +%Y%m%d)~${GITREV}~$(cat VERSION)~${TRAVIS_BUILD_NUMBER}" +FULLVERS="$(date +%Y%m%d)-$(cat RELEASE_VERSION)-${GITREV}-${TRAVIS_BUILD_NUMBER}" CC="i686-w64-mingw32-gcc" \ DLL_LD_FLAGS="-static-libgcc" \ |