incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1177580 - in /incubator/ooo/trunk/main: configure.in external/msi/readme.txt external/prj/d.lst oowintool
Date Fri, 30 Sep 2011 10:29:07 GMT
Author: jsc
Date: Fri Sep 30 10:29:06 2011
New Revision: 1177580

URL: http://svn.apache.org/viewvc?rev=1177580&view=rev
Log:
118457: applied patch, remove instmsi deps, thanks to Oliver-Rainer Wittmann (orw)

Removed:
    incubator/ooo/trunk/main/external/msi/readme.txt
Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/external/prj/d.lst
    incubator/ooo/trunk/main/oowintool

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1177580&r1=1177579&r2=1177580&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Fri Sep 30 10:29:06 2011
@@ -5711,41 +5711,6 @@ You may have to search Microsoft's websi
 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 VS 2003/2005/2008 need instmsia.exe and instmsiw.exe in external/msi
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-   if test  "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
-   AC_MSG_CHECKING([for instmsia.exe/instmsiw.exe])
-   if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
-      AC_MSG_RESULT([found])
-   else
-      MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
-      MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
-      if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
-         cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe &&
MSIACOPY="OK"
-         cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe &&
MSIWCOPY="OK"
-      fi
-      if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
-         AC_MSG_ERROR([instmsia.exe and/or instmsiw.exe are/is missing in the default location.
-These programs are part of the Visual Studio installation and should be found in a
-directory similar to:
-"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\"
-As the automatic detection fails please copy the files to external/msi/.])
-      else
-         AC_MSG_RESULT([found and copied])
-      fi
-   fi
-fi
-fi
-
-dnl ===================================================================
 dnl Test which vclplugs have to be built.
 dnl ===================================================================
 AC_MSG_CHECKING([which VCLplugs shall be built])

Modified: incubator/ooo/trunk/main/external/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external/prj/d.lst?rev=1177580&r1=1177579&r2=1177580&view=diff
==============================================================================
--- incubator/ooo/trunk/main/external/prj/d.lst (original)
+++ incubator/ooo/trunk/main/external/prj/d.lst Fri Sep 30 10:29:06 2011
@@ -50,9 +50,6 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\
 
 ..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll
 
-..\msi\instmsia.exe %_DEST%\bin%_EXT%\instmsia.exe
-..\msi\instmsiw.exe %_DEST%\bin%_EXT%\instmsiw.exe
-
 ..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
 ..\%__SRC%\bin\libgcc*.dll %_DEST%\bin%_EXT%\libgcc*.dll
 ..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin%_EXT%\libstdc++*.dll

Modified: incubator/ooo/trunk/main/oowintool
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/oowintool?rev=1177580&r1=1177579&r2=1177580&view=diff
==============================================================================
--- incubator/ooo/trunk/main/oowintool (original)
+++ incubator/ooo/trunk/main/oowintool Fri Sep 30 10:29:06 2011
@@ -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,77 +122,66 @@ sub print_psdk_home()
 my %msvc_net_2003 = (
     'ver' => '7.1',
     'key' => 'Microsoft/VisualStudio/7.1/Setup/VC/ProductDir',
-    'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
     'dll_path' => '../Visual Studio .NET Professional 2003 - English',
     'dll_suffix' => '71'
 );
 my %msvs_net_2003 = (
     'ver' => '7.1',
     'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
-    'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
     'dll_path' => 'Visual Studio .NET Professional 2003 - English',
     'dll_suffix' => '71'
 );
 my %msvs_net_2003_ea = (
     'ver' => '7.1',
     'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
-    'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
     'dll_path' => 'Visual Studio .NET Enterprise Architect 2003 - English', # testme ...
     'dll_suffix' => '71'
 );
 my %msvs_express_2005 = (
     'ver' => '8.0',
     'key' => 'Microsoft/VCExpress/8.0/Setup/VS/ProductDir',
-    'instmsi_path' => '../SDK/v2.0/BootStrapper/Packages/InstMSI',
     'dll_path' => '../SDK/v2.0/Bin',
     'dll_suffix' => '80'
 );
 my %msvc_express_2005 = (
     'ver' => '8.0',
     'key' => 'Microsoft/VCExpress/8.0/Setup/VC/ProductDir',
-    'instmsi_path' => '../SDK/v2.0/BootStrapper/Packages/InstMSI',
     'dll_path' => '../SDK/v2.0/Bin',
     'dll_suffix' => '80'
 );
 my %msvs_2005 = (
     'ver' => '8.0',
     'key' => 'Microsoft/VisualStudio/8.0/Setup/VS/ProductDir',
-    'instmsi_path' => 'SDK/v2.0/BootStrapper/Packages/InstMSI',
     'dll_path' => 'Visual Studio .NET Professional 2005 - English',
     'dll_suffix' => '80'
 );
 my %msvc_2005 = (
     'ver' => '8.0',
     'key' => 'Microsoft/VisualStudio/8.0/Setup/VC/ProductDir',
-    'instmsi_path' => '../SDK/v2.0/BootStrapper/Packages/InstMSI',
     'dll_path' => '../SDK/v2.0/Bin',
     'dll_suffix' => '80'
 );
 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'
 );
@@ -321,20 +309,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;
@@ -362,10 +336,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') {



Mime
View raw message