This commit is contained in:
2023-09-16 11:31:15 +08:00
parent fe11771358
commit 713816e4c0
2 changed files with 17 additions and 9 deletions

View File

@@ -23,6 +23,7 @@ RESTAGENT = restagent
CRONTASK = crontask CRONTASK = crontask
SshSvcBin = sshsvc SshSvcBin = sshsvc
CapTraceBin = captrace CapTraceBin = captrace
Data2htmlBin = data2html
NBI_ALARM = nbi_alarm NBI_ALARM = nbi_alarm
NBI_AGENT = nbi_agent NBI_AGENT = nbi_agent
4A_AGENT = 4a_agent 4A_AGENT = 4a_agent
@@ -30,6 +31,7 @@ RestagentDir = $(EmsBEDir)/$(RESTAGENT)
CrontaskDir = $(EmsBEDir)/$(CRONTASK) CrontaskDir = $(EmsBEDir)/$(CRONTASK)
SshSvcDir = $(EmsBEDir)/$(SshSvcBin) SshSvcDir = $(EmsBEDir)/$(SshSvcBin)
CapTraceDir = $(EmsBEDir)/$(CapTraceBin) CapTraceDir = $(EmsBEDir)/$(CapTraceBin)
Data2htmlDir = $(EmsBEDir)/$(Data2htmlBin)
DBSQLSrcDir = $(EmsBEDir)/database DBSQLSrcDir = $(EmsBEDir)/database
MiscDir = $(EmsBEDir)/misc MiscDir = $(EmsBEDir)/misc
FrontBuildDir = $(BuildDir)/omc/htdocs FrontBuildDir = $(BuildDir)/omc/htdocs
@@ -41,8 +43,8 @@ CrontaskSize = 27788951
RestagentSize = 29525312 RestagentSize = 29525312
BinWriterDir = $(HOME)/bin BinWriterDir = $(HOME)/bin
.PHONY: all $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) .PHONY: all $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) $(Data2htmlBin)
all: $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) all: $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) $(Data2htmlBin)
cd $(RestagentDir) cd $(RestagentDir)
go build -o $(RESTAGENT) -v -ldflags "-X 'ems.agt/lib/conifg.Version=$(RelVer)' \ go build -o $(RESTAGENT) -v -ldflags "-X 'ems.agt/lib/conifg.Version=$(RelVer)' \
-X '$(LibDir)/conifg.BuildTime=`date`' \ -X '$(LibDir)/conifg.BuildTime=`date`' \
@@ -59,9 +61,13 @@ all: $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin)
go build -o $(CapTraceBin) -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \ go build -o $(CapTraceBin) -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \
-X '$(LibDir)/conifg.BuildTime=`date`' \ -X '$(LibDir)/conifg.BuildTime=`date`' \
-X '$(LibDir)/conifg.GoVer=`go version`'" -X '$(LibDir)/conifg.GoVer=`go version`'"
cd $(Data2htmlDir)
go build -o $(Data2htmlBin) -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \
-X '$(LibDir)/conifg.BuildTime=`date`' \
-X '$(LibDir)/conifg.GoVer=`go version`'"
clean: clean:
rm ./restagent/$(RESTAGENT) ./crontask/$(CRONTASK) $(SshSvcDir)/$(SshSvcBin) $(CapTraceDir)/$(CapTraceBin) rm ./restagent/$(RESTAGENT) ./crontask/$(CRONTASK) $(SshSvcDir)/$(SshSvcBin) $(CapTraceDir)/$(CapTraceBin) $(Data2htmlDir)/$(Data2htmlBin)
dist: dist:
tar -zvcPf $(ReleaseDir)/$(PROJECT)-src-$(VERSION).tar.gz \ tar -zvcPf $(ReleaseDir)/$(PROJECT)-src-$(VERSION).tar.gz \
@@ -78,10 +84,11 @@ dist:
--exclude=../initems/initems --exclude=../initems/initems
deb: $(BINNAME) deb: $(BINNAME)
cp -rf ./restagent/$(RESTAGENT) $(BinDir) cp -rf $(RestagentDir)/$(RESTAGENT) $(BinDir)
cp -rf ./crontask/$(CRONTASK) $(BinDir) cp -rf $(CrontaskDir)/$(CRONTASK) $(BinDir)
cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir) cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir)
cp -rf $(CapTraceDir)/$(CapTraceBin) $(BinDir) cp -rf $(CapTraceDir)/$(CapTraceBin) $(BinDir)
cp -rf $(Data2htmlDir)/$(Data2htmlBin) $(BinDir)
cp -rf $(MiscDir)/* $(BinDir) cp -rf $(MiscDir)/* $(BinDir)
cp -rf $(ConfigEtcDir)/* $(BuildDir)/omc/etc/ cp -rf $(ConfigEtcDir)/* $(BuildDir)/omc/etc/
cp -rf $(DBSQLSrcDir)/* $(BuildDir)/omc/etc/db/ cp -rf $(DBSQLSrcDir)/* $(BuildDir)/omc/etc/db/
@@ -102,10 +109,11 @@ deb: $(BINNAME)
dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb
rpm: $(BINNAME) rpm: $(BINNAME)
cp -rf ./restagent/$(RESTAGENT) $(BinDir) cp -rf $(RestagentDir)/$(RESTAGENT) $(BinDir)
cp -rf ./crontask/$(CRONTASK) $(BinDir) cp -rf $(CrontaskDir)/$(CRONTASK) $(BinDir)
cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir) cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir)
cp -rf $(CapTraceDir)/$(CapTraceBin) $(BinDir) cp -rf $(CapTraceDir)/$(CapTraceBin) $(BinDir)
cp -rf $(Data2htmlDir)/$(Data2htmlBin) $(BinDir)
# $(BinWriterDir)/binWriter $(BinDir)/$(RESTAGENT) $(RestagentSize) # $(BinWriterDir)/binWriter $(BinDir)/$(RESTAGENT) $(RestagentSize)
# $(BinWriterDir)/binWriter $(BinDir)/$(CRONTASK) $(CrontaskSize) # $(BinWriterDir)/binWriter $(BinDir)/$(CRONTASK) $(CrontaskSize)
# cp -rf $(MiscDir)/ne-hosts $(BinDir) # cp -rf $(MiscDir)/ne-hosts $(BinDir)

View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
ProcList="restagent crontask sshsvc captrace" ProcList="restagent crontask sshsvc captrace data2html"
GitLocalRoot=$HOME/local.git GitLocalRoot=$HOME/local.git
EmsBEDir=$GitLocalRoot/ems.agt EmsBEDir=$GitLocalRoot/ems.agt
EmsBuildRoot=$GitLocalRoot/build.ems EmsBuildRoot=$GitLocalRoot/build.ems