raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=dd65f0383d15fd609783655d84ec8551f61ed340
commit dd65f0383d15fd609783655d84ec8551f61ed340
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Fri Jan 1 18:21:41 2021 +0000
build - move dev vs rel mode to be less manual...
---
meson.build | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/meson.build b/meson.build
index 3aebff694..e513eb6cb 100644
--- a/meson.build
+++ b/meson.build
@@ -13,25 +13,22 @@ config_h = configuration_data()
e_version = ver.split('.')
-#### FOR RELEASE
-#e_version_rev = '.'.join([ver, 'beta1'])
-#e_version_rev = ver
-#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()
+if e_version[2] == 99
+ 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 = 'dev-@0@.@1@.@2@'.format(e_version[0], e_version[1], e_version[2])
+else
+ e_version_rev = ver
+ release = '@0@.@1@.@2@'.format(e_version[0], e_version[1], e_version[2])
+ config_h.set('E_RELEASE_BUILD' , '1')
endif
-e_version_rev = '.'.join([ver, git_version])
-release = 'dev-0.24.99'
-####
efl_version = '>= 1.25.99'
--
