summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChrisK2 <spam@kalania.de>2013-12-09 21:45:09 +0100
committerChrisK2 <spam@kalania.de>2013-12-09 21:45:09 +0100
commit218b9d3737134a9f619c49992a5fb34ad9e3733b (patch)
tree14e592d3364251a99d783505164282cd2282803c
parent398bfbe4c15e0459b0d13eea78e913ea75402c92 (diff)
downloadmpv-218b9d3737134a9f619c49992a5fb34ad9e3733b.tar.bz2
mpv-218b9d3737134a9f619c49992a5fb34ad9e3733b.tar.xz
osxbundle: use mpv's version.sh instead of osxbundle's
-rwxr-xr-xTOOLS/osxbundle.py2
-rwxr-xr-xTOOLS/osxbundle/version.sh15
2 files changed, 1 insertions, 16 deletions
diff --git a/TOOLS/osxbundle.py b/TOOLS/osxbundle.py
index 66ef576efd..ec9427b9db 100755
--- a/TOOLS/osxbundle.py
+++ b/TOOLS/osxbundle.py
@@ -103,7 +103,7 @@ def bundle_dependencies(binary_name):
fix_dylibs_paths(target_binary(binary_name), lib_bundle_directory)
def main():
- version = sh("TOOLS/osxbundle/version.sh").strip()
+ version = sh("./version.sh --print").strip()
usage = "usage: %prog [options] arg"
parser = OptionParser(usage)
diff --git a/TOOLS/osxbundle/version.sh b/TOOLS/osxbundle/version.sh
deleted file mode 100755
index ff6bb1b5fd..0000000000
--- a/TOOLS/osxbundle/version.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Extract revision number from file used by daily tarball snapshots
-# or from "git describe" output
-git_revision=$(cat snapshot_version 2> /dev/null)
-test $git_revision || test ! -d .git || \
-git_revision=`git describe --match "v[0-9]*" --always`
-git_revision=$(expr "$git_revision" : v*'\(.*\)')
-test $git_revision || git_revision=UNKNOWN
-
-# releases extract the version number from the VERSION file
-version=$(cat VERSION 2> /dev/null)
-test $version || version=$git_revision
-
-echo $version