Skip to content

Commit 23a65b1

Browse files
heatrayheatray
authored
Revert makefile (#151)
* Revert makefile * Fix verbose
1 parent 1052c3e commit 23a65b1

File tree

1 file changed

+31
-125
lines changed

1 file changed

+31
-125
lines changed

‎Makefile

Lines changed: 31 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ SUPPORT_MAIL ?= [email protected]
1818
PRODUCT_VERSION ?= 0.0.0
1919
BUILD_NUMBER ?= 0
2020

21+
S3_BUCKET ?= repo-doc-onlyoffice-com
22+
RELEASE_BRANCH ?= unstable
23+
2124
BRANDING_DIR ?= ./branding
2225

2326
PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)
@@ -29,58 +32,31 @@ DEB_ARCH = amd64
2932
APT_RPM_BUILD_DIR = $(PWD)/apt-rpm/builddir
3033
RPM_BUILD_DIR = $(PWD)/rpm/builddir
3134
DEB_BUILD_DIR = $(PWD)
32-
EXE_BUILD_DIR = $(PWD)/exe
35+
EXE_BUILD_DIR = exe
3336

3437
APT_RPM_PACKAGE_DIR = $(APT_RPM_BUILD_DIR)/RPMS/$(RPM_ARCH)
3538
RPM_PACKAGE_DIR = $(RPM_BUILD_DIR)/RPMS/$(RPM_ARCH)
3639
DEB_PACKAGE_DIR = $(DEB_BUILD_DIR)
3740
TAR_PACKAGE_DIR = $(PWD)
3841

39-
TAR_REPO := repo-tar
40-
TAR_REPO_DATA := $(TAR_REPO)/$(PACKAGE_NAME)-$(PRODUCT_VERSION).$(BUILD_NUMBER).tar.gz
41-
TAR_REPO_DIR = tar
42-
43-
DEB_REPO := $(PWD)/repo
44-
DEB_REPO_DATA := $(DEB_REPO)/Packages.gz
45-
46-
APT_RPM_REPO := $(PWD)/repo-apt-rpm
47-
APT_RPM_REPO_DATA := $(APT_RPM_REPO)/repodata
48-
49-
RPM_REPO := $(PWD)/repo-rpm
50-
RPM_REPO_DATA := $(RPM_REPO)/repodata
51-
52-
EXE_REPO := repo-exe
53-
EXE_REPO_DATA := $(EXE_REPO)/$(PACKAGE_NAME)-$(PRODUCT_VERSION).$(BUILD_NUMBER).exe
54-
55-
APT_RPM_REPO_OS_NAME = ALTLinux
56-
APT_RPM_REPO_OS_VER = p8
57-
APT_RPM_REPO_DIR = $(APT_RPM_REPO_OS_NAME)/$(APT_RPM_REPO_OS_VER)
58-
59-
RPM_REPO_OS_NAME = centos
60-
RPM_REPO_OS_VER = 7
61-
RPM_REPO_DIR = $(RPM_REPO_OS_NAME)/$(RPM_REPO_OS_VER)
62-
63-
DEB_REPO_OS_NAME = ubuntu
64-
DEB_REPO_OS_VER = trusty
65-
DEB_REPO_DIR = $(DEB_REPO_OS_NAME)/$(DEB_REPO_OS_VER)
66-
67-
EXE_REPO_DIR = windows
68-
6942
APT_RPM = $(APT_RPM_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION).$(RPM_ARCH).rpm
7043
RPM = $(RPM_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION).$(RPM_ARCH).rpm
7144
DEB = $(DEB_PACKAGE_DIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(DEB_ARCH).deb
7245
EXE = $(EXE_BUILD_DIR)/$(PACKAGE_NAME)-$(PRODUCT_VERSION).$(BUILD_NUMBER).exe
7346
TAR = $(TAR_PACKAGE_DIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION).tar.gz
7447

48+
EXE_URI := $(COMPANY_NAME_LOW)/$(RELEASE_BRANCH)/windows/$(notdir $(EXE))
49+
DEB_URI := $(COMPANY_NAME_LOW)/$(RELEASE_BRANCH)/ubuntu/$(notdir $(DEB))
50+
RPM_URI := $(COMPANY_NAME_LOW)/$(RELEASE_BRANCH)/centos/$(notdir $(RPM))
51+
TAR_URI := $(COMPANY_NAME_LOW)/$(RELEASE_BRANCH)/linux/$(notdir $(TAR))
52+
APT_RPM_URI := $(COMPANY_NAME_LOW)/$(RELEASE_BRANCH)/altlinux/$(notdir $(APT_RPM))
53+
7554
DOCUMENTSERVER = common/documentserver/home
7655
DOCUMENTSERVER_BIN = common/documentserver/bin
7756
DOCUMENTSERVER_CONFIG = common/documentserver/config
78-
DOCUMENTSERVER_FILES += $(DOCUMENTSERVER)/core-fonts
79-
DOCUMENTSERVER_FILES += $(DOCUMENTSERVER)/license
8057
DOCUMENTSERVER_FILES += $(DOCUMENTSERVER)/web-apps
8158
DOCUMENTSERVER_FILES += $(DOCUMENTSERVER)/server
8259
DOCUMENTSERVER_FILES += $(DOCUMENTSERVER)/sdkjs
83-
DOCUMENTSERVER_FILES += $(DOCUMENTSERVER)/sdkjs-plugins
8460

8561
3RD_PARTY_LICENSE_FILES += $(DOCUMENTSERVER)/server/LICENSE.txt
8662
3RD_PARTY_LICENSE_FILES += $(DOCUMENTSERVER)/server/3rd-Party.txt
@@ -136,7 +112,7 @@ ifeq ($(OS),Windows_NT)
136112
SHARED_EXT := .dll
137113
ARCH_EXT := .zip
138114
AR := 7z a -y
139-
DEPLOY := $(EXE_REPO_DATA)
115+
DEPLOY = deploy-exe
140116
NGINX_CONF := includes
141117
NGINX_LOG := logs
142118
DS_ROOT := ..
@@ -157,7 +133,7 @@ else
157133
SHELL_EXT := .sh
158134
ARCH_EXT := .zip
159135
AR := 7z a -y
160-
DEPLOY := $(APT_RPM_REPO_DATA) $(RPM_REPO_DATA) $(DEB_REPO_DATA) $(TAR_REPO_DATA)
136+
DEPLOY = deploy-deb deploy-rpm deploy-tar deploy-apt-rpm
161137
DS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)
162138
NGINX_CONF := /etc/nginx/includes
163139
NGINX_LOG := /var/log/$(DS_PREFIX)
@@ -194,7 +170,7 @@ DS_BIN_REPO := ./ds-repo
194170
DS_BIN := ./$(TARGET)/ds-bin-$(PRODUCT_VERSION)$(ARCH_EXT)
195171

196172
ifeq ($(PRODUCT_NAME),$(filter $(PRODUCT_NAME),documentserver-ee documentserver-ie))
197-
DEPLOY += $(DS_BIN_REPO)
173+
DEPLOY += deploy-bin
198174
endif
199175

200176
ISCC := iscc
@@ -219,7 +195,6 @@ DEB_DEPS += deb/debian/$(PACKAGE_NAME).links
219195
COMMON_DEPS += common/documentserver/nginx/includes/ds-common.conf
220196
COMMON_DEPS += common/documentserver/nginx/includes/ds-docservice.conf
221197
COMMON_DEPS += common/documentserver/nginx/includes/ds-spellchecker.conf
222-
COMMON_DEPS += common/documentserver/nginx/includes/ds-letsencrypt.conf
223198
COMMON_DEPS += common/documentserver/nginx/includes/http-common.conf
224199
COMMON_DEPS += common/documentserver/nginx/ds-ssl.conf.tmpl
225200
COMMON_DEPS += common/documentserver/nginx/ds.conf.tmpl
@@ -310,9 +285,6 @@ clean:
310285
$(ISXDL)\
311286
$(NGINX)\
312287
$(NSSM)\
313-
$(DEB_REPO)\
314-
$(RPM_REPO)\
315-
$(EXE_REPO)\
316288
$(DS_BIN_REPO)\
317289
$(DOCUMENTSERVER_FILES)\
318290
$(DOCUMENTSERVER_EXAMPLE)\
@@ -513,98 +485,32 @@ $(NSSM):
513485
7z x -y -o$(DOCUMENTSERVER)/nssm $(NSSM_ZIP) && \
514486
rm -f $(NSSM_ZIP)
515487

516-
$(RPM_REPO_DATA): $(RPM)
517-
rm -rfv $(RPM_REPO)
518-
mkdir -p $(RPM_REPO)
519-
520-
cp -rv $(RPM) $(RPM_REPO);
521-
createrepo -v $(RPM_REPO);
522-
523-
aws s3 sync \
524-
$(RPM_REPO) \
525-
s3://repo-doc-onlyoffice-com/$(RPM_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ \
526-
--acl public-read --delete --no-progress
527-
528-
aws s3 sync \
529-
s3://repo-doc-onlyoffice-com/$(RPM_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ \
530-
s3://repo-doc-onlyoffice-com/$(RPM_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/latest/ \
531-
--acl public-read --delete --no-progress
532-
533-
$(APT_RPM_REPO_DATA): $(APT_RPM)
534-
rm -rfv $(APT_RPM_REPO)
535-
mkdir -p $(APT_RPM_REPO)
536-
537-
cp -rv $(APT_RPM) $(APT_RPM_REPO);
538-
#createrepo -v $(APT_RPM_REPO);
539-
540-
aws s3 sync \
541-
$(APT_RPM_REPO) \
542-
s3://repo-doc-onlyoffice-com/$(APT_RPM_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ \
543-
--acl public-read --delete --no-progress
544-
545-
aws s3 sync \
546-
s3://repo-doc-onlyoffice-com/$(APT_RPM_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ \
547-
s3://repo-doc-onlyoffice-com/$(APT_RPM_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/latest/ \
548-
--acl public-read --delete --no-progress
549-
550-
$(DEB_REPO_DATA): $(DEB)
551-
rm -rfv $(DEB_REPO)
552-
mkdir -p $(DEB_REPO)
553-
554-
cp -rv $(DEB) $(DEB_REPO);
555-
dpkg-scanpackages -m repo /dev/null | gzip -9c > $(DEB_REPO_DATA)
556-
557-
aws s3 sync \
558-
$(DEB_REPO) \
559-
s3://repo-doc-onlyoffice-com/$(DEB_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/repo \
560-
--acl public-read --delete --no-progress
561-
562-
aws s3 sync \
563-
s3://repo-doc-onlyoffice-com/$(DEB_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/repo \
564-
s3://repo-doc-onlyoffice-com/$(DEB_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/latest/repo \
565-
--acl public-read --delete --no-progress
566-
567-
$(EXE_REPO_DATA): $(EXE)
568-
rm -rfv $(EXE_REPO)
569-
mkdir -p $(EXE_REPO)
570-
571-
cp -rv $(EXE) $(EXE_REPO);
572-
573-
aws s3 sync \
574-
$(EXE_REPO) \
575-
s3://repo-doc-onlyoffice-com/$(EXE_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ \
576-
--acl public-read --delete --no-progress
577-
578-
aws s3 sync \
579-
s3://repo-doc-onlyoffice-com/$(EXE_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ \
580-
s3://repo-doc-onlyoffice-com/$(EXE_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/latest/ \
581-
--acl public-read --delete --no-progress
582-
583-
$(TAR_REPO_DATA): $(TAR)
584-
rm -rfv $(TAR_REPO)
585-
mkdir -p $(TAR_REPO)
488+
deploy-rpm: $(RPM)
489+
aws s3 cp --no-progress --acl public-read \
490+
$(RPM) s3://$(S3_BUCKET)/$(RPM_URI)
586491

587-
cp -rv $(TAR) $(TAR_REPO);
492+
deploy-apt-rpm: $(APT_RPM)
493+
aws s3 cp --no-progress --acl public-read \
494+
$(APT_RPM) s3://$(S3_BUCKET)/$(APT_RPM_URI)
588495

589-
aws s3 sync \
590-
$(TAR_REPO) \
591-
s3://repo-doc-onlyoffice-com/$(TAR_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ \
592-
--acl public-read --delete --no-progress
496+
deploy-deb: $(DEB)
497+
aws s3 cp --no-progress --acl public-read \
498+
$(DEB) s3://$(S3_BUCKET)/$(DEB_URI)
593499

594-
aws s3 sync \
595-
s3://repo-doc-onlyoffice-com/$(TAR_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ \
596-
s3://repo-doc-onlyoffice-com/$(TAR_REPO_DIR)/$(PACKAGE_NAME)/$(GIT_BRANCH)/latest/ \
597-
--acl public-read --delete --no-progress
500+
deploy-exe: $(EXE)
501+
aws s3 cp --no-progress --acl public-read \
502+
$(EXE) s3://$(S3_BUCKET)/$(EXE_URI)
598503

599-
deploy-bin: $(DS_BIN_REPO)
504+
deploy-tar: $(TAR)
505+
aws s3 cp --no-progress --acl public-read \
506+
$(TAR) s3://$(S3_BUCKET)/$(TAR_URI)
600507

601-
$(DS_BIN_REPO): $(DS_BIN)
508+
deploy-bin: $(DS_BIN)
602509
mkdir -p $(DS_BIN_REPO)
603510
cp -rv $(dir $(DS_BIN)) $(DS_BIN_REPO)
604-
aws s3 sync \
511+
aws s3 sync --no-progress --acl public-read \
605512
$(DS_BIN_REPO) \
606-
s3://repo-doc-onlyoffice-com/$(PLATFORM)/ds-bin/$(GIT_BRANCH)/$(PRODUCT_VERSION)/ \
607-
--acl public-read --no-progress
513+
s3://$(S3_BUCKET)/$(PLATFORM)/ds-bin/$(GIT_BRANCH)/$(PRODUCT_VERSION)/
608514

609515
$(DEPLOY_JSON):
610516
echo '{}' > $@

0 commit comments

Comments
 (0)