From d08b33a0b93fdf4e3203326e150dcf3c65e14a18 Mon Sep 17 00:00:00 2001 From: DanyLE Date: Fri, 22 Jul 2022 20:19:10 +0200 Subject: [PATCH] fix ar generation problem: with new version format --- Makefile | 5 +++-- release/latest | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 91017da..e51fbdc 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,8 @@ TSC=./node_modules/typescript/bin/tsc UGLIFYJS=./node_modules/terser/bin/terser UGLIFYCSS=./node_modules/uglifycss/uglifycss -VERSION=1.2.1-b +VERSION=1.2.1 +BRANCH = b BUILDID=$(shell git rev-parse --short HEAD) GSED=sed @@ -118,7 +119,7 @@ build_javascripts: ts (cat "$${f}"; echo) >> dist/antos.js;\ rm "$${f}";\ done - echo 'OS.VERSION.version_string = "$(VERSION)-$(BUILDID)";' >> dist/antos.js + echo 'OS.VERSION.version_string = "$(VERSION)-$(BRANCH)-$(BUILDID)";' >> dist/antos.js cp dist/antos.js $(BUILDDIR)/scripts/ echo "if(exports){ exports.__esModule = true;exports.OS = OS; }" >> dist/antos.js rm -r dist/core diff --git a/release/latest b/release/latest index 8616007..7d1777f 100644 --- a/release/latest +++ b/release/latest @@ -1 +1 @@ -1.2.1-b-da5bbda \ No newline at end of file +1.2.1-b \ No newline at end of file