diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-05 03:49:36 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-05 05:31:06 +0200 |
| commit | 502390fdb7fbc93e96d33600cf743a928845229e (patch) | |
| tree | 7ca3500e582019bcefed35b8d8cd23c0f4770137 /Makefile.gbuild | |
| parent | b032f21b5ea0011f2b134d758b696604c18dfa16 (diff) | |
updater: workaround cygwin python bug around command line arguments
Without the MAR env setting the python script only gets two command line
arguments, the script name and all the parameters as one string.
If someone knows a better fix I'm open to other suggestions.
Change-Id: I1acc4a74892d657c1c156b8953a5ab8a166aea92
Reviewed-on: https://gerrit.libreoffice.org/40778
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'Makefile.gbuild')
| -rw-r--r-- | Makefile.gbuild | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild index a55bc5ffd4a7..cd7fc973c287 100644 --- a/Makefile.gbuild +++ b/Makefile.gbuild @@ -42,9 +42,10 @@ upload-update-info: $(eval BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H)) $(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH)) $(eval UPDATE_DIR := $(WORKDIR)/update-info) - $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)" - $(SRCDIR)/bin/update/upload_builds.py "$(PRODUCTNAME)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)" - $(SRCDIR)/bin/update/upload_build_config.py "$(UPDATE_DIR)" "$(UPDATE_CONFIG)" + $(eval VERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)) + MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)" + MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/upload_builds.py "$(PRODUCTNAME)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)" + MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/upload_build_config.py "$(UPDATE_DIR)" "$(UPDATE_CONFIG)" create-partial-info: $(eval BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H)) |