Attachment #8154 for issue #17648

View | Details | Raw Unified | Return to issue 17648
Collapse All | Expand All

Lines 1-6 Link Here

(-)prj/d.lst (+3 lines)
1	..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so	1	..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so
		2	..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib
2	..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so	3	..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so
		4	..\%__SRC%\lib\pyuno.dylib %_DEST%\lib%_EXT%\pyuno.dylib
3	..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so	5	..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so
		6	..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib
4	..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\unohelper.py	7	..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\unohelper.py
5	..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pythonloader.py	8	..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pythonloader.py
6	..\%__SRC%\lib\uno.py %_DEST%\lib%_EXT%\uno.py	9	..\%__SRC%\lib\uno.py %_DEST%\lib%_EXT%\uno.py

Lines 129-135 Link Here

(-)source/loader/makefile.mk (+8 lines)
129	$(DLLDEST)$/%.py: %.py	129	$(DLLDEST)$/%.py: %.py
130	+cp $? $@	130	+cp $? $@
131		131
		132	# For Mac OS X,
		133	# The python loader component is linked against libpyuno.dylib,
		134	# which hasn't been delivered yet but dyld needs to know where it is
		135	# so regcomp can load the component.
132	$(DLLDEST)$/pyuno_services.rdb : makefile.mk	136	$(DLLDEST)$/pyuno_services.rdb : makefile.mk
133	-rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb	137	-rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb
		138	.IF "$(OS)"=="MACOSX"
		139	+cd $(DLLDEST) && sh -c "DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(OUT)$/lib;export DYLD_LIBRARY_PATH;regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
		140	.ELSE
134	+cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))	141	+cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))
		142	.ENDIF # $(OS)=="MACOSX"
135	+cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb	143	+cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb

Lines 81-86 Link Here

(-)source/module/makefile.mk (+5 lines)
81	.IF "$(OS)"=="SOLARIS"	81	.IF "$(OS)"=="SOLARIS"
82	PYTHONLIB=-lpython	82	PYTHONLIB=-lpython
83	.ENDIF	83	.ENDIF
		84	.IF "$(OS)"=="MACOSX"
		85	PYTHONLIB=-lpython
		86	.ENDIF
84	.ELSE	87	.ELSE
85	# on windows, the python executable also uses the shared library,	88	# on windows, the python executable also uses the shared library,
86	# so we link pyuno directly to it	89	# so we link pyuno directly to it
Lines 140-145 Link Here
140	ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o	143	ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
141	.ELIF "$(OS)" == "FREEBSD"	144	.ELIF "$(OS)" == "FREEBSD"
142	ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o	145	ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o
		146	.ELIF "$(OS)" == "MACOSX"
		147	$(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
143	.ENDIF	148	.ENDIF
144	.ENDIF	149	.ENDIF
145		150

Lines 29-35 Link Here

(-)zipcore/makefile.mk (-1 / +3 lines)
29		29
30	$(BIN)$/python-core-$(PYVERSION).zip : $(FILES)	30	$(BIN)$/python-core-$(PYVERSION).zip : $(FILES)
31	.IF "$(GUI)" == "UNX"	31	.IF "$(GUI)" == "UNX"
32	cd $(BIN) && find . -name '*.so' \| xargs strip	32	.IF "$(OS)" != "MACOSX"
		33	cd $(BIN) && find . -name '*$(DLLPOST)' \| xargs $(STRIP)
		34	.ENDIF
33	.ENDIF	35	.ENDIF
34	-rm -f $@	36	-rm -f $@
35	+cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME)	37	+cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME)

Lines 111-116 Link Here

(-)zipcore/python.sh (+5 lines)
111	export LD_LIBRARYN32_PATH	111	export LD_LIBRARYN32_PATH
112	;;	112	;;
113		113
		114	darwin*)
		115	DYLD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$DYLD_LIBRARY_PATH
		116	export DYLD_LIBRARY_PATH
		117	;;
		118
114	*)	119	*)
115	LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$LD_LIBRARY_PATH	120	LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$LD_LIBRARY_PATH
116	export LD_LIBRARY_PATH	121	export LD_LIBRARY_PATH

Return to issue 17648