cleanup

Author: bcapener

libnvme/examples/meson.build

@@ -6,7 +6,7 @@
 # Authors: Martin Belanger <[email protected]>
 #
 
-# Skip for now on Windows.
+# Skip examples on Windows for now.
 if not is_windows
 
 executable(
@@ -93,4 +93,4 @@ if libdbus_dep.found()
     )
 endif
 
-endif
+endif # not is_windows

libnvme/src/meson.build

@@ -36,12 +36,12 @@ endif
 subdir('nvme')  # declares: accessors_dep, accessors_ld_full_path
 
 deps = [
-        config_dep,
-        ccan_dep,
-        json_c_dep,
-        keyutils_dep,
-        openssl_dep,
-        accessors_dep,
+    config_dep,
+    ccan_dep,
+    json_c_dep,
+    keyutils_dep,
+    openssl_dep,
+    accessors_dep,
 ]
 if is_windows
     deps += [
@@ -59,6 +59,7 @@ ldfile = 'libnvme.ld'
 libnvme_link_args = [
     '-Wl,--version-script=@0@'.format(meson.current_source_dir() / ldfile),
 ]
+# Skipping accessor generation for now on Windows. Needs to be ported.
 if not is_windows
     libnvme_link_args += [
         '-Wl,--version-script=@0@'.format(accessors_ld_full_path),

libnvme/test/meson.build

@@ -10,7 +10,7 @@
 # target. However, they're available for developer use, when hardware is
 # available.
 
-# Skip for now on Windows.
+# Skip tests on Windows for now.
 if not is_windows
 
 main = executable(
@@ -181,4 +181,4 @@ if openssl_dep.found()
     )
 endif
 
-endif
+endif # not is_windows

meson.build

@@ -55,7 +55,7 @@ want_docs = get_option('docs')
 want_docs_build = get_option('docs-build')
 
 feature_python = get_option('python')
-if feature_python.disabled() or is_windows
+if is_windows or feature_python.disabled()
     py3_dep = dependency('', required: false)  # Needed for muon
     want_python = false
 else
@@ -115,9 +115,10 @@ version_tag = get_option('version-tag')
 if version_tag != ''
     conf.set('GIT_VERSION', '"@0@"'.format(version_tag))
 else
-    vcs_cmd = is_windows ? ['powershell', '-File', 'scripts/meson-vcs-tag.ps1'] : 'scripts/meson-vcs-tag.sh'
+    windows_vcs_cmd = ['powershell', '-File', 'scripts/meson-vcs-tag.ps1']
+    linux_vcs_cmd = 'scripts/meson-vcs-tag.sh'
     r = run_command(
-        vcs_cmd,
+        is_windows ? windows_vcs_cmd : linux_vcs_cmd,
         meson.current_source_dir(),
         meson.project_version(),
         check: true,
@@ -129,7 +130,6 @@ conf.set('SYSCONFDIR', '"@0@"'.format(sysconfdir))
 conf.set('RUNDIR', '"@0@"'.format(rundir))
 
 if is_windows
-    # Find Windows system libraries
     kernel32_dep = cc.find_library('kernel32', required: true)
 endif
 

plugins/meson.build

@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-if is_windows
-    plugin_sources = []
-else
-    plugin_sources = [
+
+plugin_sources = []
+
+if not is_windows
+    plugin_sources += [
         'plugins/amzn/amzn-nvme.c',
         'plugins/dapustor/dapustor-nvme.c',
         'plugins/dell/dell-nvme.c',

util/meson.build

@@ -1,9 +1,11 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+util_sources = []
+
 if is_windows
-    util_sources = []
+    util_sources += []
 else
-    util_sources = [
+    util_sources += [
         'util/argconfig.c',
         'util/base64.c',
         'util/crc32.c',