[phodav: 1/8] build-sys: move msi stuff to data/

[Marc-André Lureau <malureau src gnome org>]

commit e71c566f204c6f05e17468b83a49c39acbf1c445
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Thu Mar 5 12:39:19 2020 +0100

    build-sys: move msi stuff to data/
    
    Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>

 .gitlab-ci.yml                                    |  4 +--
 chezdav.wxs.in => data/chezdav.wxs.in             |  0
 make-msi.sh.in => data/make-msi.sh.in             |  2 +-
 data/meson.build                                  | 38 +++++++++++++++++++++
 spice-webdavd.wxs.in => data/spice-webdavd.wxs.in |  0
 meson.build                                       | 40 +----------------------
 6 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a02a278..1e975f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,11 +46,11 @@ build_win:
     - dnf update -y --nogpgcheck
     - dnf install -y --nogpgcheck $WIN_DEPENDENCIES
   script:
-    - mkdir w32 && cd w32 && mingw32-meson -Dgtk_doc=disabled && ninja && sh -x ./make-msi.sh
+    - mkdir w32 && cd w32 && mingw32-meson -Dgtk_doc=disabled && ninja && sh -x data/make-msi.sh
     - pwd
     - ls
     - cd ..
-    - mkdir w64 && cd w64 && mingw64-meson -Dgtk_doc=disabled && ninja && sh -x ./make-msi.sh
+    - mkdir w64 && cd w64 && mingw64-meson -Dgtk_doc=disabled && ninja && sh -x data/make-msi.sh
   artifacts:
     paths:
       - w32/*.msi
diff --git a/chezdav.wxs.in b/data/chezdav.wxs.in
similarity index 100%
rename from chezdav.wxs.in
rename to data/chezdav.wxs.in
diff --git a/make-msi.sh.in b/data/make-msi.sh.in
similarity index 94%
rename from make-msi.sh.in
rename to data/make-msi.sh.in
index 465e7dc..ce25341 100755
--- a/make-msi.sh.in
+++ b/data/make-msi.sh.in
@@ -11,5 +11,5 @@ for p in chezdav spice-webdavd ; do
          -D DESTDIR="$DESTDIR@prefix@" \
          --arch @WIXL_ARCH@ \
          -o $p-@WIXL_ARCH@-@VERSION@@BUILDID@.msi \
-         $p.wxs
+         data/$p.wxs
 done
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 0000000..1835d31
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,38 @@
+buildid = get_option('build-id')
+version = proj_version.split('.')
+maj = version[0].to_int()
+min = version[1].split('-')[0].to_int()
+mic = 0
+if version.length() > 2
+  mic = version[2].split('-')[0].to_int()
+endif
+win_version = '@0@.@1@.@2@'.format(maj, min, mic * 256 + buildid)
+
+if buildid != 0
+  buildid = '-@0@'.format(buildid)
+else
+  buildid = ''
+endif
+
+wixl_arch = 'x86'
+if host_machine.cpu_family() == 'x86_64'
+  wixl_arch = 'x64'
+endif
+
+if host_machine.system() == 'windows'
+  foreach out : [ 'chezdav.wxs', 'spice-webdavd.wxs', 'make-msi.sh' ]
+    configure_file(
+      input : '@0@.in'.format(out),
+      output : out,
+      install : false,
+      configuration : {
+                        'BUILDID' : buildid,
+                        'VERSION' : proj_version,
+                        'WINDOWS_PRODUCTVERSION' : win_version,
+                        'WIXL_ARCH' : wixl_arch,
+                        'srcdir' : meson.current_source_dir(),
+                        'prefix' : prefix,
+                      }
+    )
+  endforeach
+endif
diff --git a/spice-webdavd.wxs.in b/data/spice-webdavd.wxs.in
similarity index 100%
rename from spice-webdavd.wxs.in
rename to data/spice-webdavd.wxs.in
diff --git a/meson.build b/meson.build
index 5eb0305..f9b5593 100644
--- a/meson.build
+++ b/meson.build
@@ -71,45 +71,7 @@ subdir('po')
 subdir('libphodav')
 subdir('spice')
 subdir('doc')
-
-buildid = get_option('build-id')
-version = proj_version.split('.')
-maj = version[0].to_int()
-min = version[1].split('-')[0].to_int()
-mic = 0
-if version.length() > 2
-  mic = version[2].split('-')[0].to_int()
-endif
-win_version = '@0@.@1@.@2@'.format(maj, min, mic * 256 + buildid)
-
-if buildid != 0
-  buildid = '-@0@'.format(buildid)
-else
-  buildid = ''
-endif
-
-wixl_arch = 'x86'
-if host_machine.cpu_family() == 'x86_64'
-  wixl_arch = 'x64'
-endif
-
-if host_machine.system() == 'windows'
-  foreach out : [ 'chezdav.wxs', 'spice-webdavd.wxs', 'make-msi.sh' ]
-    configure_file(
-      input : '@0@.in'.format(out),
-      output : out,
-      install : false,
-      configuration : {
-        'BUILDID' : buildid,
-        'VERSION' : proj_version,
-        'WINDOWS_PRODUCTVERSION' : win_version,
-        'WIXL_ARCH' : wixl_arch,
-        'srcdir' : meson.current_source_dir(),
-        'prefix' : prefix,
-      }
-    )
-  endforeach
-endif
+subdir('data')
 
 config = {
   'GETTEXT_PACKAGE' : proj_gettext,