diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-08-30 12:45:41 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:22 +0200 |
| commit | dd889869c574bc7b257995cad46deb53c6fd7072 (patch) | |
| tree | aa0001d273ddc323326b1c6346c4646a17d7c03f /Makefile.gbuild | |
| parent | 6c85141edadde36974cc589f750e1f194d7e175d (diff) | |
use a few more variables instead of hard coded paths
Change-Id: Ib6882caf0a53bc0961c3b5ceafa9e9410123af52
Diffstat (limited to 'Makefile.gbuild')
| -rw-r--r-- | Makefile.gbuild | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild index a9c4c0c2bcf2..d4d0fb34ba02 100644 --- a/Makefile.gbuild +++ b/Makefile.gbuild @@ -24,18 +24,19 @@ upload-symbols: bin/upload_symbols.py $(WORKDIR)/symbols.zip $(BREAKPAD_SYMBOL_CONFIG) "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)" create-update-info: - rm -rf $(WORKDIR)/mar || true - rm -rf $(WORKDIR)/update-info || true - mkdir -p $(WORKDIR)/update-info $(eval BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H)) $(eval VERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)) $(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH)) $(eval MAR_NAME_PREFIX := $(PRODUCTNAME)_$(VERSION)_$(PLATFORM)_$(BUILDID)) $(eval UPDATE_DIR := $(WORKDIR)/update-info) - $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(UPDATE_CHANNEL)" "$(PLATFORM)" "$(WORKDIR)/update-info" - mkdir -p $(WORKDIR)/mar/current-build - mkdir -p $(WORKDIR)/mar/language - MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_full_mar.py "$(PRODUCTNAME)" "$(WORKDIR)" "$(UPDATE_DIR)" "$(WORKDIR)/mar/current-build/" "$(MAR_NAME_PREFIX)" "$(UPDATE_CERTIFICATE_NAME)" "$(UPDATE_CERTIFICATE_PATH)" - MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_full_mar_for_languages.py "$(PRODUCTNAME)" "$(WORKDIR)" "$(UPDATE_DIR)" "$(WORKDIR)/mar/language" "$(MAR_NAME_PREFIX)" "$(UPDATE_CERTIFICATE_NAME)" "$(UPDATE_CERTIFICATE_PATH)" + $(eval MAR_DIR := $(WORKDIR)/mar) + rm -rf $(MAR_DIR) || true + rm -rf $(UPDATE_DIR) || true + mkdir -p $(UPDATE_DIR) + $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(UPDATE_CHANNEL)" "$(PLATFORM)" "$(UPDATE_DIR)" + mkdir -p $(MAR_DIR)/current-build + mkdir -p $(MAR_DIR)/language + MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_full_mar.py "$(PRODUCTNAME)" "$(WORKDIR)" "$(UPDATE_DIR)" "$(MAR_DIR)/current-build/" "$(MAR_NAME_PREFIX)" "$(UPDATE_CERTIFICATE_NAME)" "$(UPDATE_CERTIFICATE_PATH)" + MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_full_mar_for_languages.py "$(PRODUCTNAME)" "$(WORKDIR)" "$(UPDATE_DIR)" "$(MAR_DIR)/language" "$(MAR_NAME_PREFIX)" "$(UPDATE_CERTIFICATE_NAME)" "$(UPDATE_CERTIFICATE_PATH)" # vim: set noet sw=4 ts=4: |