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

Merge branch 'issue-30' into 'master'

msibuild: fix -s argument handling

See merge request !32
parents b54307ca 7ddd0e82
Pipeline #251647 passed with stage
in 3 minutes and 56 seconds
......@@ -16,8 +16,6 @@ variables:
mingw64-bzip2
mingw32-cairo
mingw64-cairo
mingw32-celt051
mingw64-celt051
mingw32-curl
mingw64-curl
mingw32-dlfcn
......@@ -54,10 +52,6 @@ variables:
mingw64-gstreamer1-plugins-good
mingw32-gstreamer1
mingw64-gstreamer1
mingw32-gstreamer-plugins-base
mingw64-gstreamer-plugins-base
mingw32-gstreamer
mingw64-gstreamer
mingw32-gtk2
mingw64-gtk2
mingw32-gtk3
......@@ -72,8 +66,6 @@ variables:
mingw64-hicolor-icon-theme
mingw32-icu
mingw64-icu
mingw32-ilmbase
mingw64-ilmbase
mingw32-jasper
mingw64-jasper
mingw32-json-glib
......@@ -118,8 +110,6 @@ variables:
mingw64-libxml2
mingw32-nettle
mingw64-nettle
mingw32-OpenEXR
mingw64-OpenEXR
mingw32-openssl
mingw64-openssl
mingw32-opus
......
wxi_data = files(
'wixl/OpenEXR.wxi',
'wixl/SDL.wxi',
'wixl/adwaita-icon-theme.wxi',
'wixl/atk.wxi',
'wixl/brotli.wxi',
'wixl/bzip2.wxi',
'wixl/cairo.wxi',
'wixl/celt051.wxi',
'wixl/curl.wxi',
'wixl/dlfcn.wxi',
'wixl/expat.wxi',
......@@ -22,8 +20,6 @@ wxi_data = files(
'wixl/gmp.wxi',
'wixl/gnutls.wxi',
'wixl/gsm.wxi',
'wixl/gstreamer-plugins-base.wxi',
'wixl/gstreamer.wxi',
'wixl/gstreamer1-plugins-bad-free.wxi',
'wixl/gstreamer1-plugins-base.wxi',
'wixl/gstreamer1-plugins-good.wxi',
......@@ -35,7 +31,6 @@ wxi_data = files(
'wixl/harfbuzz.wxi',
'wixl/hicolor-icon-theme.wxi',
'wixl/icu.wxi',
'wixl/ilmbase.wxi',
'wixl/jasper.wxi',
'wixl/json-glib.wxi',
'wixl/libcacard.wxi',
......
<?xml version="1.0" encoding="utf-8"?>
<?require ilmbase.wxi?>
<?require zlib.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="dirD82453D760D75AFEACE0B4CFFB66E47F" Name="bin">
<Component Win64="$(var.Win64)" Id="cmpAF01A198C634A806766802238548688B" Guid="*">
<File Id="fil42091A46F9AA74BB113E15D274AED537" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImf-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmp7FD83EB5B344D2CA1DE250C9877ABF62" Guid="*">
<File Id="fil0C364885851B102522705CC5D4F97F18" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImfUtil-2_4-24.dll"/>
</Component>
</Directory>
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="CG.OpenEXR">
<ComponentGroupRef Id="CG.ilmbase"/>
<ComponentGroupRef Id="CG.zlib"/>
<ComponentRef Id="cmpAF01A198C634A806766802238548688B"/>
<ComponentRef Id="cmp7FD83EB5B344D2CA1DE250C9877ABF62"/>
</ComponentGroup>
</Fragment>
</Include>
<?xml version="1.0" encoding="utf-8"?>
<?require libogg.wxi?>
<!--
<ComponentGroup Id="CG.celt051">
<Requires>
CG.libogg
</Requires>
<Files>
bin/libcelt051-0.dll
</Files>
</ComponentGroup>
-->
<Include>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="dirDC1C691F531D46C718020066C3909F20" Name="bin">
<Component Win64="$(var.Win64)" Id="cmp81CDD846C962D3ED3E6AB12F6555421F" Guid="*">
<File Id="filC3F74D9F5B11B0C760638C18F0F4BBB1" KeyPath="yes" Source="$(var.SourceDir)/bin/libcelt051-0.dll"/>
</Component>
</Directory>
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="CG.celt051">
<ComponentGroupRef Id="CG.libogg"/>
<ComponentRef Id="cmp81CDD846C962D3ED3E6AB12F6555421F"/>
</ComponentGroup>
</Fragment>
</Include>
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<?require gstreamer1-plugins-base.wxi?>
<?require OpenEXR.wxi?>
<?require gcc-c++.wxi?>
<?require libxml2.wxi?>
<?require nettle.wxi?>
......@@ -101,9 +100,6 @@
<Component Win64="$(var.Win64)" Id="cmpF3A7DA356D8A5E9DA6767517F0FD91FB" Guid="*">
<File Id="filBA1195BAE9888895F8108D8294B39371" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstd3d.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmpD9F44A71152095BB1311504F5E2746D5" Guid="*">
<File Id="filD5CA45FE4DE3366CA45CF6EF52B4F27E" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdashdemux.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmp636E288E0B7C6AEB2990AF348215C9AA" Guid="*">
<File Id="fil6E61195A144A411D39C8800DB077AAE0" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdebugutilsbad.dll"/>
</Component>
......@@ -191,9 +187,6 @@
<Component Win64="$(var.Win64)" Id="cmp88A44C9FDB695E9AE413FC989E426434" Guid="*">
<File Id="fil51A1D24EB330CC534E08A14D34BFA01A" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstnetsim.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmpA51A4882249288BCBF783B2B8F6C3F58" Guid="*">
<File Id="fil7D04370A014E2CE2B0DB5B0D13ADA733" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstopenexr.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmpD4E115B11B1C07D461165365952FB3D8" Guid="*">
<File Id="fil35CDBAAD35D1174AABBC81C300B55212" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstopusparse.dll"/>
</Component>
......@@ -263,9 +256,6 @@
<Component Win64="$(var.Win64)" Id="cmp5CF73AEA20BA7CA3C8E57BF0B598376D" Guid="*">
<File Id="filE3C022E556A01F85D0A6E3E34AACB321" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgsty4mdec.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmp03E4257DBD437EED77ADC36F26D13C18" Guid="*">
<File Id="fil29987D20608A2FEDB9A32963DD604590" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstyadif.dll"/>
</Component>
</Directory>
</Directory>
<Directory Id="dir14817211F18360C7084B253DE4EA6968" Name="share">
......@@ -600,7 +590,6 @@
<ComponentRef Id="cmpD3169FDE8F254F6BAB999FDC971DC896"/>
<ComponentRef Id="cmp83B90DFB1EDBF160FA4CFCCD84AC9F77"/>
<ComponentRef Id="cmpF3A7DA356D8A5E9DA6767517F0FD91FB"/>
<ComponentRef Id="cmpD9F44A71152095BB1311504F5E2746D5"/>
<ComponentRef Id="cmp636E288E0B7C6AEB2990AF348215C9AA"/>
<ComponentRef Id="cmpCFEA83DEABF93897510F3B125FAD3587"/>
<ComponentRef Id="cmp83B339398D5E5381DD1E992E16858015"/>
......@@ -630,7 +619,6 @@
<ComponentRef Id="cmpCE4AF2BF5CCCCAED42E2B4F67D1B7BDE"/>
<ComponentRef Id="cmp2BE4E40CAEDD29B510E7D2B8EF41DCAA"/>
<ComponentRef Id="cmp88A44C9FDB695E9AE413FC989E426434"/>
<ComponentRef Id="cmpA51A4882249288BCBF783B2B8F6C3F58"/>
<ComponentRef Id="cmpD4E115B11B1C07D461165365952FB3D8"/>
<ComponentRef Id="cmp3EE8E68CC754693F270A95AF269F9338"/>
<ComponentRef Id="cmpB127DDDC0A2E1F900291F6BE245CB844"/>
......@@ -654,7 +642,6 @@
<ComponentRef Id="cmp4D572CA37022D65E2503FFF2953FC253"/>
<ComponentRef Id="cmpFEE2216B50BA31DFF5764437AD124B4B"/>
<ComponentRef Id="cmp5CF73AEA20BA7CA3C8E57BF0B598376D"/>
<ComponentRef Id="cmp03E4257DBD437EED77ADC36F26D13C18"/>
<ComponentRef Id="cmp8087692860F18BC0AF4A7E42D2B9BC5B"/>
<ComponentRef Id="cmp2043CAC739EF592EE26EFBE74D87EC68"/>
<ComponentRef Id="cmp3398072EF8D836C5D7975126A8318A35"/>
......
<?xml version="1.0" encoding="utf-8"?>
<?require gcc-c++.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="dirFEE7741CD6956C044C54657F0DD3C9C6" Name="bin">
<Component Win64="$(var.Win64)" Id="cmp49032B593A9BDF7943A16C679B6064B2" Guid="*">
<File Id="fil787174B51DF1BE93A0239955863C72FF" KeyPath="yes" Source="$(var.SourceDir)/bin/libHalf-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmpE94B4B037392585281516E3184369B52" Guid="*">
<File Id="filEA13CCB16F8A7A448980B093DC653D05" KeyPath="yes" Source="$(var.SourceDir)/bin/libIex-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmp0054B3C0B8B7B470B50527958678189F" Guid="*">
<File Id="filFD41AFF06C58E24D166C1552FC612BE1" KeyPath="yes" Source="$(var.SourceDir)/bin/libIexMath-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmpCE5584F830B91965B9E59E141529BB0E" Guid="*">
<File Id="fil1852EFB6E5AEF1D07CAB79ED27F0DD74" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmThread-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmp8510F7023D50444985A90AB94DFEDD96" Guid="*">
<File Id="filE53EBCCD25A262F9346BBF8E4A6AB74B" KeyPath="yes" Source="$(var.SourceDir)/bin/libImath-2_4-24.dll"/>
</Component>
</Directory>
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="CG.ilmbase">
<ComponentGroupRef Id="CG.gcc-c++"/>
<ComponentRef Id="cmp49032B593A9BDF7943A16C679B6064B2"/>
<ComponentRef Id="cmpE94B4B037392585281516E3184369B52"/>
<ComponentRef Id="cmp0054B3C0B8B7B470B50527958678189F"/>
<ComponentRef Id="cmpCE5584F830B91965B9E59E141529BB0E"/>
<ComponentRef Id="cmp8510F7023D50444985A90AB94DFEDD96"/>
</ComponentGroup>
</Fragment>
</Include>
<?xml version="1.0" encoding="utf-8"?>
<?require gcc.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
......@@ -11,6 +12,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.speex">
<ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmpDA747289BB4C3EE4BF1C70297CF60D12"/>
</ComponentGroup>
</Fragment>
......
......@@ -51,9 +51,12 @@ my %dllbuiltin = (
"comdlg32.dll" => 1,
"crypt32.dll" => 1,
"d3d9.dll" => 1,
"d3d10.dll" => 1,
"d3d11.dll" => 1,
"dnsapi.dll" => 1,
"dsound.dll" => 1,
"dwmapi.dll" => 1,
"dxgi.dll" => 1,
"gdi32.dll" => 1,
"gdiplus.dll" => 1,
"imm32.dll" => 1,
......
......@@ -62,6 +62,16 @@ load common
[ "$(echo "$output" | grep "^Revision")" = "$exp" ]
}
@test "msibuild - Set summary" {
run "$msibuild" out.msi -s 'Project name'
run "$msibuild" out.msi -s 'Project name3' 'Somebody' ';1042' '24265297-EC57-4E72-B5E9-000000000000'
run "$msiinfo" suminfo out.msi
echo "$output" | grep "Subject: Project name3"
echo "$output" | grep "Author: Somebody"
echo "$output" | grep "Template: ;1042"
echo "$output" | grep "Revision number (UUID): 24265297-EC57-4E72-B5E9-000000000000"
}
@test "msibuild - add stream" {
echo "This is test.txt" > test.txt
run "$msibuild" out.msi -a Binary.testtxt test.txt
......@@ -114,8 +124,8 @@ Binary" ]
run "$msiinfo" streams out.msi
out=$(echo "$output" | grep -v SummaryInformation)
[ "$out" = "Icon.firefox.16.0.2.0.ico.exe" ]
run "$msiinfo" extract out.msi Icon.firefox.16.0.2.0.ico.exe
exp=$(cat Icon/firefox.16.0.2.0.ico.exe)
output=$("$msiinfo" extract out.msi Icon.firefox.16.0.2.0.ico.exe | sha1sum)
exp=$(cat Icon/firefox.16.0.2.0.ico.exe | sha1sum)
[ "$output" = "$exp" ]
}
......
......@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
n > 3 ? argv[3] : NULL,
n > 4 ? argv[4] : NULL, &error))
goto end;
argc -= 3, argv += 3;
argc -= n + 1, argv += n + 1;
break;
case 'i':
do {
......
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