diff options
| author | georgev93 <georgeavogt93@gmail.com> | 2020-06-28 21:59:17 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-06-30 23:50:10 +0300 |
| commit | 5acd8acd51859ab3189f43d6ba2fcd3e4b27518d (patch) | |
| tree | 10c73d0a7390697ba263f9257f78a3225e6603ee /msi | |
| parent | 4a371c97f422d0dc68fece2fe56d544ccd6558e9 (diff) | |
| download | meson-5acd8acd51859ab3189f43d6ba2fcd3e4b27518d.zip meson-5acd8acd51859ab3189f43d6ba2fcd3e4b27518d.tar.gz meson-5acd8acd51859ab3189f43d6ba2fcd3e4b27518d.tar.bz2 | |
Move mesonbuild/cmake/data/run_ctgt.py to mesonbuild/scripts/cmake_run_ctgt.py, as well as enclose everything in a run() function so it can be called by `meson --internal cmake_run_ctgt ...`. Also, include mesonbuild/cmake/data/ in the msi package.
Diffstat (limited to 'msi')
| -rw-r--r-- | msi/createmsi.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/msi/createmsi.py b/msi/createmsi.py index 4d03593..76cb520 100644 --- a/msi/createmsi.py +++ b/msi/createmsi.py @@ -154,6 +154,7 @@ class PackageGenerator: shutil.rmtree(sdir) main_stage, ninja_stage = self.staging_dirs dep_data_dir = 'mesonbuild/dependencies/data' + cmake_data_dir = 'mesonbuild/cmake/data' modules = self.get_all_modules_from_dir('mesonbuild/modules') modules += self.get_all_modules_from_dir('mesonbuild/scripts') modules += self.get_more_modules() @@ -176,6 +177,7 @@ class PackageGenerator: subprocess.check_call(pyinst_cmd) shutil.move(pyinstaller_tmpdir + '/meson', main_stage) shutil.copytree(dep_data_dir, main_stage + '/mesonbuild/dependencies/data') + shutil.copytree(cmake_data_dir, main_stage + '/mesonbuild/cmake/data') if not os.path.exists(os.path.join(main_stage, 'meson.exe')): sys.exit('Meson exe missing from staging dir.') os.mkdir(ninja_stage) |