Issue 48816 - Fix on Master for 680m101 for cp1251.pyc breaks builds with system python.
Summary: Fix on Master for 680m101 for cp1251.pyc breaks builds with system python.
Status: CLOSED FIXED
Alias: None
Product: Installation
Classification: Application
Component: code (show other issues)
Version: current
Hardware: All All
: P3 Trivial (vote)
Target Milestone: OOo 2.0
Assignee: hjs
QA Contact: issues@installation
URL:
Keywords:
: 50032 (view as issue list)
Depends on:
Blocks:
 
Reported: 2005-05-06 12:40 UTC by mkretzschmar
Modified: 2005-06-10 10:21 UTC (History)
3 users (show)

See Also:
Issue Type: PATCH
Latest Confirmation in: ---
Developer Difficulty: ---

Attachments
Proposed fix (1.12 KB, patch)
2005-05-06 12:41 UTC, mkretzschmar 		no flags Details | Diff
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description mkretzschmar 2005-05-06 12:40:11 UTC 
If building with SYSTEM_PYTHON="yes", the solver doesn't contain the
solver/680/<whatever>/lib/python directory at all. instsetoo_native/util tries
to copy a file (cp1251.py) from there to a local directory, to prevent a .pyc
file to appear in the solver. This is not necessary with SYSTEM_PYTHON, and fails.

Attaching patch to fix that.
Comment 1 mkretzschmar 2005-05-06 12:41:17 UTC 
Created attachment 25856 [details]
Proposed fix
Comment 2 mkretzschmar 2005-05-06 12:42:14 UTC 
And maybe you want to see the error messages:

/build/openoffice.org/openoffice.org2-1.9.101/ooo-build/build/src680-m101/instsetoo_native/util
-------------
mkdir -p ../unxlngi6.pro/misc/openoffice/msi_templates
mkdir -p ../unxlngi6.pro/misc/ooolangpack/msi_templates
cp -ua ../inc_openoffice/windows/msi_templates ../unxlngi6.pro/misc/openoffice
cp -ua ../inc_ooolangpack/windows/msi_templates ../unxlngi6.pro/misc/ooolangpack
cp -f ../res/nologoinstall.bmp
../unxlngi6.pro/misc/openoffice/msi_templates/Binary/Image.bmp
cp -f ../res/nologoinstall.bmp
../unxlngi6.pro/misc/ooolangpack/msi_templates/Binary/Image.bmp
dmake:  Error --
`/build/openoffice.org/openoffice.org2-1.9.101/ooo-build/build/src680-m101/solver/680/unxlngi6.pro/lib/python/encodings/cp1251.py'
not found, and can't be made
'---* tg_merge.mk *---'

ERROR: Error 65280 occurred while making
/build/openoffice.org/openoffice.org2-1.9.101/ooo-build/build/src680-m101/instsetoo_native/util
Comment 3 Olaf Felka 2005-05-08 11:17:38 UTC 
of @ mh: please have a look.
Comment 4 kyoshida 2005-05-27 13:52:44 UTC 
This one bit me, too... hence I'm in the CC.
Comment 5 pavel 2005-05-30 19:43:16 UTC 
*** Issue 50032 has been marked as a duplicate of this issue. ***
Comment 6 rt 2005-05-31 09:57:46 UTC 
I'll take this one.

Just for curiosity: why does cp1251.py cause problems but LOCALPYFILES not? I'd
guess in case of SYSTEM_PYTHON==YES you do not have
$(SOLARSHAREDBIN)$/pyuno$/%.py either ...
Comment 7 rt 2005-05-31 10:14:46 UTC 
Thanks for your patch. I cannot apply it as it is because adding cp1251.py to
LOCALPYFILES  results in an error (as it is not located at
$(SOLARSHAREDBIN)$/pyuno$/ where all other LOCALPYFILES are). But I'll
conditionalize the rule for cp1251.py similar to what you proposed. See CWS rt10.
Comment 8 rt 2005-05-31 12:55:08 UTC 
Fixed. instsetoo_native/makefile.mk now contains 

.IF "$(SYSTEM_PYTHON)" != "YES"
$(BIN)$/cp1251.py : $(SOLARLIBDIR)$/python$/encodings$/cp1251.py
       @+$(COPY) $< $@
.ELSE
$(BIN)$/cp1251.py : 
       @+echo "Using system python - nothing more to do here"
.ENDIF
Comment 9 rt 2005-06-02 09:17:52 UTC 
please verify

re-open issue and reassign to hjs@openoffice.org
Comment 10 rt 2005-06-02 09:18:03 UTC 
reassign to hjs@openoffice.org
Comment 11 rt 2005-06-02 09:18:08 UTC 
reset resolution to FIXED
Comment 12 hjs 2005-06-02 14:21:35 UTC 
.
Comment 13 hjs 2005-06-10 10:21:35 UTC 
seen on MWS