Улучшена сборка проекта.
This commit is contained in:
		
							parent
							
								
									50c7579cf5
								
							
						
					
					
						commit
						f50480979b
					
				
							
								
								
									
										1
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							| @ -5,6 +5,7 @@ | ||||
|         "версионируется", | ||||
|         "Alek", | ||||
|         "Aleksei", | ||||
|         "appname", | ||||
|         "Badiaev", | ||||
|         "Childs", | ||||
|         "choco", | ||||
|  | ||||
							
								
								
									
										4
									
								
								build/ci/Jenkinsfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								build/ci/Jenkinsfile
									
									
									
									
										vendored
									
									
								
							| @ -112,7 +112,8 @@ pipeline { | ||||
|                     environment { | ||||
|                         OUTDIR = 'dist' | ||||
|                         DIST_TAG = 'empty' | ||||
|                         GO_OPT = '-ldflags "-w"' | ||||
|                         GO_LDFLAGS = '-w' | ||||
|                         GO_OPT = ' ' | ||||
|                     } | ||||
|                     steps { | ||||
|                         echo "***** RELEASE ${PROJECT_NAME} for Linux *****" | ||||
| @ -140,6 +141,7 @@ pipeline { | ||||
|                     environment { | ||||
|                         OUTDIR = 'dist' | ||||
|                         DIST_TAG = 'empty' | ||||
|                         GO_LDFLAGS = '-w' | ||||
|                         GO_OPT = ' ' | ||||
|                     } | ||||
|                     steps { | ||||
|  | ||||
| @ -8,7 +8,10 @@ import ( | ||||
| 	"git.mousesoft.ru/ms/drawio-exporter/pkg/drawio" | ||||
| ) | ||||
| 
 | ||||
| var version string // Версия приложения | ||||
| var ( | ||||
| 	appname string // Наименование приложения | ||||
| 	version string // Версия приложения | ||||
| ) | ||||
| 
 | ||||
| func main() { | ||||
| 	flag.Parse() | ||||
| @ -17,7 +20,7 @@ func main() { | ||||
| 		os.Exit(0) | ||||
| 	} | ||||
| 	if flagVersion { | ||||
| 		fmt.Println("Draw.io Export cli util", version) | ||||
| 		fmt.Println(appname, version) | ||||
| 		os.Exit(0) | ||||
| 	} | ||||
| 	if flag.NArg() < 1 { | ||||
|  | ||||
							
								
								
									
										6
									
								
								makefile
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								makefile
									
									
									
									
									
								
							| @ -2,6 +2,7 @@ | ||||
| # ========================
 | ||||
| 
 | ||||
| PROJECT_ID 		:= drawio-export | ||||
| PROJECT_NAME	?= MouseSoft DrawIO Export | ||||
| BIN_SUFFIX		:= | ||||
| 
 | ||||
| TMPDIR			?= $(CURDIR)/tmp | ||||
| @ -13,7 +14,10 @@ VERSION			?= $(strip $(shell ./scripts/version.sh)) | ||||
| VERSION_NUMBER	:= $(strip $(shell ./scripts/version.sh number)) | ||||
| DIST_KIND		:= $(shell uname -m) | ||||
| 
 | ||||
| GO_OPT_BASE		:= -mod vendor -ldflags "-X main.version=${VERSION}" | ||||
| GO_LDFLAGS		?= | ||||
| GO_OPT_V		:= -X "main.version=$(VERSION)" | ||||
| GO_OPT_APP		:= -X "main.appname=$(PROJECT_NAME)" | ||||
| GO_OPT_BASE		:= -mod vendor -ldflags '$(GO_OPT_V) $(GO_OPT_APP) $(GO_LDFLAGS)' | ||||
| GO_OPT			?= | ||||
| EXPORT_RESULT 	?= false # for CI please set EXPORT_RESULT to true | ||||
| COVERAGE_FORMAT ?= html | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user