Commit decfeec7 authored by ElenaSubbotina's avatar ElenaSubbotina

Merge branch 'release/v5.0.0' of https://github.com/ONLYOFFICE/core into release/v5.0.0

parents 50f47cae 89cd81ec
......@@ -45,3 +45,6 @@ OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
*.tlb
*.idb
**/.hg
*.zip
*.tar.gz
**/*.build/
PRODUCT_NAME ?= core
PRODUCT_VERSION ?= 0.0.0
BUILD_NUMBER ?= 0
PACKAGE_NAME := $(PRODUCT_NAME)
UNAME_M := $(shell uname -m)
ifeq ($(UNAME_M),x86_64)
ARCHITECTURE := 64
ARCH_SUFFIX := x64
endif
ifneq ($(filter %86,$(UNAME_M)),)
ARCHITECTURE := 32
ARCH_SUFFIX := x86
endif
ifeq ($(OS),Windows_NT)
PLATFORM := win
EXEC_EXT := .exe
SHELL_EXT := .bat
SHARED_EXT := .dll
LIB_EXT := .lib
ARCH_EXT := .zip
MAKE := nmake
ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
ARCHITECTURE := 64
endif
ifeq ($(PROCESSOR_ARCHITECTURE),x86)
ARCHITECTURE := 32
endif
AR := 7z a -y
PACKAGE_VERSION := $(PRODUCT_VERSION).$(BUILD_NUMBER)
ARCH_REPO_DIR := windows
else
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
......@@ -19,14 +32,11 @@ else
SHELL_EXT := .sh
LIB_EXT := .a
LIB_PREFIX := lib
ARCH_EXT := .tar.gz
MAKE := make -j $(shell grep -c ^processor /proc/cpuinfo)
endif
UNAME_M := $(shell uname -m)
ifeq ($(UNAME_M),x86_64)
ARCHITECTURE := 64
endif
ifneq ($(filter %86,$(UNAME_M)),)
ARCHITECTURE := 32
AR := tar -zcvf
PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
ARCH_REPO_DIR := linux
endif
endif
......@@ -229,6 +239,18 @@ PDFREADER_DEP += $(HTMLRENDERER)
PDFWRITER_DEP += $(UNICODECONVERTER)
ARCHIVE := ./$(PACKAGE_NAME)$(ARCH_EXT)
ARTIFACTS += build/*
ARTIFACTS += Common/3dParty/*/$(TARGET)/build/*
ifeq ($(OS),Windows_NT)
ARTIFACTS += Common/3dParty/v8/$(TARGET)/*/*.dll
else
ARTIFACTS += Common/3dParty/v8/$(TARGET)/*.S
endif
#Template for next statment:
#FOO_MAKE := $(basename $(FOO_PRO)).build/Makefile
#$(FOO): $(FOO_MAKE)
......@@ -241,7 +263,7 @@ $$(value $(1)): $$(value $(1)_MAKE)
cd $$(dir $$(value $(1)_MAKE)) && $(MAKE);
endef
.PHONY : all bin lib clean
.PHONY : all bin lib clean deploy
all: lib bin
......@@ -280,11 +302,24 @@ $(OOXMLSIGNATURE): $(OOXMLSIGNATURE_DEP)
%.build/Makefile: %.pro
mkdir -p $(dir $@) && cd $(dir $@) && qmake -r $<
$(ARCHIVE) :
$(AR) $@ $(ARTIFACTS)
clean:
rm -rf $(TARGETS)
rm -rf $(TARGETS) $(ARCHIVE)
for i in $(PROS); do \
if [ -d $$i -a -f $$i/Makefile ]; then \
cd $$i && $(MAKE) distclean; \
fi \
done
deploy: $(ARCHIVE)
aws s3 cp \
$(ARCHIVE) \
s3://repo-doc-onlyoffice-com/$(ARCH_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/$(ARCH_SUFFIX)/ \
--acl public-read
aws s3 sync \
s3://repo-doc-onlyoffice-com/$(ARCH_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/$(ARCH_SUFFIX)/ \
s3://repo-doc-onlyoffice-com/$(ARCH_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/latest/$(ARCH_SUFFIX)/ \
--acl public-read --delete
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment