diff --git a/win-linux/package/windows/Makefile.mk b/win-linux/package/windows/Makefile.mk index 60649cf5f..0b1db753f 100644 --- a/win-linux/package/windows/Makefile.mk +++ b/win-linux/package/windows/Makefile.mk @@ -27,6 +27,10 @@ VCREDIST += $(VCREDIST13) endif VCREDIST += $(VCREDIST15) +BUILD_TIMESTAMP = $(shell date +%s) +APPCAST := win-linux/package/windows/update/appcast.xml +CHANGES_EN := win-linux/package/windows/update/changes.html +CHANGES_RU := win-linux/package/windows/update/changes_ru.html INDEX_HTML := win-linux/package/windows/index.html ISCC_PARAMS += //Qp @@ -78,9 +82,12 @@ clean-package: $(dir $(DESKTOP_EDITORS_ZIP))*.zip \ $(dir $(DESKTOP_EDITORS_UPDATE))*.exe \ $(VCREDIST) \ + $(APPCAST) \ + $(CHANGES_EN) \ + $(CHANGES_RU) \ $(INDEX_HTML) -deploy: $(PACKAGES) $(INDEX_HTML) +deploy: $(PACKAGES) $(APPCAST) $(CHANGES_EN) $(CHANGES_RU) $(INDEX_HTML) aws s3 cp \ $(DESKTOP_EDITORS_EXE) \ s3://$(S3_BUCKET)/$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/ \ @@ -96,17 +103,48 @@ deploy: $(PACKAGES) $(INDEX_HTML) s3://$(S3_BUCKET)/$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/ \ --acl public-read + aws s3 cp \ + $(APPCAST) \ + s3://$(S3_BUCKET)/$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/update/ \ + --acl public-read + + aws s3 cp \ + $(CHANGES_EN) \ + s3://$(S3_BUCKET)/$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/update/changes/ \ + --acl public-read + + aws s3 cp \ + $(CHANGES_RU) \ + s3://$(S3_BUCKET)/$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/update/changes/ \ + --acl public-read + # aws s3 sync \ # s3://$(S3_BUCKET)/$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/ \ # s3://$(S3_BUCKET)/$(WIN_REPO_DIR)/$(PACKAGE_NAME)/latest/ \ # --acl public-read \ # --delete +M4_PARAMS += -D M4_COMPANY_NAME="$(COMPANY_NAME)" +M4_PARAMS += -D M4_PRODUCT_NAME="$(PRODUCT_NAME)" +M4_PARAMS += -D M4_PACKAGE_VERSION="$(PACKAGE_VERSION)" +M4_PARAMS += -D M4_BUILD_TIMESTAMP="$(shell date +%s)" M4_PARAMS += -D M4_S3_BUCKET=$(S3_BUCKET) M4_PARAMS += -D M4_WIN_ARCH=$(WIN_ARCH) M4_PARAMS += -D M4_EXE_URI="$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/$(notdir $(DESKTOP_EDITORS_EXE))" M4_PARAMS += -D M4_EXE_UPDATE_URI="$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/$(notdir $(DESKTOP_EDITORS_UPDATE))" M4_PARAMS += -D M4_ZIP_URI="$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/$(notdir $(DESKTOP_EDITORS_ZIP))" +M4_PARAMS += -D M4_APPCAST_URI="$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/update/appcast.xml" +M4_PARAMS += -D M4_CHANGES_EN_URI="$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/update/changes/changes.html" +M4_PARAMS += -D M4_CHANGES_RU_URI="$(WIN_REPO_DIR)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/update/changes/changes_ru.html" + +$(APPCAST): + m4 $(M4_PARAMS) $(BRANDING_DIR)/win-linux/package/windows/update/appcast.xml.m4 > $@ + +$(CHANGES_EN): L10N=en +$(CHANGES_RU): L10N=ru + +$(CHANGES_EN) $(CHANGES_RU): + m4 $(M4_PARAMS) -D L10N="$(L10N)" $(BRANDING_DIR)/win-linux/package/windows/update/changes.html.m4 > $@ % : %.m4 m4 $(M4_PARAMS) $< > $@ diff --git a/win-linux/package/windows/index.html.m4 b/win-linux/package/windows/index.html.m4 index 393a63888..43c25261c 100644 --- a/win-linux/package/windows/index.html.m4 +++ b/win-linux/package/windows/index.html.m4 @@ -24,5 +24,20 @@ ifdef(`M4_ZIP_XP_URI', `
Win XP M4_WIN_ARCH-bit archive zip
',) + +ifdef(`M4_APPCAST_URI', +`+ Appcast +
',) + +ifdef(`M4_CHANGES_EN_URI', +`+ Changes EN +
',) + +ifdef(`M4_CHANGES_RU_URI', +`+ Changes RU +
',)