Rename download-js Meson option

The version with a dash more closely resembles how Meson build flags are named.
ximion · Nov 6, 2017 · b4ba446 · b4ba446
1 parent 1e6fb67
commit b4ba446
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ In summary:
 
 ```ShellSession
 $ mkdir build && cd build
-$ meson -Ddownload_js=true ..
+$ meson -Ddownload-js=true ..
 $ ninja
 $ sudo ninja install
 ```

diff --git a/meson.build b/meson.build
@@ -143,8 +143,7 @@ gir_binding_sources = dgir_glob_script.stdout().strip().split('\n')
 #
 
 # Download JavaScript assets if requested
-download_js = get_option('download_js')
-if download_js
+if get_option('download-js')
     message('Downloading JavaScript libraries...')
     if run_command('[', '-d', 'data/templates/default/static/js', ']').returncode() != 0
         getjs_cmd = run_command([source_root + '/contrib/setup/build_js.sh'])

diff --git a/meson_options.txt b/meson_options.txt
@@ -2,7 +2,7 @@
 # Options for AppStream Generator
 #
 
-option('download_js',
+option('download-js',
        type: 'boolean',
        value: true,
        description: 'Whether we should download JavaScript with Bower automatically.'

diff --git a/test/ci/build_and_test.sh b/test/ci/build_and_test.sh
@@ -15,7 +15,7 @@ meson --version
 # Build & Test
 #
 mkdir -p build && cd build
-meson -Ddownload_js=true ..
+meson -Ddownload-js=true ..
 ninja
 
 # Run tests