[epiphany] Give up on using 'git describe' to show tech preview version



commit cc6e329bad649b2ecf1d371910dbc3537bbc4f33
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Nov 20 11:20:42 2017 -0600

    Give up on using 'git describe' to show tech preview version
    
    Just show the build date and time instead. I think the SDK builder is
    using shallow clones, or not downloading tags, or something.

 compute-tech-preview-version.sh |   10 ----------
 meson.build                     |   20 ++++----------------
 src/window-commands.c           |    3 ++-
 3 files changed, 6 insertions(+), 27 deletions(-)
---
diff --git a/meson.build b/meson.build
index 4833631..7f15a69 100644
--- a/meson.build
+++ b/meson.build
@@ -31,25 +31,13 @@ conf.set_quoted('LOCALEDIR', localedir)
 conf.set_quoted('PKGDATADIR', pkgdatadir)
 conf.set_quoted('PKGLIBEXECDIR', pkglibexecdir)
 conf.set_quoted('SOURCE_ROOT', meson.source_root())
-
-# FIXME: Get rid of this option. This feature should be polished up and enabled unconditionally.
-conf.set10('ENABLE_HTTPS_EVERYWHERE', get_option('https_everywhere'))
+conf.set_quoted('VERSION', meson.project_version())
 
 conf.set10('DEVELOPER_MODE', get_option('developer_mode'))
+conf.set10('TECH_PREVIEW', get_option('tech_preview'))
 
-tech_preview = get_option('tech_preview')
-conf.set10('TECH_PREVIEW', tech_preview)
-
-if tech_preview
-  msg = 'Computing Epiphany Tech Preview version: '
-  res = run_command(join_paths(meson.source_root(), 'compute-tech-preview-version.sh'))
-  assert(res.returncode() == 0, msg + 'FAIL (script returned nonzero exit status)')
-  tech_preview_version = res.stdout().strip()
-  message(msg + tech_preview_version)
-  conf.set_quoted('VERSION', tech_preview_version)
-else
-  conf.set_quoted('VERSION', meson.project_version())
-endif
+# FIXME: Get rid of this option. This feature should be polished up and enabled unconditionally.
+conf.set10('ENABLE_HTTPS_EVERYWHERE', get_option('https_everywhere'))
 
 configure_file(
   output: 'config.h',
diff --git a/src/window-commands.c b/src/window-commands.c
index 93d9616..4951593 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -647,10 +647,11 @@ window_cmd_show_about (GSimpleAction *action,
   gtk_show_about_dialog (window ? GTK_WINDOW (window) : NULL,
 #if !TECH_PREVIEW
                          "program-name", _("Web"),
+                         "version", VERSION,
 #else
                          "program-name", _("Epiphany Technology Preview"),
+                         "version", __DATE__ " " __TIME__,
 #endif
-                         "version", VERSION,
                          "copyright", "Copyright © 2002–2004 Marco Pesenti Gritti\n"
                          "Copyright © 2003–2017 The Web Developers",
                          "artists", artists,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]