diff --git a/makefile b/makefile index 5690ba7d..70306f94 100644 --- a/makefile +++ b/makefile @@ -23,6 +23,7 @@ RESTAGENT = restagent CRONTASK = crontask SshSvcBin = sshsvc CapTraceBin = captrace +Data2htmlBin = data2html NBI_ALARM = nbi_alarm NBI_AGENT = nbi_agent 4A_AGENT = 4a_agent @@ -30,6 +31,7 @@ RestagentDir = $(EmsBEDir)/$(RESTAGENT) CrontaskDir = $(EmsBEDir)/$(CRONTASK) SshSvcDir = $(EmsBEDir)/$(SshSvcBin) CapTraceDir = $(EmsBEDir)/$(CapTraceBin) +Data2htmlDir = $(EmsBEDir)/$(Data2htmlBin) DBSQLSrcDir = $(EmsBEDir)/database MiscDir = $(EmsBEDir)/misc FrontBuildDir = $(BuildDir)/omc/htdocs @@ -41,8 +43,8 @@ CrontaskSize = 27788951 RestagentSize = 29525312 BinWriterDir = $(HOME)/bin -.PHONY: all $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) -all: $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) +.PHONY: all $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) $(Data2htmlBin) +all: $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) $(Data2htmlBin) cd $(RestagentDir) go build -o $(RESTAGENT) -v -ldflags "-X 'ems.agt/lib/conifg.Version=$(RelVer)' \ -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)' \ -X '$(LibDir)/conifg.BuildTime=`date`' \ -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: - rm ./restagent/$(RESTAGENT) ./crontask/$(CRONTASK) $(SshSvcDir)/$(SshSvcBin) $(CapTraceDir)/$(CapTraceBin) + rm ./restagent/$(RESTAGENT) ./crontask/$(CRONTASK) $(SshSvcDir)/$(SshSvcBin) $(CapTraceDir)/$(CapTraceBin) $(Data2htmlDir)/$(Data2htmlBin) dist: tar -zvcPf $(ReleaseDir)/$(PROJECT)-src-$(VERSION).tar.gz \ @@ -78,10 +84,11 @@ dist: --exclude=../initems/initems deb: $(BINNAME) - cp -rf ./restagent/$(RESTAGENT) $(BinDir) - cp -rf ./crontask/$(CRONTASK) $(BinDir) + cp -rf $(RestagentDir)/$(RESTAGENT) $(BinDir) + cp -rf $(CrontaskDir)/$(CRONTASK) $(BinDir) cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir) cp -rf $(CapTraceDir)/$(CapTraceBin) $(BinDir) + cp -rf $(Data2htmlDir)/$(Data2htmlBin) $(BinDir) cp -rf $(MiscDir)/* $(BinDir) cp -rf $(ConfigEtcDir)/* $(BuildDir)/omc/etc/ cp -rf $(DBSQLSrcDir)/* $(BuildDir)/omc/etc/db/ @@ -102,10 +109,11 @@ deb: $(BINNAME) dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb rpm: $(BINNAME) - cp -rf ./restagent/$(RESTAGENT) $(BinDir) - cp -rf ./crontask/$(CRONTASK) $(BinDir) + cp -rf $(RestagentDir)/$(RESTAGENT) $(BinDir) + cp -rf $(CrontaskDir)/$(CRONTASK) $(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)/$(CRONTASK) $(CrontaskSize) # cp -rf $(MiscDir)/ne-hosts $(BinDir) diff --git a/mkpkg.sh b/mkpkg.sh index fc81f46c..74b9d41d 100644 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -1,6 +1,6 @@ #!/bin/bash -ProcList="restagent crontask sshsvc captrace" +ProcList="restagent crontask sshsvc captrace data2html" GitLocalRoot=$HOME/local.git EmsBEDir=$GitLocalRoot/ems.agt EmsBuildRoot=$GitLocalRoot/build.ems