|
Apache OpenOffice (AOO) Bugzilla – Full Text Issue Listing |
| Summary: | W32-tcsh: Problem with macro $(APPxICON) | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Build Tools | Reporter: | quetschke | ||||||||||
| Component: | code | Assignee: | quetschke | ||||||||||
| Status: | CLOSED FIXED | QA Contact: | issues@tools <issues> | ||||||||||
| Severity: | Trivial | ||||||||||||
| Priority: | P3 | CC: | hans-joachim.lankenau, issues | ||||||||||
| Version: | 644 | ||||||||||||
| Target Milestone: | OOo 1.1 Beta2 | ||||||||||||
| Hardware: | PC | ||||||||||||
| OS: | Windows 2000 | ||||||||||||
| Issue Type: | PATCH | Latest Confirmation in: | --- | ||||||||||
| Developer Difficulty: | --- | ||||||||||||
| Issue Depends on: | |||||||||||||
| Issue Blocks: | 12046 | ||||||||||||
| Attachments: |
|
||||||||||||
Created attachment 4965 [details]
Patch for solenv/bin/guw.pl
Created attachment 4966 [details]
Patch for [_]tg_app.mk
I take this issue Created attachment 4969 [details]
Found entroll.btm, full _tg_app.mk and tg_app.mk
Approval pending added. approved - looks fine to me... waiting for an open cws_srx644_ooo... ... Committed to: cws_srx644_ooo20030412 The following is a fix for my own patch. Replacing tr -s '\' '\\' with sed 'sX\\X\\\\Xg' because tr cannot replace one char with multiple chars. Created attachment 5441 [details]
Patch for _?tg_app.mk
Committed to cws_srx644_ooo20030412. works close Created attachment 74032 |
In setup2/util the makefile fails to create a correct wntmsci7.pro/misc/setup.rc 1. Problem: In the following line in _tg_app.mk @-+guw.pl echo 1 ICON \"$(APP2ICON:s/\//\/\//)\" >> $(MISC)$/$(APP2LINKRES:b).rc -----------------------^^ there are quotes around APPxICON, this is ok, but guw.pl cannot handle this. The following guw.pl.diff teaches guw.pl the quotes. Now the path gets translated to DOS notation, but only with single \. This is not enough, for some reason rc needs \\ double backslashes, see the 4nt part. Btw. the $(APP2ICON:s/\//\/\//) part is wrong, the correct syntax would be: $(APP2ICON:s!/!//!), but the double // are removed by guw.pl anyway. The following tg_app.mk.diff fixes this for me. That is a patch for tg_app.mk and for the APP2ICON part of _tg_app.mk The entroll.btm is missing in the cws_... branches to generate the full _tg_xxx.mk files, and I don't want to change everything by hand. ause: can you please generate a _tg_app.mk for cws_srx644_ooo_20030309 and commit it. Please approve Volker