Merge pull request #492 from TarsCloud/perf/lbbniu/tarsgo

perf: makefile add upload and fix TARSBUILD
TarsCloud · Jun 26, 2023 · 9dbdd53 · 9dbdd53
2 parents a8798a0 + 9a93d14
commit 9dbdd53
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/hack/scripts/makefile.tars.gomod.mk b/hack/scripts/makefile.tars.gomod.mk
@@ -91,6 +91,16 @@ tar: $(TARGET) $(CONFIG)
 		echo "tar cvfz $(TARGET).tgz ..."; \
 	fi
 
+TARS_WEB_HOST   ?= http://localhost:3000
+TARS_WEB_TOKEN  ?= ""
+UPLOAD_USER     ?= $(shell whoami)
+UPLOAD_OS       ?= linux
+upload: export GOOS=${UPLOAD_OS}
+upload: tar
+	@echo "$(TARGET).tgz --- $(APP).$(TARGET).tgz  OS: ${GOOS}"
+	curl ${TARS_WEB_HOST}/api/upload_and_publish?ticket=${TARS_WEB_TOKEN} -Fsuse=@${TARGET}.tgz -Fapplication=${APP} -Fmodule_name=${TARGET} -Fcomment=uploaded-by-${UPLOAD_USER}
+	@echo "\n---------------------------------------------------------------------------\n"
+
 
 HELP += $(HELP_TAR)
 
@@ -117,7 +127,7 @@ HELP_CLEANALL = "\n\033[1;33mcleanall\033[0m:\t[clean & rm .*.d]"
 HELP_TAR      = "\n\033[1;33mtar\033[0m:\t\t[will do 'tar $(TARGET).tgz $(RELEASE_FILE)']"
 
 help:
-	@echo -e $(HELP)"\n"
+	@echo $(HELP)"\n"
 
 #-------------------------------------------------------------------------------
 tars2go:

diff --git a/tars/tools/tarsgo/internal/base/templates.go b/tars/tools/tarsgo/internal/base/templates.go
@@ -65,7 +65,7 @@ make
 ./{{.Server}} --config=config/config.conf
 `
 
-	makefileTemplateFile = "makefile"
+	makefileTemplateFile = "Makefile"
 	makefileTemplate     = `APP       := {{.App}}
 TARGET    := {{.Server}}
 MFLAGS    :=
@@ -283,5 +283,5 @@ func DoGenProject(p *Project, to string, mgrType string) error {
 	if mgrType == consts.CMake {
 		return bindata.RestoreAssets(to, "cmake")
 	}
-	return bindata.RestoreAsset(to, "scripts/makefile.tars.gomod")
+	return bindata.RestoreAsset(to, "scripts/makefile.tars.gomod.mk")
 }
diff --git a/tars/tools/tarsgo/internal/bindata/bindata.go b/tars/tools/tarsgo/internal/bindata/bindata.go
diff --git a/tars/tools/tarsgo/internal/consts/version.go b/tars/tools/tarsgo/internal/consts/version.go
@@ -3,7 +3,7 @@ package consts
 // Release is the current tarsgo tool version.
 const (
 	RepoURL     = "https://github.com/TarsCloud/TarsGo.git"
-	Release     = "v1.3.5"
+	Release     = "v1.3.6"
 	MakeDemoDir = "Demo4GoMod"
 	//CMakeDemoDir = "Demo4Cmake"
 	Make  = "make"