Commit e71c566f authored by Marc-André Lureau's avatar Marc-André Lureau

build-sys: move msi stuff to data/

Signed-off-by: Marc-André Lureau's avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent 2fe60908
......@@ -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
......
......@@ -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
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
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment