raster pushed a commit to tag v0.23.0-alpha.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=bd3cd153430eda80609a8f13c082fcb9e0e45308

commit bd3cd153430eda80609a8f13c082fcb9e0e45308
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Mon May 20 16:27:53 2019 +0100

    E - begin release cycle for e 0.23
    
    restructure some of the release vrsion stuff to make this easy
---
 meson.build | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/meson.build b/meson.build
index a790e3828..6cdefa310 100644
--- a/meson.build
+++ b/meson.build
@@ -15,25 +15,31 @@ if clean_check.returncode() == 0
   error('Meson build requires a clean source tree')
 endif
 
+config_h = configuration_data()
+
 e_version   = ver.split('.')
-git_version = '0'
-git         = find_program('git', required: false)
-if git.found() == true
-  git_cmd = run_command(git.path(), 'rev-list', '--count', 'HEAD')
-  if git_cmd.returncode() == 0
-    git_version = git_cmd.stdout().strip()
-  endif
-endif
 
-e_version_rev = '.'.join([ver, git_version])
-#e_version_rev = e_version
+#### FOR RELEASE
+e_version_rev = '.'.join([ver, 'alpha'])
+release = '@0@.@1@.@2@'.format(e_version[0], e_version[1], e_version[2])
+config_h.set('E_RELEASE_BUILD'         , '1')
+####
+
+#### FOR DEVELOPMENT
+#git_version = '0'
+#git         = find_program('git', required: false)
+#if git.found() == true
+#  git_cmd = run_command(git.path(), 'rev-list', '--count', 'HEAD')
+#  if git_cmd.returncode() == 0
+#    git_version = git_cmd.stdout().strip()
+#  endif
+#endif
+#e_version_rev = '.'.join([ver, git_version])
+#release = 'ver-0.23'
+####
 
 efl_version = '>= 1.22.2'
 
-release = 'ver-0.23'
-#for releases
-#release = '@0@.@1@.@2@'.format(e_version[0], e_version[1], e_version[2])
-
 add_global_arguments('-DHAVE_CONFIG_H=1', language: 'c')
 dir_prefix    = get_option('prefix')
 dir_bin       = join_paths(dir_prefix, get_option('bindir'))
@@ -78,14 +84,12 @@ foreach cf: dev_cflags_try
 endforeach
 add_global_arguments(dev_cflags, language: 'c')
 
-config_h = configuration_data()
 config_h.set('E_INTERNAL'              , '1')
 config_h.set('_GNU_SOURCE'             , '1')
 config_h.set('_ALL_SOURCE'             , '1')
 config_h.set('_POSIX_PTHREAD_SEMANTICS', '1')
 config_h.set('_TANDEM_SOURCE'          , '1')
 config_h.set('__EXTENSIONS__'          , '1')
-#config_h.set('E_RELEASE_BUILD'         , '1')
 
 subdir('po')
 

-- 


Reply via email to