From 09e12437a89f607f80d6f2799fbafe3e0cada6f7 Mon Sep 17 00:00:00 2001 From: DanyLE Date: Fri, 22 Jul 2022 20:17:47 +0200 Subject: [PATCH] fix ar generation problem: with new version format --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0173300..91017da 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-$(shell git rev-parse --short HEAD) +VERSION=1.2.1-b +BUILDID=$(shell git rev-parse --short HEAD) GSED=sed UNAME_S := $(shell uname -s) @@ -117,7 +118,7 @@ build_javascripts: ts (cat "$${f}"; echo) >> dist/antos.js;\ rm "$${f}";\ done - echo 'OS.VERSION.version_string = "$(VERSION)";' >> dist/antos.js + echo 'OS.VERSION.version_string = "$(VERSION)-$(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