OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

modify build

Browse Source
This commit is contained in:
simonzhangsz
2023-08-15 12:00:57 +08:00
parent a7db8510b7
commit d107773f48
3 changed files with 73 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.gitignore vendored
View File

@@ -8,12 +8,25 @@
# Local History for Visual Studio Code # Local History for Visual Studio Code
.history/ .history/
crontask/log
crontask/ftp # Run temp file and dir
crontask/log/
crontask/ftp/
crontask/database/
crontask/export/
crontask/temp
restagent/backup/
restagent/log/
restagent/upload/
restagent/software/
restagent/database/
restagent/restagent
# Built Visual Studio Code Extensions # Built Visual Studio Code Extensions
*.vsix *.vsix
*.log *.log
*.log-* *.log-*
restagent *.bak

91
makefile
View File

@@ -4,51 +4,52 @@ PROJECT = OMC
VERSION = 5GC16.1.1 VERSION = 5GC16.1.1
PLATFORM = amd64 PLATFORM = amd64
ARMPLATFORM = aarch64 ARMPLATFORM = aarch64
GOPROJECTS = $(HOME)/goprojects GitLocalRoot = $(HOME)/local.git
BUILDDIR = $(GOPROJECTS)/build EmsBuildRoot=$GitLocalRoot/build.ems
DEBBUILDDIR = $(GOPROJECTS)/debbuild BuildDir = $(EmsBuildRoot)/build
RPMBUILDDIR = $(GOPROJECTS)/rpmbuild DebBuildDir = $(EmsBuildRoot)/debbuild
INSTALLDIR = /usr/local/omc RpmBuildDir = $(EmsBuildRoot)/rpmbuild
RELEASEDIR = $(GOPROJECTS)/release OmcInstallDir = /usr/local/omc
EMSPROJECT = $(GOPROJECTS)/ems.agt ReleaseDir = $(EmsBuildRoot)/release
LIBDIR = $(EMSPROJECT)/lib EmsBEDir = $(GitLocalRoot)/be.ems
LibDir = $(EmsBEDir)/lib
RESTAGENT = restagent RESTAGENT = restagent
CRONTASK = crontask CRONTASK = crontask
SshSvcBin = sshsvc SshSvcBin = sshsvc
NBI_ALARM = nbi_alarm NBI_ALARM = nbi_alarm
NBI_AGENT = nbi_agent NBI_AGENT = nbi_agent
4A_AGENT = 4a_agent 4A_AGENT = 4a_agent
RESTAGENTDIR = $(EMSPROJECT)/$(RESTAGENT) RestagentDir = $(EmsBEDir)/$(RESTAGENT)
CRONTASKDIR = $(EMSPROJECT)/$(CRONTASK) CrontaskDir = $(EmsBEDir)/$(CRONTASK)
SshSvcDir = $(EMSPROJECT)/$(SshSvcBin) SshSvcDir = $(EmsBEDir)/$(SshSvcBin)
DBSQLSRCDIR = $(EMSPROJECT)/database DBSQLSrcDir = $(EmsBEDir)/database
MISCDIR = $(EMSPROJECT)/misc MiscDir = $(EmsBEDir)/misc
FrontBuildDir = $(BUILDDIR)/omc/htdocs FrontBuildDir = $(BuildDir)/omc/htdocs
FrontSrcDir = $(EMSPROJECT)/front FrontSrcDir = $(EmsBEDir)/front
ReleaseDebs = $(RELEASEDIR)/debs/$(PLATFORM) ReleaseDebs = $(ReleaseDir)/debs/$(PLATFORM)
BinDir = $(BUILDDIR)/omc/bin BinDir = $(BuildDir)/omc/bin
BinDir2 = $(BUILDDIR)/omc/run BinDir2 = $(BuildDir)/omc/run
CrontaskSize = 27788951 CrontaskSize = 27788951
RestagentSize = 29525312 RestagentSize = 29525312
BinWriterDir = $(HOME)/bin BinWriterDir = $(HOME)/bin
.PHONY: all $(RESTAGENT) $(CRONTASK) .PHONY: all $(RESTAGENT) $(CRONTASK)
all: $(RESTAGENT) $(CRONTASK) all: $(RESTAGENT) $(CRONTASK)
cd $(RESTAGENTDIR) cd $(RestagentDir)
go build -o $(RESTAGENT) -v -ldflags "-X 'ems.agt/lib/conifg.Version=$(VERSION)' \ go build -o $(RESTAGENT) -v -ldflags "-X 'ems.agt/lib/conifg.Version=$(VERSION)' \
-X '$(LIBDIR)/conifg.BuildTime=`date`' \ -X '$(LibDir)/conifg.BuildTime=`date`' \
-X '$(LIBDIR)/conifg.GoVer=`go version`'" -X '$(LibDir)/conifg.GoVer=`go version`'"
cd $(CRONTASKDIR) cd $(CrontaskDir)
go build -o $(CRONTASK) -v -ldflags "-X '$(LIBDIR)/conifg.Version=$(VERSION)' \ go build -o $(CRONTASK) -v -ldflags "-X '$(LibDir)/conifg.Version=$(VERSION)' \
-X '$(LIBDIR)/conifg.BuildTime=`date`' \ -X '$(LibDir)/conifg.BuildTime=`date`' \
-X '$(LIBDIR)/conifg.GoVer=`go version`'" -X '$(LibDir)/conifg.GoVer=`go version`'"
clean: clean:
rm ./restagent/$(RESTAGENT) ./crontask/$(CRONTASK) rm ./restagent/$(RESTAGENT) ./crontask/$(CRONTASK)
dist: dist:
tar -zvcPf $(RELEASEDIR)/$(PROJECT)-src-$(VERSION).tar.gz \ tar -zvcPf $(ReleaseDir)/$(PROJECT)-src-$(VERSION).tar.gz \
../lib \ ../lib \
../restagent \ ../restagent \
../crontask \ ../crontask \
@@ -62,19 +63,19 @@ dist:
--exclude=../initems/initems --exclude=../initems/initems
deb: $(BINNAME) deb: $(BINNAME)
cp -rf ./restagent/$(RESTAGENT) $(BUILDDIR)/omc/bin cp -rf ./restagent/$(RESTAGENT) $(BuildDir)/omc/bin
cp -rf ./crontask/$(CRONTASK) $(BUILDDIR)/omc/bin cp -rf ./crontask/$(CRONTASK) $(BuildDir)/omc/bin
cp -rf $(MISCDIR)/* $(BUILDDIR)/omc/bin cp -rf $(MiscDir)/* $(BuildDir)/omc/bin
cp -rf $(DBSQLSRCDIR)/*.sql $(BUILDDIR)/omc/etc/db cp -rf $(DBSQLSrcDir)/*.sql $(BuildDir)/omc/etc/db
rm -rf $(FrontBuildDir)/* rm -rf $(FrontBuildDir)/*
unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null
chmod 755 $(BUILDDIR)/omc/bin/* chmod 755 $(BuildDir)/omc/bin/*
chmod 755 $(DEBBUILDDIR)/DEBIAN/* chmod 755 $(DebBuildDir)/DEBIAN/*
cp -rf $(BUILDDIR)/omc/* $(DEBBUILDDIR)/usr/local/omc/ cp -rf $(BuildDir)/omc/* $(DebBuildDir)/usr/local/omc/
chmod +x $(DEBBUILDDIR)/usr/local/omc/bin/* chmod +x $(DebBuildDir)/usr/local/omc/bin/*
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/
dpkg -b $(DEBBUILDDIR) $(ReleaseDebs)/$(PROJECT)-$(VERSION).$(PLATFORM).deb dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION).$(PLATFORM).deb
rpm: $(BINNAME) rpm: $(BINNAME)
cp -rf ./restagent/$(RESTAGENT) $(BinDir) cp -rf ./restagent/$(RESTAGENT) $(BinDir)
@@ -82,19 +83,19 @@ rpm: $(BINNAME)
cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir2) cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir2)
$(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)
cp -rf ./nbi/$(NBI_ALARM)/bin/$(NBI_ALARM) $(BinDir2) cp -rf ./nbi/$(NBI_ALARM)/bin/$(NBI_ALARM) $(BinDir2)
cp -rf ./nbi/$(NBI_AGENT)/bin/$(NBI_AGENT) $(BinDir2) cp -rf ./nbi/$(NBI_AGENT)/bin/$(NBI_AGENT) $(BinDir2)
cp -rf ./$(4A_AGENT)/bin/$(4A_AGENT) $(BinDir2) cp -rf ./$(4A_AGENT)/bin/$(4A_AGENT) $(BinDir2)
cp -rf $(MISCDIR)/* $(BinDir2) cp -rf $(MiscDir)/* $(BinDir2)
rm -rf $(BinDir2)/ne-hosts rm -rf $(BinDir2)/ne-hosts
cp -rf $(DBSQLSRCDIR)/* $(BUILDDIR)/omc/etc/db cp -rf $(DBSQLSrcDir)/* $(BuildDir)/omc/etc/db
rm -rf $(FrontBuildDir)/* rm -rf $(FrontBuildDir)/*
unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null
chmod 755 $(BinDir)/* chmod 755 $(BinDir)/*
chmod 755 $(BinDir2)/* chmod 755 $(BinDir2)/*
cp -rf $(BUILDDIR)/omc $(RPMBUILDDIR)/BUILD cp -rf $(BuildDir)/omc $(RpmBuildDir)/BUILD
cp -rf $(BUILDDIR)/nginx $(RPMBUILDDIR)/BUILD cp -rf $(BuildDir)/nginx $(RpmBuildDir)/BUILD
cp -rf $(BUILDDIR)/systemd $(RPMBUILDDIR)/BUILD cp -rf $(BuildDir)/systemd $(RpmBuildDir)/BUILD
cd $(RPMBUILDDIR) cd $(RpmBuildDir)
rpmbuild -bb -D "_topdir $(RPMBUILDDIR)" --sign $(RPMBUILDDIR)/SPECS/omc.spec rpmbuild -bb -D "_topdir $(RpmBuildDir)" --sign $(RpmBuildDir)/SPECS/omc.spec

20
mkpkg.sh
View File

@@ -1,12 +1,14 @@
#!/bin/bash #!/bin/bash
ProcList="restagent crontask sshsvc" ProcList="restagent crontask sshsvc"
GoProjectsDir=$HOME/goprojects GitLocalRoot=$HOME/local.git
EmsDir=$GoProjectsDir/ems.agt EmsBEDir=$GitLocalRoot/be.ems
EmsBuildRoot=$GitLocalRoot/build.ems
EmsFEDir=$GitLocalRoot/fe.ems
RpmArch=`arch` RpmArch=`arch`
RpmsDir=$GoProjectsDir/rpmbuild/RPMS/ RpmsDir=$GitLocalRoot/rpmbuild/RPMS/
ReleaseDir=$GoProjectsDir/release ReleaseDir=$GitLocalRoot/release
DumpToolDir=${EmsDir}/tools/misc DumpToolDir=${EmsBEDir}/tools/misc
if [[ $RpmArch =~ "x86_64" ]];then if [[ $RpmArch =~ "x86_64" ]];then
RelArch=amd64 RelArch=amd64
@@ -14,9 +16,9 @@ elif [[ $RpmArch =~ "aarch64" ]];then
RelArch=arm64 RelArch=arm64
fi fi
cd $EmsDir cd $EmsBEDir
for procName in $ProcList;do for procName in $ProcList;do
cd $EmsDir/$procName cd $EmsBEDir/$procName
echo "Make $procName ..." echo "Make $procName ..."
make make
done done
@@ -26,7 +28,7 @@ ${DumpToolDir}/dumpdb.sh
case "$1" in case "$1" in
rpm) rpm)
cd $EmsDir cd $EmsBEDir
make rpm make rpm
cp -f $RpmsDir/$RpmArch/* $ReleaseDir/"$1"s/$RelArch cp -f $RpmsDir/$RpmArch/* $ReleaseDir/"$1"s/$RelArch
cd $ReleaseDir/"$1"s/$RelArch cd $ReleaseDir/"$1"s/$RelArch
@@ -35,7 +37,7 @@ case "$1" in
md5sum *.rpm >omc-md5sum.txt md5sum *.rpm >omc-md5sum.txt
;; ;;
deb) deb)
cd $EmsDir cd $EmsBEDir
make deb make deb
;; ;;
*) *)