On 06/11/2012 12:17 AM, David Ostrovsky wrote:
Still have to test it on Windows and ask somebody to test it in MacosX.
Quick update: Attached windows.patch allowed me to at least build
<https://gerrit.libreoffice.org/#/c/179/11> on Windows (on top of recent
master). "Tools - Macros - Organize Macros - Python... - LOdev Macros -
HelloWord - HelloWOrdPython - Run" within Writer works, but executing
...\program\python.exe does nothing.
Stephan
diff --git a/Repository.mk b/Repository.mk
old mode 100644
new mode 100755
index 6215bd8..4595421
--- a/Repository.mk
+++ b/Repository.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\
odbcconfig \
officeloader \
python \
+ python_wrapper \
quickstart \
sbase \
scalc \
diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk
old mode 100644
new mode 100755
index 0544d99..ba22084
--- a/pyuno/CustomTarget_zipcore.mk
+++ b/pyuno/CustomTarget_zipcore.mk
@@ -42,6 +42,6 @@ pyuno_zipcore_FINDLIBFILES:=\
$(call gb_CustomTarget_get_workdir,pyuno/zipcore)/$(pyuno_PYTHON_ARCHIVE_NAME) : $(pyuno_zipcore_FINDLIBFILES) | \
$(call gb_CustomTarget_get_workdir,pyuno/zipcore)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ZIP,1)
- cd $(OUTDIR)/lib/python && zip $@ $(shell $(FIND) . -type f | $(GREP) -v "\.pyc" | $(GREP) -v "\.py~" | $(GREP) -v .orig | $(GREP) -v _failed)
+ cd $(OUTDIR)/lib/python && zip $@ $(shell cd $(OUTDIR)/lib/python && $(FIND) . -type f | $(GREP) -v "\.pyc" | $(GREP) -v "\.py~" | $(GREP) -v .orig | $(GREP) -v _failed)
# vim: set noet sw=4 ts=4:
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
