diff options
| author | David Tardon <dtardon@redhat.com> | 2013-01-01 12:42:09 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-01-01 13:15:01 +0100 |
| commit | 2e9ec0a8bcb29681c54b16fadf6b47cab6a6b0db (patch) | |
| tree | ccd44b84a1c1f13903a612083966f00900043e4c /pyuno/CustomTarget_python_shell.mk | |
| parent | 085e0adf53baff298059980a54758d81b08bb059 (diff) | |
simplify processing of python.sh
Change-Id: I583407233fad1f7aaccc137642e5f134c3ba2874
Diffstat (limited to 'pyuno/CustomTarget_python_shell.mk')
| -rw-r--r-- | pyuno/CustomTarget_python_shell.mk | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk index feed2e48730a..f4df015b8217 100644 --- a/pyuno/CustomTarget_python_shell.mk +++ b/pyuno/CustomTarget_python_shell.mk @@ -26,23 +26,28 @@ $(eval $(call gb_CustomTarget_CustomTarget,pyuno/python_shell)) -$(call gb_CustomTarget_get_target,pyuno/python_shell) : \ - $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh +$(eval $(call gb_CustomTarget_register_targets,pyuno/python_shell,\ + os.sh \ + python.sh \ +)) ifeq ($(OS),MACOSX) pyuno_PYTHON_SHELL_VERSION:=$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) -pyuno_PYTHON_SHELL_STRIPRULE:=-e '/^NONMACSECTION/,/^MACSECTION/d' else pyuno_PYTHON_SHELL_VERSION:=$(PYTHON_VERSION) -pyuno_PYTHON_SHELL_STRIPRULE:=-e '/^NONMACSECTION/d' -e '/^MACSECTION/,$$d' endif -$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh : $(SRCDIR)/pyuno/zipcore/python.sh | \ - $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/.dir +$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh : \ + $(SRCDIR)/pyuno/zipcore/python.sh \ + $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1) + cat $^ > $@ && chmod +x $@ + +$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \ + $(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) - sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" -e \ - "s/%%OOO_LIBRARY_PATH_VAR%%/$(gb_Helper_LIBRARY_PATH_VAR)/g" \ - $(pyuno_PYTHON_SHELL_STRIPRULE) < $? > $@ - chmod +x $@ + sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \ + -e "s/%%OOO_LIBRARY_PATH_VAR%%/$(gb_Helper_LIBRARY_PATH_VAR)/g" \ + $< > $@ # vim: set noet sw=4 ts=4: |