strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Actually we don't seem to need instmsiw.exe anywhere

Browse source
This commit is contained in:
Tor Lillqvist 2010-12-21 18:55:41 +02:00 committed by Tor Lillqvist
parent 6009e97da4
commit 4ce4ff8a53
3 changed files with 0 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download
View file

@ -177,7 +177,6 @@ done
if [ "$GUI" = "WNT" ]; then
downloaditem "http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US/" "dbghinst.EXE" "096f1d53d9ba09cde27d6f7c2ea6cc47"
downloaditem "http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/" "WindowsXP-KB975337-x86-ENU.exe" "946d00d87e4094f3a6e425e2d538eadd"
downloaditem "http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/" "InstMsiW.exe" "53820efbc952107ee1a38be6cd5aa3f0"
msvcver=`$SRC_ROOT/oowintool --msvc-ver`
case "$msvcver" in
@ -225,9 +224,6 @@ if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then
if [ ! -f ./external/vcredist/vcredist_x64.exe -a -f $TARFILE_LOCATION/vcredist_x64.exe ]; then
cp $TARFILE_LOCATION/vcredist_x64.exe ./external/vcredist/vcredist_x64.exe
fi
if [ ! -f ./external/msi/instmsiw.exe -a -f $TARFILE_LOCATION/InstMsiW.exe ]; then
cp $TARFILE_LOCATION/InstMsiW.exe ./external/msi/instmsiw.exe
fi
fi
[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }

25
oowintool
View file

@ -46,7 +46,6 @@ sub print_syntax()
print " commands:\n";
print " --msvc-ver - dump version of MSVC eg. 6.0\n";
print " --msvc-copy-dlls <dest> - copy msvc[pr]??.dlls into <dest>/msvcp??/\n";
print " --msvc-copy-instmsi <dest> - copy instmsia.exe, insmsiw.exe into <dest>\n";
print " --msvc-productdir - dump productdir\n";
print " --msvs-productdir - dump productdir\n";
print " --dotnetsdk-dir - dump .Net SDK path\n";
@ -123,42 +122,36 @@ sub print_psdk_home()
my %msvs_2008 = (
'ver' => '9.0',
'key' => 'Microsoft/VisualStudio/9.0/Setup/VS/ProductDir',
'instmsi_path' => '?',
'dll_path' => 'VC/redist/x86/Microsoft.VC90.CRT',
'dll_suffix' => '90'
);
my %msvc_2008 = (
'ver' => '9.0',
'key' => 'Microsoft/VisualStudio/9.0/Setup/VC/ProductDir',
'instmsi_path' => '?',
'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
'dll_suffix' => '90'
);
my %msvs_express_2008 = (
'ver' => '9.0',
'key' => 'Microsoft/VCExpress/9.0/Setup/VS/ProductDir',
'instmsi_path' => '?',
'dll_path' => 'VC/redist/x86/Microsoft.VC90.CRT',
'dll_suffix' => '90'
);
my %msvc_express_2008 = (
'ver' => '9.0',
'key' => 'Microsoft/VCExpress/9.0/Setup/VC/ProductDir',
'instmsi_path' => '?',
'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
'dll_suffix' => '90'
);
my %msvs_2010 = (
'ver' => '10.0',
'key' => 'Microsoft/VisualStudio/10.0/Setup/VS/ProductDir',
'instmsi_path' => '?',
'dll_path' => 'VC/redist/x86/Microsoft.VC100.CRT',
'dll_suffix' => '100'
);
my %msvc_2010 = (
'ver' => '10.0',
'key' => 'Microsoft/VisualStudio/10.0/Setup/VC/ProductDir',
'instmsi_path' => '?',
'dll_path' => 'redist/x86/Microsoft.VC100.CRT',
'dll_suffix' => '100'
);
@ -291,20 +284,6 @@ sub msvc_copy_dlls($)
}
}
sub msvc_copy_instmsi($)
{
my $dest = shift;
my $ver = msvc_find_version('instmsi_path');
defined $ver || return;
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{'instmsi_path'});
copy_dll ($srcdir, "instmsia.exe",
$dest);
copy_dll ($srcdir, "instmsiw.exe",
$dest);
}
if (!@ARGV) {
print_syntax();
exit 1;
@ -332,10 +311,6 @@ while (@commands) {
my $dest = shift @commands;
defined $dest || die "copy-dlls requires a destination directory";
msvc_copy_dlls( $dest );
} elsif ($opt eq '--msvc-copy-instmsi') {
my $dest = shift @commands;
defined $dest || die "copy-instmsi requires a destination directory";
msvc_copy_instmsi( $dest );
} elsif ($opt eq '--msvs-productdir') {
print_msvs_productdir();
} elsif ($opt eq '--msvc-productdir') {

19
post_download.in
View file

@ -114,25 +114,6 @@ and put it into external/vcredist.])
fi
fi
dnl ===================================================================
dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/
dnl ===================================================================
if test "$_os" = "WINNT"; then
./oowintool --msvc-copy-instmsi ./external/msi
fi
dnl ===================================================================
dnl Windows builds with MSVS 2008/2010 need instmsiw.exe in external/msi
dnl ===================================================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for instmsiw.exe])
if test -f ./external/msi/instmsiw.exe; then
AC_MSG_RESULT([found])
else
AC_MSG_ERROR([instmsiw.exe is missing in external/msi.])
fi
fi
dnl ===================================================================
dnl Windows builds with MSVS 2008/2010 need msvcr71.dll in external/msvcp71
dnl ===================================================================