On 06/13/2012 08:52 AM, Stephan Bergmann wrote:
On 06/12/2012 11:37 PM, David Ostrovsky wrote:
May I ask somebody to check this gerrit-patch on MacOsX? Or may be it
would be simplier to send a file-patch or create a feature branch?
Just let me know.
For the record, I'm currently looking into the gerrit patch on Mac.
...and attached mac.patch allowed me to build
<https://gerrit.libreoffice.org/#/c/179/11> on Mac OS X (on top of
recent master; on Mac OS X 10.7 with Xcode 4 with the script I posted
recently). Both "Tools - Macros - Organize Macros - Python... - LOdev
Macros - HelloWord - HelloWOrdPython - Run" within Writer and
LibreOffice.app/Contents/MacOS/python -c 'import uno' work.
Stephan
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dc9cf8c..bbc9712 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1631,6 +1631,10 @@ ifeq ($(OS),WNT)
$(call gb_LinkTarget_add_libs,$(1),\
python26.lib \
)
+else ifeq ($(OS),MACOSX)
+$(call gb_LinkTarget_add_libs,$(1),\
+ -F $(OUTDIR)/lib -framework OOoPython \
+)
else
$(call gb_LinkTarget_use_libraries,$(1),\
python2.6 \
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 315a8ab..0f15ac5 100755
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -53,16 +53,20 @@ endif
# zipcore: python.sh on Unix
-ifeq ($(GUI),UNX)
ifneq ($(SYSTEM_PYTHON),YES)
+ifeq ($(GUI),UNX)
$(eval $(call gb_Module_add_targets,pyuno,\
CustomTarget_python_shell \
Package_python_shell \
+))
+ifneq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,pyuno,\
CustomTarget_python_bin \
Package_python_bin \
))
endif
endif
+endif
# python-zipcore-$(PYVESION) not on MACOSX
# (OOoPython.framework.zip is already delivered for MACOSX in python module)
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
