From 4c7fb2debb4a2cbf3085aea99c885c9e1f00e65b Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Wed, 30 Jan 2019 17:47:33 -0500 Subject: [PATCH] Move version generation scripts up a level --- build/meson.build | 11 ----------- meson.build | 12 +++++++++++- build/version.ps1 => version.ps1 | 0 build/version.sh => version.sh | 0 4 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 build/meson.build rename build/version.ps1 => version.ps1 (100%) rename build/version.sh => version.sh (100%) mode change 100755 => 100644 diff --git a/build/meson.build b/build/meson.build deleted file mode 100644 index d1699bc4c..000000000 --- a/build/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -if host_machine.system() == 'windows' - version_sh = find_program('.\\version.ps1') -else - version_sh = find_program('./version.sh') -endif -version_inc = include_directories('.') -version_h = custom_target('git_version.h', - command: [version_sh, meson.source_root()], - build_by_default: true, - build_always_stale: true, # has internal check whether target file will be refreshed - output: ['git_version.h', 'git_version.xml']) diff --git a/meson.build b/meson.build index f87aa28a0..11204c887 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,17 @@ project('Aegisub', ['c', 'cpp'], license: 'BSD-3-Clause', meson_version: '>=0.49.0', default_options: ['cpp_std=c++11', 'b_lto=true']) -subdir('build') +if host_machine.system() == 'windows' + version_sh = find_program('version.ps1') +else + version_sh = find_program('version.sh') +endif +version_inc = include_directories('.') +version_h = custom_target('git_version.h', + command: [version_sh, meson.source_root()], + build_by_default: true, + build_always_stale: true, # has internal check whether target file will be refreshed + output: ['git_version.h', 'git_version.xml']) dataroot = get_option('prefix') / get_option('datadir') / 'aegisub' add_project_arguments('-DP_DATA="@0@"'.format(dataroot), language: 'cpp') diff --git a/build/version.ps1 b/version.ps1 similarity index 100% rename from build/version.ps1 rename to version.ps1 diff --git a/build/version.sh b/version.sh old mode 100755 new mode 100644 similarity index 100% rename from build/version.sh rename to version.sh