summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-05-20 16:27:53 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-05-20 16:34:08 +0100
commitbd3cd153430eda80609a8f13c082fcb9e0e45308 (patch)
tree671497a6bcdb562ecd1fae36743ff1d08eab0373
parentc17a116d9077f56be84c3bca3f3e68b2b4bbf958 (diff)
E - begin release cycle for e 0.23
restructure some of the release vrsion stuff to make this easy
-rw-r--r--meson.build36
1 files 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
15 error('Meson build requires a clean source tree') 15 error('Meson build requires a clean source tree')
16endif 16endif
17 17
18config_h = configuration_data()
19
18e_version = ver.split('.') 20e_version = ver.split('.')
19git_version = '0'
20git = find_program('git', required: false)
21if git.found() == true
22 git_cmd = run_command(git.path(), 'rev-list', '--count', 'HEAD')
23 if git_cmd.returncode() == 0
24 git_version = git_cmd.stdout().strip()
25 endif
26endif
27 21
28e_version_rev = '.'.join([ver, git_version]) 22#### FOR RELEASE
29#e_version_rev = e_version 23e_version_rev = '.'.join([ver, 'alpha'])
24release = '@0@.@1@.@2@'.format(e_version[0], e_version[1], e_version[2])
25config_h.set('E_RELEASE_BUILD' , '1')
26####
27
28#### FOR DEVELOPMENT
29#git_version = '0'
30#git = find_program('git', required: false)
31#if git.found() == true
32# git_cmd = run_command(git.path(), 'rev-list', '--count', 'HEAD')
33# if git_cmd.returncode() == 0
34# git_version = git_cmd.stdout().strip()
35# endif
36#endif
37#e_version_rev = '.'.join([ver, git_version])
38#release = 'ver-0.23'
39####
30 40
31efl_version = '>= 1.22.2' 41efl_version = '>= 1.22.2'
32 42
33release = 'ver-0.23'
34#for releases
35#release = '@0@.@1@.@2@'.format(e_version[0], e_version[1], e_version[2])
36
37add_global_arguments('-DHAVE_CONFIG_H=1', language: 'c') 43add_global_arguments('-DHAVE_CONFIG_H=1', language: 'c')
38dir_prefix = get_option('prefix') 44dir_prefix = get_option('prefix')
39dir_bin = join_paths(dir_prefix, get_option('bindir')) 45dir_bin = join_paths(dir_prefix, get_option('bindir'))
@@ -78,14 +84,12 @@ foreach cf: dev_cflags_try
78endforeach 84endforeach
79add_global_arguments(dev_cflags, language: 'c') 85add_global_arguments(dev_cflags, language: 'c')
80 86
81config_h = configuration_data()
82config_h.set('E_INTERNAL' , '1') 87config_h.set('E_INTERNAL' , '1')
83config_h.set('_GNU_SOURCE' , '1') 88config_h.set('_GNU_SOURCE' , '1')
84config_h.set('_ALL_SOURCE' , '1') 89config_h.set('_ALL_SOURCE' , '1')
85config_h.set('_POSIX_PTHREAD_SEMANTICS', '1') 90config_h.set('_POSIX_PTHREAD_SEMANTICS', '1')
86config_h.set('_TANDEM_SOURCE' , '1') 91config_h.set('_TANDEM_SOURCE' , '1')
87config_h.set('__EXTENSIONS__' , '1') 92config_h.set('__EXTENSIONS__' , '1')
88#config_h.set('E_RELEASE_BUILD' , '1')
89 93
90subdir('po') 94subdir('po')
91 95