modify build

2023-08-15 12:00:57 +08:00
parent a7db8510b7
commit d107773f48
3 changed files with 73 additions and 57 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,12 +8,25 @@

 # Local History for Visual Studio Code
 .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
 *.vsix
 *.log
 *.log-*
-restagent
+*.bak
+

--- a/91
+++ b/91
@@ -4,51 +4,52 @@ PROJECT = OMC
 VERSION = 5GC16.1.1
 PLATFORM = amd64
 ARMPLATFORM = aarch64
-GOPROJECTS = $(HOME)/goprojects
-BUILDDIR = $(GOPROJECTS)/build
-DEBBUILDDIR = $(GOPROJECTS)/debbuild
-RPMBUILDDIR = $(GOPROJECTS)/rpmbuild
-INSTALLDIR = /usr/local/omc
-RELEASEDIR = $(GOPROJECTS)/release
-EMSPROJECT = $(GOPROJECTS)/ems.agt
-LIBDIR = $(EMSPROJECT)/lib
+GitLocalRoot = $(HOME)/local.git
+EmsBuildRoot=$GitLocalRoot/build.ems
+BuildDir = $(EmsBuildRoot)/build
+DebBuildDir = $(EmsBuildRoot)/debbuild
+RpmBuildDir = $(EmsBuildRoot)/rpmbuild
+OmcInstallDir = /usr/local/omc
+ReleaseDir = $(EmsBuildRoot)/release
+EmsBEDir = $(GitLocalRoot)/be.ems
+LibDir = $(EmsBEDir)/lib
 RESTAGENT = restagent
 CRONTASK = crontask
 SshSvcBin = sshsvc
 NBI_ALARM = nbi_alarm
 NBI_AGENT = nbi_agent
 4A_AGENT = 4a_agent
-RESTAGENTDIR = $(EMSPROJECT)/$(RESTAGENT)
-CRONTASKDIR = $(EMSPROJECT)/$(CRONTASK)
-SshSvcDir =  $(EMSPROJECT)/$(SshSvcBin)
-DBSQLSRCDIR = $(EMSPROJECT)/database
-MISCDIR = $(EMSPROJECT)/misc
-FrontBuildDir = $(BUILDDIR)/omc/htdocs
-FrontSrcDir = $(EMSPROJECT)/front
-ReleaseDebs = $(RELEASEDIR)/debs/$(PLATFORM)
-BinDir = $(BUILDDIR)/omc/bin
-BinDir2 = $(BUILDDIR)/omc/run
+RestagentDir = $(EmsBEDir)/$(RESTAGENT)
+CrontaskDir = $(EmsBEDir)/$(CRONTASK)
+SshSvcDir =  $(EmsBEDir)/$(SshSvcBin)
+DBSQLSrcDir = $(EmsBEDir)/database
+MiscDir = $(EmsBEDir)/misc
+FrontBuildDir = $(BuildDir)/omc/htdocs
+FrontSrcDir = $(EmsBEDir)/front
+ReleaseDebs = $(ReleaseDir)/debs/$(PLATFORM)
+BinDir = $(BuildDir)/omc/bin
+BinDir2 = $(BuildDir)/omc/run
 CrontaskSize = 27788951
 RestagentSize = 29525312
 BinWriterDir = $(HOME)/bin

 .PHONY: all $(RESTAGENT) $(CRONTASK)
 all: $(RESTAGENT) $(CRONTASK)
-	cd $(RESTAGENTDIR)
+	cd $(RestagentDir)
 	go build -o $(RESTAGENT) -v -ldflags "-X 'ems.agt/lib/conifg.Version=$(VERSION)' \
-		-X '$(LIBDIR)/conifg.BuildTime=`date`' \
-		-X '$(LIBDIR)/conifg.GoVer=`go version`'"
-	cd $(CRONTASKDIR)
-	go build -o $(CRONTASK) -v -ldflags "-X '$(LIBDIR)/conifg.Version=$(VERSION)' \
-		-X '$(LIBDIR)/conifg.BuildTime=`date`' \
-		-X '$(LIBDIR)/conifg.GoVer=`go version`'"
+		-X '$(LibDir)/conifg.BuildTime=`date`' \
+		-X '$(LibDir)/conifg.GoVer=`go version`'"
+	cd $(CrontaskDir)
+	go build -o $(CRONTASK) -v -ldflags "-X '$(LibDir)/conifg.Version=$(VERSION)' \
+		-X '$(LibDir)/conifg.BuildTime=`date`' \
+		-X '$(LibDir)/conifg.GoVer=`go version`'"


 clean:
 	rm  ./restagent/$(RESTAGENT) ./crontask/$(CRONTASK)

 dist: 
-	tar -zvcPf $(RELEASEDIR)/$(PROJECT)-src-$(VERSION).tar.gz \
+	tar -zvcPf $(ReleaseDir)/$(PROJECT)-src-$(VERSION).tar.gz \
 		../lib \
 		../restagent \
 		../crontask \
@@ -62,19 +63,19 @@ dist:
 		--exclude=../initems/initems 

 deb: $(BINNAME)
-	cp -rf ./restagent/$(RESTAGENT) $(BUILDDIR)/omc/bin
-	cp -rf ./crontask/$(CRONTASK) $(BUILDDIR)/omc/bin
-	cp -rf $(MISCDIR)/* $(BUILDDIR)/omc/bin
-	cp -rf $(DBSQLSRCDIR)/*.sql $(BUILDDIR)/omc/etc/db
+	cp -rf ./restagent/$(RESTAGENT) $(BuildDir)/omc/bin
+	cp -rf ./crontask/$(CRONTASK) $(BuildDir)/omc/bin
+	cp -rf $(MiscDir)/* $(BuildDir)/omc/bin
+	cp -rf $(DBSQLSrcDir)/*.sql $(BuildDir)/omc/etc/db
 	rm -rf $(FrontBuildDir)/*
 	unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null
-	chmod 755 $(BUILDDIR)/omc/bin/*
-	chmod 755 $(DEBBUILDDIR)/DEBIAN/*
-	cp -rf $(BUILDDIR)/omc/*  $(DEBBUILDDIR)/usr/local/omc/
-	chmod +x $(DEBBUILDDIR)/usr/local/omc/bin/*
-	cp -rf $(BUILDDIR)/nginx/*  $(DEBBUILDDIR)/etc/nginx/conf.d
-	cp -rf $(BUILDDIR)/systemd/*.service  $(DEBBUILDDIR)/lib/systemd/system/
-	dpkg -b $(DEBBUILDDIR) $(ReleaseDebs)/$(PROJECT)-$(VERSION).$(PLATFORM).deb
+	chmod 755 $(BuildDir)/omc/bin/*
+	chmod 755 $(DebBuildDir)/DEBIAN/*
+	cp -rf $(BuildDir)/omc/*  $(DebBuildDir)/usr/local/omc/
+	chmod +x $(DebBuildDir)/usr/local/omc/bin/*
+	cp -rf $(BuildDir)/nginx/*  $(DebBuildDir)/etc/nginx/conf.d
+	cp -rf $(BuildDir)/systemd/*.service  $(DebBuildDir)/lib/systemd/system/
+	dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION).$(PLATFORM).deb

 rpm: $(BINNAME)
 	cp -rf ./restagent/$(RESTAGENT) $(BinDir)
@@ -82,19 +83,19 @@ rpm: $(BINNAME)
 	cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir2)
 	$(BinWriterDir)/binWriter $(BinDir)/$(RESTAGENT) $(RestagentSize)
 	$(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_AGENT)/bin/$(NBI_AGENT) $(BinDir2)
 	cp -rf ./$(4A_AGENT)/bin/$(4A_AGENT) $(BinDir2)
-	cp -rf $(MISCDIR)/* $(BinDir2)
+	cp -rf $(MiscDir)/* $(BinDir2)
 	rm -rf $(BinDir2)/ne-hosts
-	cp -rf $(DBSQLSRCDIR)/* $(BUILDDIR)/omc/etc/db
+	cp -rf $(DBSQLSrcDir)/* $(BuildDir)/omc/etc/db
 	rm -rf $(FrontBuildDir)/*
 	unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null
 	chmod 755 $(BinDir)/*
 	chmod 755 $(BinDir2)/*
-	cp -rf $(BUILDDIR)/omc $(RPMBUILDDIR)/BUILD
-	cp -rf $(BUILDDIR)/nginx $(RPMBUILDDIR)/BUILD
-	cp -rf $(BUILDDIR)/systemd $(RPMBUILDDIR)/BUILD
-	cd $(RPMBUILDDIR)
-	rpmbuild -bb -D "_topdir $(RPMBUILDDIR)" --sign $(RPMBUILDDIR)/SPECS/omc.spec
+	cp -rf $(BuildDir)/omc $(RpmBuildDir)/BUILD
+	cp -rf $(BuildDir)/nginx $(RpmBuildDir)/BUILD
+	cp -rf $(BuildDir)/systemd $(RpmBuildDir)/BUILD
+	cd $(RpmBuildDir)
+	rpmbuild -bb -D "_topdir $(RpmBuildDir)" --sign $(RpmBuildDir)/SPECS/omc.spec
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -1,12 +1,14 @@
 #!/bin/bash

 ProcList="restagent crontask sshsvc"
-GoProjectsDir=$HOME/goprojects
-EmsDir=$GoProjectsDir/ems.agt
+GitLocalRoot=$HOME/local.git
+EmsBEDir=$GitLocalRoot/be.ems
+EmsBuildRoot=$GitLocalRoot/build.ems
+EmsFEDir=$GitLocalRoot/fe.ems
 RpmArch=`arch`
-RpmsDir=$GoProjectsDir/rpmbuild/RPMS/
-ReleaseDir=$GoProjectsDir/release
-DumpToolDir=${EmsDir}/tools/misc
+RpmsDir=$GitLocalRoot/rpmbuild/RPMS/
+ReleaseDir=$GitLocalRoot/release
+DumpToolDir=${EmsBEDir}/tools/misc

 if [[ $RpmArch =~ "x86_64" ]];then
    RelArch=amd64
@@ -14,9 +16,9 @@ elif [[ $RpmArch =~ "aarch64" ]];then
    RelArch=arm64
 fi

-cd $EmsDir
+cd $EmsBEDir
 for procName in $ProcList;do
-    cd $EmsDir/$procName
+    cd $EmsBEDir/$procName
    echo "Make $procName ..."
    make
 done
@@ -26,7 +28,7 @@ ${DumpToolDir}/dumpdb.sh

 case "$1" in
    rpm)
-        cd $EmsDir
+        cd $EmsBEDir
        make rpm
        cp -f $RpmsDir/$RpmArch/* $ReleaseDir/"$1"s/$RelArch
        cd $ReleaseDir/"$1"s/$RelArch
@@ -35,7 +37,7 @@ case "$1" in
        md5sum *.rpm >omc-md5sum.txt
    ;;
    deb)
-        cd $EmsDir
+        cd $EmsBEDir
        make deb
    ;;
    *)