From 80e3fb41fefe7c8cbbba16b0a7a72742225a7921 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Sun, 18 Feb 2024 10:57:51 +0800 Subject: [PATCH] fix: clear index.xxx.js cache file --- makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/makefile b/makefile index 6826124b..2f60de22 100644 --- a/makefile +++ b/makefile @@ -18,8 +18,11 @@ BuildOMCEtcDir = $(BuildOMCDir)/etc BuildLibDir = $(BuildDir)/lib BuildLibSystemDir = $(BuildLibDir)/systemd/system DebBuildDir = $(EmsBuildRoot)/debbuild +DebFEBuildDir = $(EmsBuildRoot)/debbuild/usr/local/omc/htdocs DebBuild2204Dir = $(EmsBuildRoot)/debbuild/22.04 +DebFEBuild2204Dir = $(EmsBuildRoot)/debbuild/22.04/usr/local/omc/htdocs RpmBuildDir = $(EmsBuildRoot)/rpmbuild +RpmFEBuildDir = $(RpmBuildDir)/BUILD/usr/local/omc/htdocs OmcInstallDir = /usr/local/omc ReleaseDir = $(EmsBuildRoot)/release EmsBEDir = $(GitLocalRoot)/ems.agt @@ -51,6 +54,7 @@ RestagentSize = 29525312 BinWriterDir = $(HOME)/bin ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="22.04") DebBuildDir := $(DebBuild2204Dir) +DebFEBuildDir := $(DebFEBuild2204Dir) #DebPkgFile := $(PROJECT)-$(VERSION)-22.04-$(Release).$(PLATFORM).deb DebPkgFile := $(PROJECT)-r$(VERSION)-$(Release)-ub22.deb else ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="18.04") @@ -98,6 +102,11 @@ dist: --exclude=../initems/initems deb: $(BINNAME) + # clear build cache + rm -rf $(FrontBuildDir)/front/* + rm -rf $(DebFEBuildDir)/front/* + rm -rf $(DebBuildDir)/usr/local/omc/etc/db/* + cp -rf $(RestagentDir)/$(RESTAGENT) $(BuildOMCBinDir) cp -rf $(CrontaskDir)/$(CRONTASK) $(BuildOMCBinDir) cp -rf $(SshSvcDir)/$(SshSvcBin) $(BuildOMCBinDir) @@ -108,14 +117,11 @@ deb: $(BINNAME) rm -rf $(BuildOMCEtcDir)/db/* cp -rf $(DBSQLSrcDir)/* $(BuildOMCEtcDir)/db/ cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir) - rm -rf $(FrontBuildDir)/* - mkdir -p $(FrontBuildDir)/front cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null chmod 755 $(BuildOMCBinDir)/* chmod 755 $(DebBuildDir)/DEBIAN/preinst chmod 755 $(DebBuildDir)/DEBIAN/postinst chmod 755 $(DebBuildDir)/DEBIAN/postrm - rm -rf $(DebBuildDir)/usr/local/omc/etc/db/* cp -rf $(BuildDir)/* $(DebBuildDir)/ #cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d #cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ @@ -126,6 +132,11 @@ deb: $(BINNAME) dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(DebPkgFile) rpm: $(BINNAME) + # clear build cache + rm -rf $(FrontBuildDir)/front/* + rm -rf $(RpmFEBuildDir)/front/* + rm -rf $(RpmBuildDir)/BUILD/usr/local/omc/etc/db/* + cp -rf $(RestagentDir)/$(RESTAGENT) $(BuildOMCBinDir) cp -rf $(CrontaskDir)/$(CRONTASK) $(BuildOMCBinDir) cp -rf $(SshSvcDir)/$(SshSvcBin) $(BuildOMCBinDir) @@ -143,13 +154,11 @@ rpm: $(BINNAME) rm -rf $(BuildOMCEtcDir)/db/* cp -rf $(DBSQLSrcDir)/* $(BuildOMCEtcDir)/db/ cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir) - rm -rf $(FrontBuildDir)/* #unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null mkdir -p $(FrontBuildDir)/front cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null chmod 755 $(BuildOMCBinDir)/* # chmod 755 $(BinDir2)/* - rm -rf $(RpmBuildDir)/BUILD/usr/local/omc/etc/db/* cp -rf $(BuildDir)/* $(RpmBuildDir)/BUILD/ #cp -rf $(BuildDir)/nginx $(RpmBuildDir)/BUILD/etc/ #cp -rf $(BuildDir)/systemd $(RpmBuildDir)/BUILD/lib/