Forráskód Böngészése

修改Makefile,编译web-ui

niujiuru 1 hete
szülő
commit
b8279667d0
3 módosított fájl, 11 hozzáadás és 6 törlés
  1. 7 5
      Makefile
  2. 2 1
      go.mod
  3. 2 0
      go.sum

+ 7 - 5
Makefile

@@ -21,7 +21,7 @@ DATE := $(shell date +%Y%m%d_%H%M%S)
 RTU_LINUX_MODULES_PATH := $(shell pwd)/../rtu_linux_modules
 
 # 编译的目标
-all: cbd_go_app
+all: cbd_go_app web-ui
 
 # 通用基础库
 libswapi.a :
@@ -35,16 +35,18 @@ LIBS := -Wl,-Bstatic -L$(RTU_LINUX_MODULES_PATH)/swapi -lswapi -L./mcu_ctrl_boar
 LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread
 
 cbd_go_app : libswapi.a libmcu_ctrl_board.a
-	mkdir -p ./build
 	$(GO) mod tidy
 	$(SETGO_ENV) CGO_LDFLAGS="$(LIBS)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./main.go
-	@cp $@ ./build/$(basename $@)_$(DATE)$(suffix $@)
 
-cbd-web-ui :
+web-ui:
+	mkdir -p ./build
+	$(GO) mod tidy
+	$(SETGO_ENV) $(GO_BUILD) $(GO_FLAGS) -o $@ ./web-ui.service/*.go
+	cp -f $@ ./build/ && rm -f $@
 
 # 编译的清理
 clean:
 	$(MAKE) -C $(RTU_LINUX_MODULES_PATH) clean
 	make -C ./mcu_ctrl_board clean
 
-	rm -rf ./cbd_go_app ./cbd-web-ui ./*.a ./*.out ./build
+	rm -rf ./cbd_go_app ./web-ui ./*.a ./*.out ./build

+ 2 - 1
go.mod

@@ -12,13 +12,14 @@ require (
 )
 
 require (
+	github.com/creack/pty v1.1.24
 	github.com/eclipse/paho.mqtt.golang v1.5.1
+	github.com/gorilla/websocket v1.5.3
 	hnyfkj.com.cn/rtu/linux v0.0.0
 	hnyfkj.com.cn/rtu/linux/services v0.0.0
 )
 
 require (
-	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/jlaffaye/ftp v0.2.0 // indirect

+ 2 - 0
go.sum

@@ -1,5 +1,7 @@
 github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=
 github.com/alexflint/go-filemutex v1.3.0/go.mod h1:U0+VA/i30mGBlLCrFPGtTe9y6wGQfNAWPBTekHQ+c8A=
+github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
+github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=