RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

build: move copyright statement to a shared location 

Now macosx_menubar.m and mpv.rc (win32) use the same copyright string.
(This is a bit roundabout, because mpv.rc can't use C constants. Also
the C code wants to avoid rebuilding real source files if only version.h
changed, so only version.c includes version.h.)
This commit is contained in:
wm4 2018-01-01 12:16:42 +01:00 committed by Ricardo Constantino
parent a90abe0546
commit 49e704cb19
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/common.h
View File

@ -68,6 +68,7 @@ enum {
extern const char mpv_version[];
extern const char mpv_builddate[];
extern const char mpv_copyright[];
char *mp_format_time(double time, bool fractions);
char *mp_format_time_fmt(const char *fmt, double time);

1
common/version.c
View File

@ -24,3 +24,4 @@
const char mpv_version[] = "mpv " VERSION;
const char mpv_builddate[] = BUILDDATE;
const char mpv_copyright[] = MPVCOPYRIGHT;

2
osdep/macosx_menubar.m
View File

@ -612,7 +612,7 @@
NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:
@"mpv", @"ApplicationName",
[self getMPVIcon], @"ApplicationIcon",
@"Copyright © 2000-2017 mpv/MPlayer/mplayer2 projects", @"Copyright",
[NSString stringWithUTF8String:mpv_copyright], @"Copyright",
[NSString stringWithUTF8String:mpv_version], @"ApplicationVersion",
nil];
[NSApp orderFrontStandardAboutPanelWithOptions:options];

3
osdep/mpv.rc
View File

@ -16,6 +16,7 @@
*/
#include <winver.h>
#include "version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2, 0, 0, 0
@ -32,7 +33,7 @@ VS_VERSION_INFO VERSIONINFO
VALUE "CompanyName", "mpv"
VALUE "FileDescription", "mpv"
VALUE "FileVersion", "2.0.0.0"
VALUE "LegalCopyright", "(C) 2000-2018 mpv/mplayer2/MPlayer"
VALUE "LegalCopyright", MPVCOPYRIGHT
VALUE "OriginalFilename", "mpv.exe"
VALUE "ProductName", "mpv"
VALUE "ProductVersion", "2.0.0.0"

5
player/main.c
View File

@ -140,9 +140,8 @@ void mp_update_logging(struct MPContext *mpctx, bool preinit)
void mp_print_version(struct mp_log *log, int always)
{
int v = always ? MSGL_INFO : MSGL_V;
mp_msg(log, v,
"%s (C) 2000-2018 mpv/MPlayer/mplayer2 projects\n built on %s\n",
mpv_version, mpv_builddate);
mp_msg(log, v, "%s %s\n built on %s\n",
mpv_version, mpv_copyright, mpv_builddate);
print_libav_versions(log, v);
mp_msg(log, v, "\n");
// Only in verbose mode.

2
version.sh
View File

@ -54,11 +54,13 @@ fi
NEW_REVISION="#define VERSION \"${VERSION}\""
OLD_REVISION=$(head -n 1 "$version_h" 2> /dev/null)
BUILDDATE="#define BUILDDATE \"$(date)\""
MPVCOPYRIGHT="#define MPVCOPYRIGHT \"Copyright © 2000-2018 mpv/MPlayer/mplayer2 projects\""
# Update version.h only on revision changes to avoid spurious rebuilds
if test "$NEW_REVISION" != "$OLD_REVISION"; then
cat <<EOF > "$version_h"
$NEW_REVISION
$BUILDDATE
$MPVCOPYRIGHT
EOF
fi