@@ -4,13 +4,14 @@ export GO111MODULE=off
44
55GO ?= go
66SED_INPLACE := sed -i
7+ SHASUM ?= shasum -a 256
78
89export PATH := $($(GO ) env GOPATH) /bin:$(PATH )
910
1011ifeq ($(OS ) , Windows_NT)
11- EXECUTABLE : = gitea.exe
12+ EXECUTABLE ? = gitea.exe
1213else
13- EXECUTABLE : = gitea
14+ EXECUTABLE ? = gitea
1415 UNAME_S := $(shell uname -s)
1516 ifeq ($(UNAME_S),Darwin)
1617 SED_INPLACE := sed -i ''
@@ -24,6 +25,8 @@ GOFMT ?= gofmt -s
2425GOFLAGS := -i -v
2526EXTRA_GOFLAGS ?=
2627
28+ MAKE_VERSION := $(shell make -v | head -n 1)
29+
2730ifneq ($(DRONE_TAG ) ,)
2831 VERSION ?= $(subst v,,$(DRONE_TAG))
2932 GITEA_VERSION ?= $(VERSION)
3639 GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
3740endif
3841
39- LDFLAGS := -X "main.Version=$(GITEA_VERSION ) " -X "main.Tags=$(TAGS ) "
42+ LDFLAGS := $( LDFLAGS ) -X "main.MakeVersion= $( MAKE_VERSION ) " -X "main.Version=$(GITEA_VERSION ) " -X "main.Tags=$(TAGS ) "
4043
4144PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO ) list ./... | grep -v /vendor/) ) )
4245SOURCES ?= $(shell find . -name "* .go" -type f)
@@ -46,8 +49,9 @@ TAGS ?=
4649TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'gitea-temp')
4750
4851SWAGGER_SPEC := templates/swagger/v1_json.tmpl
49- SWAGGER_SPEC_S_TMPL := s|"basePath":\s*"/api/v1"|"basePath": "{{AppSubUrl}}/api/v1"|g
50- SWAGGER_SPEC_S_JSON := s|"basePath":\s*"{{AppSubUrl}}/api/v1"|"basePath": "/api/v1"|g
52+ SWAGGER_SPEC_S_TMPL := s|"basePath": *"/api/v1"|"basePath": "{{AppSubUrl}}/api/v1"|g
53+ SWAGGER_SPEC_S_JSON := s|"basePath": *"{{AppSubUrl}}/api/v1"|"basePath": "/api/v1"|g
54+ SWAGGER_NEWLINE_COMMAND := -e '$$a\'
5155
5256TEST_MYSQL_HOST ?= mysql:3306
5357TEST_MYSQL_DBNAME ?= testgitea
@@ -66,12 +70,6 @@ TEST_MSSQL_DBNAME ?= gitea
6670TEST_MSSQL_USERNAME ?= sa
6771TEST_MSSQL_PASSWORD ?= MwantsaSecurePassword1
6872
69- ifeq ($(OS ) , Windows_NT)
70- EXECUTABLE := gitea.exe
71- else
72- EXECUTABLE := gitea
73- endif
74-
7573# $(call strip-suffix,filename)
7674strip-suffix = $(firstword $(subst ., ,$(1 ) ) )
7775
@@ -111,6 +109,7 @@ generate-swagger:
111109 fi
112110 swagger generate spec -o ' ./$(SWAGGER_SPEC)'
113111 $(SED_INPLACE ) ' $(SWAGGER_SPEC_S_TMPL)' ' ./$(SWAGGER_SPEC)'
112+ $(SED_INPLACE ) $(SWAGGER_NEWLINE_COMMAND ) ' ./$(SWAGGER_SPEC)'
114113
115114.PHONY : swagger-check
116115swagger-check : generate-swagger
@@ -149,7 +148,7 @@ misspell-check:
149148 @hash misspell > /dev/null 2>&1 ; if [ $$ ? -ne 0 ]; then \
150149 $(GO ) get -u github.com/client9/misspell/cmd/misspell; \
151150 fi
152- misspell -error -i unknwon $(GOFILES )
151+ misspell -error -i unknwon,destory $(GOFILES )
153152
154153.PHONY : misspell
155154misspell :
@@ -200,6 +199,10 @@ test-vendor: vendor
200199test-sqlite : integrations.sqlite.test
201200 GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test
202201
202+ .PHONY : test-sqlite\# %
203+ test-sqlite\#% : integrations.sqlite.test
204+ GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.run $*
205+
203206.PHONY : test-sqlite-migration
204207test-sqlite-migration : migrations.sqlite.test
205208 GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test
@@ -324,7 +327,7 @@ release-windows:
324327 fi
325328 xgo -dest $(DIST ) /binaries -tags ' netgo $(TAGS)' ' -linkmode external -extldflags "-static" $(LDFLAGS)' ' windows/*' $(VERSION ) .
326329ifeq ($(CI ) ,drone)
327- mv /build/* $(DIST)/binaries
330+ cp /build/* $(DIST)/binaries
328331endif
329332
330333.PHONY : release-linux
@@ -334,7 +337,7 @@ release-linux:
334337 fi
335338 xgo -dest $(DIST ) /binaries -tags ' netgo $(TAGS)' ' -linkmode external -extldflags "-static" $(LDFLAGS)' ' linux/*' $(VERSION ) .
336339ifeq ($(CI ) ,drone)
337- mv /build/* $(DIST)/binaries
340+ cp /build/* $(DIST)/binaries
338341endif
339342
340343.PHONY : release-darwin
@@ -344,23 +347,23 @@ release-darwin:
344347 fi
345348 xgo -dest $(DIST ) /binaries -tags ' netgo $(TAGS)' ' $(LDFLAGS)' ' darwin/*' $(VERSION ) .
346349ifeq ($(CI ) ,drone)
347- mv /build/* $(DIST)/binaries
350+ cp /build/* $(DIST)/binaries
348351endif
349352
350353.PHONY : release-copy
351354release-copy :
352- $( foreach file, $( wildcard $( DIST )/binaries/ $( EXECUTABLE ) - * ) , cp $( file ) $( DIST ) $( notdir $( file ) ) ;)
355+ cd $( DIST ); for file in ` find /build -type f -name " * " ` ; do cp $$ { file} . /release/; done ;
353356
354357.PHONY : release-check
355358release-check :
356- cd $(DIST ) /release; $( foreach file, $( wildcard $( DIST ) /release/ $( EXECUTABLE ) - * ) ,sha256sum $( notdir $( file ) ) > $( notdir $( file ) ) )
359+ cd $(DIST ) /release/ ; for file in ` find . -type f -name " * " ` ; do echo " checksumming $$ {file} " && $( SHASUM ) ` echo $$ {file} | sed ' s/^..// ' ` > $$ { file} .sha256; done ;
357360
358361.PHONY : release-compress
359362release-compress :
360363 @hash gxz > /dev/null 2>&1 ; if [ $$ ? -ne 0 ]; then \
361364 $(GO ) get -u github.com/ulikunitz/xz/cmd/gxz; \
362365 fi
363- cd $(DIST ) /release; $( foreach file, $( wildcard $( DIST ) /binaries/ $( EXECUTABLE ) - * ) , gxz -k -9 $( notdir $( file ) ) ;)
366+ cd $(DIST ) /release/ ; for file in ` find . -type f -name " * " ` ; do echo " compressing $$ {file} " && gxz -k -9 $$ { file} ; done ;
364367
365368.PHONY : javascripts
366369javascripts : public/js/index.js
0 commit comments