Commit Graph

73 Commits

Author SHA1 Message Date
Niklas Haas a86b0ffa6b
version.sh: append -dirty if the working tree contains modifications
This allows us to detect users who run mpv with custom patches.
2017-06-16 17:20:44 +02:00
Martin Herkt eabba2de4d
Release 0.25.0
Also update release policy documentation and version extraction.
2017-04-23 01:57:53 +02:00
wm4 739d345d6c build: don't make version.sh create version.h by default
You could actually run version.sh, and then the waf build system could
accidentally pick up the generated (and most likely stale) version.h.
2015-07-14 23:11:06 +02:00
Stefano Pigozzi 78e771554c build: fix version.h creation
Previous code did not retrigger a relink when version.h changed since it
didn't use a waf task.
2015-07-12 10:09:49 +02:00
wm4 dbf21467f0 build: always regenerate version hash
Until now, it only used the hash from the previous configure run,
instead of trying to get the latest hash. The "old" build system did
this correctly - we just have to use the existing logic in version.sh.

Since waf supports separate build dirs, extend version.sh with an
argument for setting the path of version.h.
2015-06-30 15:56:26 +02:00
Ben Boeckel 11c044aa48 TOOLS: shellcheck: quote variable expansions 2014-09-16 17:32:33 +02:00
Ben Boeckel ec2c6a17dc TOOLS, version.sh: shellcheck: replace `cmd` with $(cmd)
Signed-off-by: wm4 <wm4@nowhere>
2014-09-16 17:29:39 +02:00
wm4 5a1b60c567 version.sh: don't use git tags for version output (again)
With the way I've been doing releases in the release/0.1 branch, this
proved completely useless. You need to write the VERSION file anyway,
and since we use github's automatically generated tarballs (via its
release system), the VERSION file needs to be in the git revision of
a release anyway. git master on the other hand displayed the v0.1.0
tag, because the tag is within the master branch.

This essentially reverts commit b27f65a. Now just print the contents
of the VERSION file if it exists, and likewise, we append the git
revision if it exists. (Do that even if VERSION exists, because this
way we can tell if someone is using the release branch at an in-between
point where no new release has been made yet.)
2013-10-14 20:14:17 +02:00
wm4 c6db8f6a8b version.sh: add --print option, which prints version to stdout
Might be helpful when creating a tarball.
2013-08-09 10:07:23 +02:00
wm4 b27f65a758 version.sh: integrate the release tag in output
This is basically reconstructed from 46b218c. Since we now have proper
release tags, we want this again.

Add --tags to the git describe call, because the github release system
creates light-weight tags only, and we're too lazy to create annitated
tags (or is that bad practice?).

Add --long, so that the git commit hash is part of the output even if
the tag matches.
2013-08-09 09:44:24 +02:00
wm4 314a07e787 version.sh: fix git rev. generation (.git is not always a directory)
It appears git submodule handling recently changed, changing the .git
directory to a regular file containing submodule specific information.
This means that version.sh would generate "#define VERSION "git-UNKNOWN""
if the checkout is a submodule, because it explicitly checks for a .git
directory using test -d. Change it to -e so that this case is handled
correctly.
2013-02-06 23:03:37 +01:00
Stephen Hutchinson 54ce8af6e0 build: identify the build time of the binary in the versioning output
Based on a patch by qyot27. Add export LC_ALL=C on top of version.sh to
make the output locale independent.

Note that the build time will not be updated on every "make" invocation,
but only when the git revision is updated. This is a good thing, as
repeated make invocations should not rebuild the binary. (This would
break "sudo make install" too.)
2012-12-03 21:08:51 +01:00
wm4 46b218ca34 Change version string
Change the "main" name from "mplayer2" to "mplayer". Note that upstream
mplayer2 uses "MPlayer2", and mplayer uses "MPlayer", so it's
unambiguous.

The version.sh script used to put the latest tag into the version
script. The intention was to add a new tag on each release, but this
hasn't been done in over a year, making the tag absolutely pointless.
Remove it. Now "git-SHORTHASH" is used.

Remove the string "MPlayer & mplayer2 teams" after the copyright date,
because that sounded silly.
2012-07-29 00:04:17 +02:00
wm4 0eb21226cb Use "mplayer2" in version string, not "MPlayer2"
The name "MPlayer2" isn't used anywhere. It's either "MPlayer" or
"mplayer2". Make it more consistent by using "mplayer2" instead.

Note that the version string passed as network user-agent changes from
"MPlayer" to "mplayer2" as well.
2012-03-14 10:29:35 +01:00
Uoti Urpala 637d6b7c8e Update copyright year 2012-01-28 13:49:13 +02:00
Uoti Urpala e786c70de9 build: change version number generation
Force Makefile to always run version.sh to potentially regenerate
version.h. Drop compiler version and 'git-' prefix from version
number. Match only git tags starting 'v'+number when generating
version number; leave the 'v' out from the result.
2011-02-19 19:07:12 +02:00
Uoti Urpala e4fa264a32 version.sh: update copyright year
Also remove an old mention of "Subversion" from comments and fix an
error in non-git-repo version string generation (which hasn't been
used for anything).
2011-01-25 01:06:48 +02:00
Uoti Urpala e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
Gabrov f5209d8cc4 new year in version string
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30417 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 03:21:18 +00:00
Uoti Urpala 1dba61a670 build: Generate version numbers for git
Update the version.sh script for git so it'll generate version numbers
more useful than "UNKNOWN". At the moment it only generates the short
SHA1 name, but adding a tag as a starting point should allow more
useful output. Rather than update the Makefile logic that tried to
guess whether the svn revision had changed since the last version.h
update, just run the version.sh script from configure so the version
is updated at least at that time.
2009-11-23 06:22:15 +02:00
cehoyos 133807ced3 Avoid spurious rebuilds on svn up. The check to find out if the header file
changed compared two lines to one, which would result in false positive updates.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29140 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 19:50:57 +00:00
diego 6ec76ef976 Add support for extracting the release version number from a VERSION file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28830 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-05 23:36:28 +00:00
diego d1e6b2360c Read revision string from the file snapshot_version if available.
This will be used by daily snapshots without Subversion metadata.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28728 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-24 23:15:26 +00:00
diego 9e8a06bc4e cosmetics: Use $() instead of ``, the former can be nested more easily.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28726 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-24 22:57:55 +00:00
diego be5a9adfbf Use single quotes to avoid escaping double quotes in a string.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28385 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-29 00:18:32 +00:00
diego bc0dd94ce5 Use cat instead of echo to generate version.h.
Portably echoing backslashes is near impossible.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28384 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-29 00:16:09 +00:00
diego a62cb5ead2 Remove superfluous backslash escapes that caused unintended escapes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28383 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-28 17:47:50 +00:00
diego 91c6bb0241 Do not duplicate VERSION string.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28376 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 11:29:28 +00:00
diego fc8435ee6d Drop dev- prefix from printed version number, just SVN-rXXXXX is enough.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28367 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 23:31:45 +00:00
diego 2067a1f750 Factorize print_version().
Print CPU information in verbose mode instead of by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28360 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 20:35:58 +00:00
reynaldo a7fc969ff6 TRIVIAL, Extend the copyright line to 2009. Patch by andrew .david .45 AT gmail.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28287 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 01:57:25 +00:00
zuxy d3d6089472 Happy New Year!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25583 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-02 07:38:40 +00:00
ivo abebb1855d add ; at the end of the sed commands. this fixes operation under cygwin.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24352 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-06 16:28:31 +00:00
ivo fdb70353c2 remove cut&paste from ffmpeg mistake. cd "$1" does not make any sense here,
as $1 is (g)cc's version number


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24351 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-06 16:25:44 +00:00
diego d33738a85c Port changes for older Subversion releases from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23581 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-19 06:51:33 +00:00
diego 08dcfaa832 Update copyright year.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21946 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 22:58:42 +00:00
vayne 42552b211a avoid code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 15:31:48 +00:00
diego dc5712ce3a Remove copy and paste error from FFmpeg sync, MPlayer does not support
out-of-tree build directories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19969 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 15:53:23 +00:00
diego 9b51e80117 FFmpeg sync: Fall back on grep if svn client is not installed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19702 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-05 23:19:22 +00:00
diego 113e9b534b Use LC_ALL instead of LANG since the former overrides the latter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19255 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-29 23:30:55 +00:00
diego d41e0d30a7 Cope with localized Subversion clients.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19252 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-29 21:44:32 +00:00
diego eebd69a051 Produce correct version string even when not run in a Subversion working copy.
ported from FFmpeg


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18794 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-23 15:12:56 +00:00
diego 7dda786ccb Adapt FFmpeg version.sh that only recreates version.h if its content changed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-22 13:47:50 +00:00
diego 2db0251591 simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18762 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-20 10:08:19 +00:00
ivo fb02e87565 avoid usage of head -1/head -n 1 and use sed 1q instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18625 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-07 15:03:25 +00:00
diego e63c3f261a cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18596 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-06 12:01:34 +00:00
diego f854d9407e Drop all system-specific version generation stuff.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18595 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-06 12:00:07 +00:00
rathann 0597f58b9b Put SVN revision in the version string
Note: somebody please port this to *BSD|Darwin


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18594 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-06 10:42:30 +00:00
rtogni 619f6e1916 cvs2svn
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18586 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-05 20:38:47 +00:00
rtogni 09208431ab SVN switch: get version date from .svn subdir instead of CVS/Entries
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18560 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 22:48:59 +00:00