Skip to content

Commit

Permalink
Merge pull request douyu#25 from TargetLiu/feature/fix-new-project-ma…
Browse files Browse the repository at this point in the history
…kefile

fix: new project makefile
  • Loading branch information
askuy authored Jun 11, 2020
2 parents ac38dab + 4f7d45d commit b4253d5
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions tools/jupiter/new/templates/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ BASE_PATH:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
BUILD_PATH:=$(BASE_PATH)/build
TITLE:=$(shell basename $(BASE_PATH))
BUILD_TIME:=$(shell date +%Y-%m-%d--%T)
JUPITER:=/vendor/github.com/dsouyu/jupiter
LDFLAGS:="-X $(JUPITER).buildTime=$(BUILD_TIME) -X $(JUPITER).name=$(APP_NAME) -X $(JUPITER).id=$(APP_ID)"
JUPITER:=github.com/douyu/jupiter

all:print fmt lint buildDemo
alltar:print fmt lint buildDemo
Expand All @@ -18,9 +17,6 @@ print:
@echo TITLE:$(TITLE)
@echo BUILD_TIME:$(BUILD_TIME)
@echo JUPITER:$(JUPITER)
@echo BINS:$(BINS)
@echo APP_NAME:$(APP_NAME)
@echo LDFLAGS:$(LDFLAGS)
@echo -e "\n"

fmt:
Expand Down Expand Up @@ -52,7 +48,7 @@ test:
buildDemo:
@echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>making build<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
chmod +x $(BUILD_PATH)/script/shell/*.sh
$(BUILD_PATH)/script/shell/build.sh $(LDFLAGS) $(BINS)
$(BUILD_PATH)/script/shell/build.sh $(TITLE) $(JUPITER)/pkg $(BASE_PATH)/cmd/main.go
@echo -e "\n"

run:
Expand Down

0 comments on commit b4253d5

Please sign in to comment.