Makefile.gbuild | 5 +++++
Makefile.in | 3 +++
2 files changed, 8 insertions(+)
New commits:
commit 0cba580ac82eb0edd6c54c22b890eb09f9c50029
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Nov 28 01:04:17 2016 +0100
separate creation and upload of the update info
Change-Id: I809866f0425b8e85b396692f60c936351aca39ad
diff --git a/Makefile.gbuild b/Makefile.gbuild
index 140a6d7..6d625bb 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -38,6 +38,11 @@ create-update-info:
MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_full_mar.py
"$(PRODUCTNAME)" "$(WORKDIR)" "$(UPDATE_DIR)" "$(MAR_DIR)/current-build/"
"$(MAR_NAME_PREFIX)" "$(UPDATE_CONFIG)"
MAR=$(INSTDIR)/program/mar
$(SRCDIR)/bin/update/create_full_mar_for_languages.py "$(PRODUCTNAME)"
"$(WORKDIR)" "$(UPDATE_DIR)" "$(MAR_DIR)/language" "$(MAR_NAME_PREFIX)"
"$(UPDATE_CONFIG)"
$(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)"
"$(VERSION)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)"
"$(UPDATE_CONFIG)"
+
+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/upload_builds.py "$(PRODUCTNAME)" "$(BUILDID)"
"$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)"
$(SRCDIR)/bin/update/upload_build_config.py "$(UPDATE_DIR)"
"$(UPDATE_CONFIG)"
diff --git a/Makefile.in b/Makefile.in
index 6f2c819..ec48644 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -414,6 +414,9 @@ upload-symbols:
create-update-info:
$(MAKE) -f $(SRCDIR)/Makefile.gbuild create-update-info
+upload-update-info:
+ $(MAKE) -f $(SRCDIR)/Makefile.gbuild upload-update-info
+
dump-deps:
@$(SRCDIR)/bin/module-deps.pl $(MAKE) $(SRCDIR)/Makefile.gbuild
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
