[Libreoffice-commits] .: oowintool

[Libreoffice Gerrit user]

 oowintool |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2eb8ecf5540f930f5bdd30aeeb2d56e9e585595b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Nov 29 17:29:48 2012 +0100

Prefer visual studio 2010 and then 2012 before 2008

Change-Id: I7de1eb056c799cfce91bdc3fba3b9c1e3ab612b0

diff --git a/oowintool b/oowintool
index d927169..9d06bc4 100755
--- a/oowintool
+++ b/oowintool
@@ -194,7 +194,7 @@ my %msvc_2012 = (
 
 sub find_msvs()
 {
-my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2012, 
\%msvs_2010 );
+my @ms_versions = ( \%msvs_2010, \%msvs_2012, \%msvs_2008, 
\%msvs_express_2008 );
 
 for $ver (@ms_versions) {
 my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ . 
$ver-{'key'});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

[Libreoffice Gerrit user]

 oowintool |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c8fb25f22e07a82aac86d6edc2af5ea9a492664b
Author: Luboš Luňák l.lu...@suse.cz
Date:   Thu Nov 29 18:26:22 2012 +0100

Really prefer visual studio 2010 and then 2012 before 2008

A followup to the incomplete previous commit.

diff --git a/oowintool b/oowintool
index 9d06bc4..26221f0 100755
--- a/oowintool
+++ b/oowintool
@@ -208,7 +208,7 @@ sub find_msvs()
 
 sub find_msvc()
 {
-my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2012, 
\%msvc_2010 );
+my @ms_versions = ( \%msvc_2010, \%msvc_2012, \%msvc_2008, 
\%msvc_express_2008 );
 
 for $ver (@ms_versions) {
 my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ . 
$ver-{'key'});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

[Libreoffice Gerrit user]

 oowintool |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a183e352747276e40358e3d19ee1f3c28f3d8d7b
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Oct 8 02:04:45 2012 -0500

Revert prefer newer versions of Visual Studio

This reverts commit 4967505ad54de0639fbd7bfa553c57ead9ada6ec.

This was creating problem with tinderbox..
changing the default base version on the fly is not a good idea anyway

diff --git a/oowintool b/oowintool
index 58ea153..c81d81f 100755
--- a/oowintool
+++ b/oowintool
@@ -181,7 +181,7 @@ my %msvc_2012 = (
 
 sub find_msvs()
 {
-my @ms_versions = ( \%msvs_2012, \%msvs_2010, \%msvs_2008, 
\%msvs_express_2008 );
+my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2012, 
\%msvs_2010 );
 
 for $ver (@ms_versions) {
 my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ . 
$ver-{'key'});
@@ -195,7 +195,7 @@ sub find_msvs()
 
 sub find_msvc()
 {
-my @ms_versions = ( \%msvc_2012, \%msvc_2010, \%msvc_2008, 
\%msvc_express_2008 );
+my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2012, 
\%msvc_2010 );
 
 for $ver (@ms_versions) {
 my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ . 
$ver-{'key'});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

[Stephan Bergmann]

 oowintool |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 710202f71ce5b4aa3dc5bc9bc869031b7d1ccec5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 2 08:49:32 2012 +0200

Missing newline

Change-Id: I8dd2d6f059b027122657e5000b95298e874e51e8

diff --git a/oowintool b/oowintool
index 9afc1cd..c9d74f6 100755
--- a/oowintool
+++ b/oowintool
@@ -296,7 +296,7 @@ sub msvc_copy_msms($$)
 }
 foreach $fname (Microsoft_VC100_CRT_x86$postfix.msm) {
 print STDERR Copying $msm_path/$fname to $dest\n;
-copy ($msm_path/$fname, $dest) || print copy failed: $!;
+copy ($msm_path/$fname, $dest) || print copy failed: $!\n;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

[Norbert Thiebaud]

 oowintool |   23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 238eba337cedda17a9ed1ce7e91755c66446195a
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Jul 19 07:38:31 2012 -0500

make the vc2010 redist optional

Change-Id: Ib81f168fa65d7a4affb15ce07f1a49ad1b2df479

diff --git a/oowintool b/oowintool
index fbc647d..087d478 100755
--- a/oowintool
+++ b/oowintool
@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w # -*- tab-width: 4; cperl-indent-level: 4; 
indent-tabs-mode: nil -*-
+#!/usr/bin/perl -w
+# -*- tab-width: 4; cperl-indent-level: 4; indent-tabs-mode: nil -*-
 
 use File::Copy;
 
@@ -40,7 +41,7 @@ sub reg_find_key($)
 sub print_syntax()
 {
 print oowintool [option] ...\n;
-print  encoding options\n;  
+print  encoding options\n;
 print-w   - windows form\n;
 print-u   - unix form (default)\n;
 print  commands:\n;
@@ -69,7 +70,7 @@ sub cygpath($$$)
 $path =~ s|\\*\s*$||;
 }
 
-# 'Unterminated quoted string errors' from 'ash' when 
+# 'Unterminated quoted string errors' from 'ash' when
 # forking cygpath  so - reimplement cygpath in perl [ gack ]
 if ($format eq 'u'  $input_format eq 'w') {
 $path =~ s|\\|/|g;
@@ -206,7 +207,7 @@ sub print_csc_compiler_dir()
 
 sub print_dotnetsdk_dir()
 {
-my $dir = 
+my $dir =
   reg_get_value 
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1) ||
   reg_get_value 
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0);
 if ($dir) {
@@ -222,7 +223,7 @@ sub print_jdk_dir()
   reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ 
Kit/1.5/JavaHome) ||
   reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ 
Kit/1.4/JavaHome) ||
   reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ 
Kit/1.3/JavaHome);
-print cygpath($dir, 'w', $output_format); 
+print cygpath($dir, 'w', $output_format);
 }
 
 sub copy_dll($$$)
@@ -241,11 +242,11 @@ sub msvc_find_version($)
 {
 my $checkpath = shift;
 my $ver = find_msvc();
-my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' . 
+my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
   $ver-{$checkpath});
 -d $srcdir  return $ver;
 $ver = find_msvs();
-$srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' . 
+$srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
   $ver-{$checkpath});
 -d $srcdir  return $ver;
 return undef;
@@ -256,7 +257,7 @@ sub msvc_copy_dlls($)
 my $dest = shift;
 my $ver = msvc_find_version('dll_path');
 defined $ver || return;
-my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' . 
+my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
   $ver-{'dll_path'});
 
 copy_dll ($srcdir, msvcp . $ver-{'dll_suffix'} . .dll,
@@ -280,10 +281,14 @@ sub msvc_copy_msms($$)
 
 my $msm_path = (cygpath reg_get_value 
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir), 
'w', $output_format);
 defined $msm_path || die MSMDir not found;
-foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm, 
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm, 
Microsoft_VC100_CRT_x86$postfix.msm) {
+foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm, 
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm) {
 print STDERR Copying $msm_path/$fname to $dest\n;
 copy ($msm_path/$fname, $dest) || die copy failed: $!;
 }
+foreach $fname (Microsoft_VC100_CRT_x86$postfix.msm) {
+print STDERR Copying $msm_path/$fname to $dest\n;
+copy ($msm_path/$fname, $dest) || print copy failed: $!;
+}
 }
 
 if (!@ARGV) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool scp2/source

[Andras Timar]

 oowintool |2 +-
 scp2/source/ooo/vc_redist.scp |7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8b749cb16dde14b199a61456741b586ddd88a584
Author: Andras Timar ati...@suse.com
Date:   Wed Jul 18 21:52:10 2012 +0200

fdo#50584 bundle MS Visual C++ 2010 Runtime so LO can work with JRE7

Change-Id: If22bed6728121ec66ecd89ad4f869e980aeb79b7

diff --git a/oowintool b/oowintool
index d311750..fbc647d 100755
--- a/oowintool
+++ b/oowintool
@@ -280,7 +280,7 @@ sub msvc_copy_msms($$)
 
 my $msm_path = (cygpath reg_get_value 
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir), 
'w', $output_format);
 defined $msm_path || die MSMDir not found;
-foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm, 
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm) {
+foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm, 
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm, 
Microsoft_VC100_CRT_x86$postfix.msm) {
 print STDERR Copying $msm_path/$fname to $dest\n;
 copy ($msm_path/$fname, $dest) || die copy failed: $!;
 }
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 5ec433c..265a595 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -36,6 +36,13 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
 ComponentCondition = VC_REDIST=1;
 End
 
+MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86
+Feature = gm_Root;
+Name = Microsoft_VC100_CRT_x86.msm;
+RootDir = TARGETDIR;
+ComponentCondition = VC_REDIST=1;
+End
+
 MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
 Feature = gm_Root;
 Name = policy_9_0_Microsoft_VC90_CRT_x86.msm;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

[Eike Rathke]

 oowintool |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 877c96a601e6e50d0c7a8f704d57baec22f089c5
Author: Eike Rathke er...@redhat.com
Date:   Wed May 23 11:20:15 2012 +0200

copy msms only for ver 9.0, MSVC 2010 doesn't have them

diff --git a/oowintool b/oowintool
index 3b8d763..d311750 100755
--- a/oowintool
+++ b/oowintool
@@ -275,6 +275,9 @@ sub msvc_copy_msms($$)
 # $postfix is empty for x86, and '_x64' for x64
 my ($dest, $postfix) = @_;
 
+my $ver = find_msvc();
+(defined $ver  ($ver-{'ver'} eq '9.0')) || return;
+
 my $msm_path = (cygpath reg_get_value 
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir), 
'w', $output_format);
 defined $msm_path || die MSMDir not found;
 foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm, 
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

[Andras Timar]

 oowintool |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 1f9b45377039f5839f8ee4dde265a297ec146062
Author: Andras Timar ati...@suse.com
Date:   Tue Apr 24 09:24:49 2012 +0200

fdo#48259 take MSMDir from registry

diff --git a/oowintool b/oowintool
index 06e6607..3b8d763 100755
--- a/oowintool
+++ b/oowintool
@@ -274,17 +274,9 @@ sub msvc_copy_msms($$)
 {
 # $postfix is empty for x86, and '_x64' for x64
 my ($dest, $postfix) = @_;
-my $common_files_path = $ENV{CommonProgramFiles(x86)};
-if (!defined $common_files_path) {
-$common_files_path = $ENV{CommonProgramFiles};
-if (!defined $common_files_path) {
-$common_files_path = C:\\Program Files\\Common Files;
-}
-}
-
-defined $common_files_path || die Windows CommonProgramFiles not found;
 
-my $msm_path = (cygpath $common_files_path . \\Merge Modules, 'w', 
$output_format);
+my $msm_path = (cygpath reg_get_value 
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir), 
'w', $output_format);
+defined $msm_path || die MSMDir not found;
 foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm, 
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm) {
 print STDERR Copying $msm_path/$fname to $dest\n;
 copy ($msm_path/$fname, $dest) || die copy failed: $!;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

[Fridrich Strba]

 oowintool |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit a75fd2d50e8c0ad82bcd0bbfeafd6a7f0153b7ba
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 22 10:41:44 2012 +0100

Look for properly registered windows sdks instead for random version numbers

diff --git a/oowintool b/oowintool
index ce55e88..06e6607 100755
--- a/oowintool
+++ b/oowintool
@@ -96,15 +96,7 @@ sub print_windows_sdk_home()
 {
 my ($value, $key);
 
-$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v6.1/InstallationFolder');
-
-if (!defined $value) {
-$value = reg_get_value 
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v7.1/InstallationFolder');
-}
-
-if (!defined $value) {
-$value = reg_get_value 
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/CurrentInstallFolder');
-}
+$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/CurrentInstallFolder');
 
 if (!defined $value) {
 $value = reg_get_value 
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

[Caolán McNamara]

 oowintool |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 32781c2d268ed94eb46318a0398385baf31368c4
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 1 16:37:08 2012 +

given that we can build with java7 now, allow it for windows too

diff --git a/oowintool b/oowintool
index 28f16da..7c74ae0 100755
--- a/oowintool
+++ b/oowintool
@@ -227,8 +227,9 @@ sub print_dotnetsdk_dir()
 sub print_jdk_dir()
 {
 my $dir =
+  reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ 
Development\ Kit/1.7/JavaHome) ||
+  reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ 
Development\ Kit/1.6/JavaHome) ||
  reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ 
Development\ Kit/1.5/JavaHome) ||
-  reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ 
Kit/1.6/JavaHome) ||
  reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ 
Development\ Kit/1.4/JavaHome) ||
  reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ 
Development\ Kit/1.3/JavaHome);
 print cygpath($dir, 'w', $output_format); 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool post_download.in

[Jan Holesovsky]

 oowintool|   16 +++-
 post_download.in |   12 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 41e995ec361cd466a3f287d3eb33c0080bdbb50c
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Nov 16 20:59:16 2011 +0100

x64 merge modules are not mandatory, only warn when they are missing.

diff --git a/oowintool b/oowintool
index bf5c5d9..6cb98a3 100755
--- a/oowintool
+++ b/oowintool
@@ -46,7 +46,8 @@ sub print_syntax()
 print  commands:\n;
 print--msvc-ver  - print version of MSVC eg. 6.0\n;
 print--msvc-copy-dlls dest - copy msvc[pr]??.dlls into 
dest/msvcp??/\n;
-print--msvc-copy-msms dest - copy mscrt merge modules  
dest/msm90/\n;
+print--msvc-copy-msms dest - copy mscrt merge modules to 
dest/msm90/\n;
+print--msvc-copy-msms-64 ds- copy the x64 mscrt merge modules to 
ds/msm90/\n;
 print--msvc-productdir   - print productdir\n;
 print--msvs-productdir   - print productdir\n;
 print--dotnetsdk-dir - print .NET SDK path\n;
@@ -285,16 +286,17 @@ sub msvc_copy_dlls($)
 }
 }
 
-sub msvc_copy_msms($)
+sub msvc_copy_msms($$)
 {
-my $dest = shift;
+# $postfix is empty for x86, and '_x64' for x64
+my ($dest, $postfix) = @_;
 my $common_files_path = $ENV{CommonProgramFiles(x86)};
 if (!defined $common_files_path) {
 $common_files_path = $ENV{CommonProgramFiles};
 }
 defined $common_files_path || return;
 my $msm_path = (cygpath $common_files_path . \\Merge Modules, 'w', 
$output_format);
-foreach $fname ('Microsoft_VC90_CRT_x86.msm', 
'Microsoft_VC90_CRT_x86_x64.msm', 'policy_9_0_Microsoft_VC90_CRT_x86.msm', 
'policy_9_0_Microsoft_VC90_CRT_x86_x64.msm') {
+foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm, 
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm) {
print STDERR Copying $msm_path/$fname to $dest\n;
 copy ($msm_path/$fname, $dest) || die copy failed: $!;
 }
@@ -330,7 +332,11 @@ while (@commands) {
 } elsif ($opt eq '--msvc-copy-msms') {
my $dest = shift @commands;
defined $dest || die copy-msms requires a destination directory;
-   msvc_copy_msms( $dest );
+   msvc_copy_msms( $dest, '' );
+} elsif ($opt eq '--msvc-copy-msms-64') {
+   my $dest = shift @commands;
+   defined $dest || die copy-msms-64 requires a destination directory;
+   msvc_copy_msms( $dest, '_x64' );
 } elsif ($opt eq '--msvs-productdir') {
print_msvs_productdir();
 } elsif ($opt eq '--msvc-productdir') {
diff --git a/post_download.in b/post_download.in
index c93cd27..ea6b943 100644
--- a/post_download.in
+++ b/post_download.in
@@ -38,9 +38,7 @@ dnl 
===
 dnl Windows builds - use oowintool to copy CRT dlls and manifest
 dnl ===
 if test $COM = MSC; then
-   if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
-   :
-else
+if ! ./oowintool --msvc-copy-dlls ./external/msvcp ; then
AC_MSG_ERROR([oowintool failed to copy CRT])
 fi
 fi
@@ -49,11 +47,13 @@ dnl 
===
 dnl Windows builds - use oowintool to copy VC redist merge modules
 dnl ===
 if test $COM = MSC; then
-   if ./oowintool --msvc-copy-msms ./external/msm90 ; then
-   :
-else
+if ! ./oowintool --msvc-copy-msms ./external/msm90 ; then
AC_MSG_ERROR([oowintool failed to copy merge modules])
 fi
+if ! ./oowintool --msvc-copy-msms-64 ./external/msm90 ; then
+   AC_MSG_WARN([oowintool failed to copy x64 merge modules, installation
+will lack the 64-bit Explorer extension])
+fi
 fi
 
 dnl ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

[Tor Lillqvist]

 oowintool |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit fd4c879e2ebd5920b48b2e48ac32181565f5ee1b
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Oct 4 23:56:02 2011 +0300

s/dump/print

diff --git a/oowintool b/oowintool
index fc18a8d..bc75736 100755
--- a/oowintool
+++ b/oowintool
@@ -44,16 +44,16 @@ sub print_syntax()
 print-w   - windows form\n;
 print-u   - unix form (default)\n;
 print  commands:\n;
-print--msvc-ver  - dump version of MSVC eg. 6.0\n;
+print--msvc-ver  - print version of MSVC eg. 6.0\n;
 print--msvc-copy-dlls dest - copy msvc[pr]??.dlls into 
dest/msvcp??/\n;
-print--msvc-productdir   - dump productdir\n;
-print--msvs-productdir   - dump productdir\n;
-print--dotnetsdk-dir - dump .NET SDK path\n;
-print--csc-compilerdir   - dump .NET SDK compiler path\n;
-print--windows-sdk-home  - dump Windows SDK install dir\n;
-print--jdk-home  - dump the jdk install dir\n;
-print--nsis-dir  - dump NSIS path\n;
-print--help  - this message\n;
+print--msvc-productdir   - print productdir\n;
+print--msvs-productdir   - print productdir\n;
+print--dotnetsdk-dir - print .NET SDK path\n;
+print--csc-compilerdir   - print .NET SDK compiler path\n;
+print--windows-sdk-home  - print Windows SDK install dir\n;
+print--jdk-home  - print the jdk install dir\n;
+print--nsis-dir  - print NSIS path\n;
+print--help  - print this message\n;
 }
 
 sub cygpath($$$)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits