Apache OpenOffice (AOO) Bugzilla – Issue 71986
More MINGW related changes to guw
Last modified: 2013-08-07 15:34:52 UTC
Some updates are needed for guw. 1. Specifying ccache as a command for ignorepara is no longer needed. 2. Command for -DLOCAL_RULE_LANGS is g++, not gcc (in i18npool/source/collator) 3. Newly required ignorepara's: -DPACKAGE for gcc (in libxmlsec) and -DUPD (in svtools/source/Accessibility), -DMINOR (ditto), -DBUILD_ID (ditto), - DSC_INFO_OSVERSION (in sc/source/core/tool) for g++ --- ooo_src680_m195/config_office/guw/guw.cc.orig 2006-10-25 00:35:01.000000000 +0900 +++ ooo_src680_m195/config_office/guw/guw.cc 2006-11-07 21:48:31.000000000 +0900 @@ -84,10 +84,10 @@ "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", "lib /OUT: -out: -def: -machine:", "link /BASE: /COMMENT: /DEBUG: /DLL /ENTRY:" " /MACHINE: /MAP /NODEFAULTLIB /OPT: /RELEASE" @@ -278,7 +278,7 @@ 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); } -----------------------------------------------------------------------------
OK, but as vg said, I'll wait until mingwinport03 is in. (Even though it's a small fix.)
@vq: As icu build is modified, ono more parameter -DU_MAKE has to be ignored. make[2]: Entering directory `/cygdrive/d/OOo/Local/ooo_src680_m211/icu/wntgcci.pro/misc/build/icu/source/to ols/pkgdata' guw.exe gcc -mno-cygwin -I../../common -I./../toolutil -DU_MAKE=\"make\" - DUDATA_SO_SUFFIX=\".dll\" -DSTATIC_O=\"ao\" -O -D_MT -m32 -mthreads -c -o pkgdata.o pkgdata.c
Created attachment 44766 [details] Updated patch for guw.cc
@vq: mingwport03 has been integrated now, is the patch still valid ?
@tono: is it valid?
@vg: Oh yes, we have been handling guwrelated things in a separate issue and this still is the newest update. tono (Takashi Ono)
I somehow was not CCed anymore and forgot about the patch. Sorry. Patch committed to vq40.
@tono: Please verify.
Confirmed. too (Takashi Ono)
This issue is closed automatically and wasn't rechecked in a current version of OOo. The fixed issue should be integrated in OOo since more than half a year. If you think this issue isn't fixed in a current version (OOo 3.1), please reopen it and change the field 'Target Milestone' accordingly. If you want to download a current version of OOo => http://download.openoffice.org/index.html If you want to know more about the handling of fixed/verified issues => http://wiki.services.openoffice.org/wiki/Handle_fixed_verified_issues