summaryrefslogtreecommitdiffstats
path: root/version.sh
Commit message (Collapse)AuthorAgeFilesLines
* version.sh: don't use git tags for version output (again)wm42013-10-141-5/+10
| | | | | | | | | | | | | | | 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.)
* version.sh: add --print option, which prints version to stdoutwm42013-08-091-2/+23
| | | | Might be helpful when creating a tarball.
* version.sh: integrate the release tag in outputwm42013-08-091-2/+2
| | | | | | | | | | | | 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.
* version.sh: fix git rev. generation (.git is not always a directory)wm42013-02-061-1/+1
| | | | | | | | | 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.
* build: identify the build time of the binary in the versioning outputStephen Hutchinson2012-12-031-0/+4
| | | | | | | | | | 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.)
* Change version stringwm42012-07-291-2/+2
| | | | | | | | | | | | | | 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.
* Use "mplayer2" in version string, not "MPlayer2"wm42012-03-141-2/+0
| | | | | | | | 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.
* Update copyright yearUoti Urpala2012-01-281-1/+1
|
* build: change version number generationUoti Urpala2011-02-191-2/+2
| | | | | | | 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.
* version.sh: update copyright yearUoti Urpala2011-01-251-3/+3
| | | | | | 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).
* Merge svn changes up to r30419Uoti Urpala2010-01-251-1/+1
|\
| * new year in version stringGabrov2010-01-241-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30417 b3059339-0415-0410-9bf9-f77b7e298cf2
* | build: Generate version numbers for gitUoti Urpala2009-11-231-7/+5
|/ | | | | | | | | | 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.
* Avoid spurious rebuilds on svn up. The check to find out if the header filecehoyos2009-04-041-1/+1
| | | | | | | 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
* Add support for extracting the release version number from a VERSION file.diego2009-03-051-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28830 b3059339-0415-0410-9bf9-f77b7e298cf2
* Read revision string from the file snapshot_version if available.diego2009-02-241-1/+4
| | | | | | | 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
* cosmetics: Use $() instead of ``, the former can be nested more easily.diego2009-02-241-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28726 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use single quotes to avoid escaping double quotes in a string.diego2009-01-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28385 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use cat instead of echo to generate version.h.diego2009-01-291-2/+4
| | | | | | | Portably echoing backslashes is near impossible. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28384 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous backslash escapes that caused unintended escapes.diego2009-01-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28383 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not duplicate VERSION string.diego2009-01-261-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28376 b3059339-0415-0410-9bf9-f77b7e298cf2
* Drop dev- prefix from printed version number, just SVN-rXXXXX is enough.diego2009-01-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28367 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factorize print_version().diego2009-01-251-1/+1
| | | | | | | 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
* TRIVIAL, Extend the copyright line to 2009. Patch by andrew .david .45 AT gmail.reynaldo2009-01-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28287 b3059339-0415-0410-9bf9-f77b7e298cf2
* Happy New Year!zuxy2008-01-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25583 b3059339-0415-0410-9bf9-f77b7e298cf2
* add ; at the end of the sed commands. this fixes operation under cygwin.ivo2007-09-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24352 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove cut&paste from ffmpeg mistake. cd "$1" does not make any sense here,ivo2007-09-061-2/+2
| | | | | | | as $1 is (g)cc's version number git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24351 b3059339-0415-0410-9bf9-f77b7e298cf2
* Port changes for older Subversion releases from FFmpeg.diego2007-06-191-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23581 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update copyright year.diego2007-01-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21946 b3059339-0415-0410-9bf9-f77b7e298cf2
* avoid code duplication.vayne2006-12-281-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21780 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove copy and paste error from FFmpeg sync, MPlayer does not supportdiego2006-09-241-1/+1
| | | | | | | out-of-tree build directories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19969 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg sync: Fall back on grep if svn client is not installed.diego2006-09-051-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19702 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use LC_ALL instead of LANG since the former overrides the latter.diego2006-07-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19255 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cope with localized Subversion clients.diego2006-07-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19252 b3059339-0415-0410-9bf9-f77b7e298cf2
* Produce correct version string even when not run in a Subversion working copy.diego2006-06-231-1/+3
| | | | | | | ported from FFmpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18794 b3059339-0415-0410-9bf9-f77b7e298cf2
* Adapt FFmpeg version.sh that only recreates version.h if its content changed.diego2006-06-221-3/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18787 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplifydiego2006-06-201-5/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18762 b3059339-0415-0410-9bf9-f77b7e298cf2
* avoid usage of head -1/head -n 1 and use sed 1q insteadivo2006-06-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18625 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmeticsdiego2006-06-061-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18596 b3059339-0415-0410-9bf9-f77b7e298cf2
* Drop all system-specific version generation stuff.diego2006-06-061-23/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18595 b3059339-0415-0410-9bf9-f77b7e298cf2
* Put SVN revision in the version stringrathann2006-06-061-1/+1
| | | | | | | Note: somebody please port this to *BSD|Darwin git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18594 b3059339-0415-0410-9bf9-f77b7e298cf2
* cvs2svnrtogni2006-06-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18586 b3059339-0415-0410-9bf9-f77b7e298cf2
* SVN switch: get version date from .svn subdir instead of CVS/Entriesrtogni2006-06-041-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18560 b3059339-0415-0410-9bf9-f77b7e298cf2
* MinGW supportdiego2005-06-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15669 b3059339-0415-0410-9bf9-f77b7e298cf2
* BSD/OS works same as the other BSDs, tested by Steven M. Schultz.diego2005-06-061-11/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15667 b3059339-0415-0410-9bf9-f77b7e298cf2
* tabs --> spaces indentation cosmeticsdiego2005-06-051-32/+32
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15651 b3059339-0415-0410-9bf9-f77b7e298cf2
* Generate the version string with awk on BSD systems and work around wrongdiego2005-06-051-8/+11
| | | | | | | | day/month order in the ls output. based on a patch by Chris Roccati <roccati - at - pobox - dot - com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15650 b3059339-0415-0410-9bf9-f77b7e298cf2
* Days should be two digits.diego2005-06-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15644 b3059339-0415-0410-9bf9-f77b7e298cf2
* LC_ALL overrides LANG, so use it instead.diego2005-05-221-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15548 b3059339-0415-0410-9bf9-f77b7e298cf2
* LANG=C ensures month/day order and English language in the date string fordiego2005-05-211-5/+6
| | | | | | | | | more reliable operation in diverse environments. Tested on OpenBSD, NetBSD, FreeBSD, Darwin 10.2 and Darwin 10.1. Darwin 10.4 should work as well, 10.3 does not due to broken ls. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15537 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplificationdiego2005-05-181-4/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15514 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make version string depend of the last change of CVS/Entries for Darwin.diego2005-05-181-2/+9
| | | | | | | loosely based on a patch by Chris Roccati <roccati at pobox dot com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15512 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix version number on cygwinjoey2003-11-231-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11510 b3059339-0415-0410-9bf9-f77b7e298cf2
* the trailing space isn't needed anymorealex2003-07-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10422 b3059339-0415-0410-9bf9-f77b7e298cf2
* 'dev'arpi2003-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9375 b3059339-0415-0410-9bf9-f77b7e298cf2
* better BSD/OS support by Steven Schultz <sms@2bsd.com>alex2002-12-311-7/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8688 b3059339-0415-0410-9bf9-f77b7e298cf2
* Should be: if test ; then - D Richard Felker III <dalias@aerifal.cx>alex2002-09-201-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7449 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved to to avoid CVS-XXYYZZ- versions (if no given) - altought this ↵alex2002-09-201-1/+5
| | | | | | comment is bigger than the patch :) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7448 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix for darwins dateatmos42002-05-031-3/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5950 b3059339-0415-0410-9bf9-f77b7e298cf2
* CC version check done by Makefile to allow overriding CC from envvararpi2001-12-091-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3391 b3059339-0415-0410-9bf9-f77b7e298cf2
* using cc like configurejaf2001-12-031-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3301 b3059339-0415-0410-9bf9-f77b7e298cf2
* not it looks like this 'MPlayer CVS-011203-19:47-gcc-2.95.3'jaf2001-12-031-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3293 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed 0.17arpi2001-08-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1622 b3059339-0415-0410-9bf9-f77b7e298cf2
* applied solaris8/netbsd/other fixes patch by Jürgen Keil <jk@tools.de>arpi_esp2001-06-051-2/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1039 b3059339-0415-0410-9bf9-f77b7e298cf2
* version changed 0.11->0.17arpi_esp2001-04-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@673 b3059339-0415-0410-9bf9-f77b7e298cf2
* write cvs date+version into version.harpi_esp2001-04-141-0/+4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@421 b3059339-0415-0410-9bf9-f77b7e298cf2