fix: clear index.xxx.js cache file
This commit is contained in:
19
makefile
19
makefile
@@ -18,8 +18,11 @@ BuildOMCEtcDir = $(BuildOMCDir)/etc
|
|||||||
BuildLibDir = $(BuildDir)/lib
|
BuildLibDir = $(BuildDir)/lib
|
||||||
BuildLibSystemDir = $(BuildLibDir)/systemd/system
|
BuildLibSystemDir = $(BuildLibDir)/systemd/system
|
||||||
DebBuildDir = $(EmsBuildRoot)/debbuild
|
DebBuildDir = $(EmsBuildRoot)/debbuild
|
||||||
|
DebFEBuildDir = $(EmsBuildRoot)/debbuild/usr/local/omc/htdocs
|
||||||
DebBuild2204Dir = $(EmsBuildRoot)/debbuild/22.04
|
DebBuild2204Dir = $(EmsBuildRoot)/debbuild/22.04
|
||||||
|
DebFEBuild2204Dir = $(EmsBuildRoot)/debbuild/22.04/usr/local/omc/htdocs
|
||||||
RpmBuildDir = $(EmsBuildRoot)/rpmbuild
|
RpmBuildDir = $(EmsBuildRoot)/rpmbuild
|
||||||
|
RpmFEBuildDir = $(RpmBuildDir)/BUILD/usr/local/omc/htdocs
|
||||||
OmcInstallDir = /usr/local/omc
|
OmcInstallDir = /usr/local/omc
|
||||||
ReleaseDir = $(EmsBuildRoot)/release
|
ReleaseDir = $(EmsBuildRoot)/release
|
||||||
EmsBEDir = $(GitLocalRoot)/ems.agt
|
EmsBEDir = $(GitLocalRoot)/ems.agt
|
||||||
@@ -51,6 +54,7 @@ RestagentSize = 29525312
|
|||||||
BinWriterDir = $(HOME)/bin
|
BinWriterDir = $(HOME)/bin
|
||||||
ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="22.04")
|
ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="22.04")
|
||||||
DebBuildDir := $(DebBuild2204Dir)
|
DebBuildDir := $(DebBuild2204Dir)
|
||||||
|
DebFEBuildDir := $(DebFEBuild2204Dir)
|
||||||
#DebPkgFile := $(PROJECT)-$(VERSION)-22.04-$(Release).$(PLATFORM).deb
|
#DebPkgFile := $(PROJECT)-$(VERSION)-22.04-$(Release).$(PLATFORM).deb
|
||||||
DebPkgFile := $(PROJECT)-r$(VERSION)-$(Release)-ub22.deb
|
DebPkgFile := $(PROJECT)-r$(VERSION)-$(Release)-ub22.deb
|
||||||
else ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="18.04")
|
else ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="18.04")
|
||||||
@@ -98,6 +102,11 @@ dist:
|
|||||||
--exclude=../initems/initems
|
--exclude=../initems/initems
|
||||||
|
|
||||||
deb: $(BINNAME)
|
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 $(RestagentDir)/$(RESTAGENT) $(BuildOMCBinDir)
|
||||||
cp -rf $(CrontaskDir)/$(CRONTASK) $(BuildOMCBinDir)
|
cp -rf $(CrontaskDir)/$(CRONTASK) $(BuildOMCBinDir)
|
||||||
cp -rf $(SshSvcDir)/$(SshSvcBin) $(BuildOMCBinDir)
|
cp -rf $(SshSvcDir)/$(SshSvcBin) $(BuildOMCBinDir)
|
||||||
@@ -108,14 +117,11 @@ deb: $(BINNAME)
|
|||||||
rm -rf $(BuildOMCEtcDir)/db/*
|
rm -rf $(BuildOMCEtcDir)/db/*
|
||||||
cp -rf $(DBSQLSrcDir)/* $(BuildOMCEtcDir)/db/
|
cp -rf $(DBSQLSrcDir)/* $(BuildOMCEtcDir)/db/
|
||||||
cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir)
|
cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir)
|
||||||
rm -rf $(FrontBuildDir)/*
|
|
||||||
mkdir -p $(FrontBuildDir)/front
|
|
||||||
cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null
|
cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null
|
||||||
chmod 755 $(BuildOMCBinDir)/*
|
chmod 755 $(BuildOMCBinDir)/*
|
||||||
chmod 755 $(DebBuildDir)/DEBIAN/preinst
|
chmod 755 $(DebBuildDir)/DEBIAN/preinst
|
||||||
chmod 755 $(DebBuildDir)/DEBIAN/postinst
|
chmod 755 $(DebBuildDir)/DEBIAN/postinst
|
||||||
chmod 755 $(DebBuildDir)/DEBIAN/postrm
|
chmod 755 $(DebBuildDir)/DEBIAN/postrm
|
||||||
rm -rf $(DebBuildDir)/usr/local/omc/etc/db/*
|
|
||||||
cp -rf $(BuildDir)/* $(DebBuildDir)/
|
cp -rf $(BuildDir)/* $(DebBuildDir)/
|
||||||
#cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d
|
#cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d
|
||||||
#cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/
|
#cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/
|
||||||
@@ -126,6 +132,11 @@ deb: $(BINNAME)
|
|||||||
dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(DebPkgFile)
|
dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(DebPkgFile)
|
||||||
|
|
||||||
rpm: $(BINNAME)
|
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 $(RestagentDir)/$(RESTAGENT) $(BuildOMCBinDir)
|
||||||
cp -rf $(CrontaskDir)/$(CRONTASK) $(BuildOMCBinDir)
|
cp -rf $(CrontaskDir)/$(CRONTASK) $(BuildOMCBinDir)
|
||||||
cp -rf $(SshSvcDir)/$(SshSvcBin) $(BuildOMCBinDir)
|
cp -rf $(SshSvcDir)/$(SshSvcBin) $(BuildOMCBinDir)
|
||||||
@@ -143,13 +154,11 @@ rpm: $(BINNAME)
|
|||||||
rm -rf $(BuildOMCEtcDir)/db/*
|
rm -rf $(BuildOMCEtcDir)/db/*
|
||||||
cp -rf $(DBSQLSrcDir)/* $(BuildOMCEtcDir)/db/
|
cp -rf $(DBSQLSrcDir)/* $(BuildOMCEtcDir)/db/
|
||||||
cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir)
|
cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir)
|
||||||
rm -rf $(FrontBuildDir)/*
|
|
||||||
#unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null
|
#unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null
|
||||||
mkdir -p $(FrontBuildDir)/front
|
mkdir -p $(FrontBuildDir)/front
|
||||||
cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null
|
cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null
|
||||||
chmod 755 $(BuildOMCBinDir)/*
|
chmod 755 $(BuildOMCBinDir)/*
|
||||||
# chmod 755 $(BinDir2)/*
|
# chmod 755 $(BinDir2)/*
|
||||||
rm -rf $(RpmBuildDir)/BUILD/usr/local/omc/etc/db/*
|
|
||||||
cp -rf $(BuildDir)/* $(RpmBuildDir)/BUILD/
|
cp -rf $(BuildDir)/* $(RpmBuildDir)/BUILD/
|
||||||
#cp -rf $(BuildDir)/nginx $(RpmBuildDir)/BUILD/etc/
|
#cp -rf $(BuildDir)/nginx $(RpmBuildDir)/BUILD/etc/
|
||||||
#cp -rf $(BuildDir)/systemd $(RpmBuildDir)/BUILD/lib/
|
#cp -rf $(BuildDir)/systemd $(RpmBuildDir)/BUILD/lib/
|
||||||
|
|||||||
Reference in New Issue
Block a user