diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-21 08:17:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-21 08:17:24 +0000 |
| commit | cb071c7ae80b405c1891862691b9fa151fd45f4b (patch) | |
| tree | a55ebf9721f5111aeb842a6b9ff9a91489269207 /config_office/guw | |
| parent | a8d8694fc7bcb6e2ad02e5febdfd6a4ed3edecb0 (diff) | |
INTEGRATION: CWS vq40 (1.3.122); FILE MERGED
2007/09/20 03:09:12 vq 1.3.122.1: #i71986# Patch for guw for MinGW port.
Patch from Takashi Ono.
Diffstat (limited to 'config_office/guw')
| -rw-r--r-- | config_office/guw/guw.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config_office/guw/guw.cc b/config_office/guw/guw.cc index 0045a6ee0371..bd8166bfaecb 100644 --- a/config_office/guw/guw.cc +++ b/config_office/guw/guw.cc @@ -4,9 +4,9 @@ * * $RCSfile: guw.cc,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2006-10-24 15:35:01 $ + * last change: $Author: vg $ $Date: 2007-09-21 09:17:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -84,10 +84,10 @@ const string ignorepara[] = { "echo /TEST", "cl -clr: -Z", "climaker StarOffice/OpenOffice", "csc -target:", - "ccache -DUDATA_SO_SUFFIX -DSTATIC_O" - " -DLOCAL_RULE_LANGS", + "g++ -DLOCAL_RULE_LANGS -DUPD -DMINOR" + " -DBUILD_ID -DSC_INFO_OSVERSION", "gcc -DUDATA_SO_SUFFIX -DSTATIC_O" - " -DLOCAL_RULE_LANGS", + " -DPACKAGE -DU_MAKE", "lib /OUT: -out: -def: -machine:", "link /BASE: /COMMENT: /DEBUG: /DLL /ENTRY:" " /MACHINE: /MAP /NODEFAULTLIB /OPT: /RELEASE" @@ -278,7 +278,7 @@ void init_ignorepara(string fullcommand) { fullcommand.erase(slen-4); // get the program name - Only one subexpression - if (!match2s(fullcommand, "([[:alnum:]_~\\. \\-]+)$", + if (!match2s(fullcommand, "([[:alnum:]_~. +-]+)$", shortcommand, sub2)) { Fatal("No basename found in: " + fullcommand); } |