Skip to content

Commit 7194d9a

Browse files
author
drswinghead
committed
Improve minimal tag build core/gui/widgets support
1 parent 0cf6df1 commit 7194d9a

File tree

1,049 files changed

+21856
-15607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,049 files changed

+21856
-15607
lines changed

‎Makefile

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,31 @@
1+
# make V=0|1|2 P=n MIN=x
12

23
# GOPATH := $(PWD):$(GOPATH)
34
MINORVER := $(shell go version|awk '{print $$3}'|awk -F. '{print $$2}')
45
USEI=$(shell expr "${MINORVER}" ">=" "10")
56
ifeq ($(USEI), 1)
6-
ARGI="-i"
7+
ARGI=-i
8+
# ARGI=-i -tags minimal
79
endif
10+
ifeq ($(V), 1)
11+
ARGV=-v
12+
endif
13+
ifeq ($(V), 2)
14+
ARGV=-v -x
15+
endif
16+
ifneq ($(P), )
17+
ARGP=-p $(P)
18+
endif
19+
ifneq ($(MIN), )
20+
ARGMIN=-tags minimal
21+
endif
22+
ARGA=${ARGI} ${ARGV} ${ARGP} ${ARGMIN}
823

924
all:
1025
@echo ${GOPATH}
1126
@echo ${MINORVER}
12-
@echo "dd ${ARGI} dd"
27+
@echo "dd ${ARGA} dd"
28+
@echo "${V} "
1329
# CC=clang CXX=clang++ go install -v -x qt5
1430
# go build -v -x core
1531
# go build -v -x gui
@@ -19,49 +35,49 @@ realall: rts bases qmls extras webengines multimedias tools
1935

2036
rts: qtrt- mock-
2137
qtrt-:
22-
go install -v -x ${ARGI} ./qtqt
23-
go install -v -x ${ARGI} ./qtrt
38+
go install ${ARGA} ./qtqt
39+
go install ${ARGA} ./qtrt
2440
mock-:
25-
go install -v -x ${ARGI} ./qtmock
41+
go install ${ARGA} ./qtmock
2642

2743
bases: qtrt- core- gui- widgets-
2844
core-:
29-
go install -v -x ${ARGI} ./qtcore
45+
go install ${ARGA} ./qtcore
3046
gui-:
31-
go install -v -x ${ARGI} ./qtgui
47+
go install ${ARGA} ./qtgui
3248
widgets-:
33-
go install -v -x ${ARGI} ./qtwidgets
49+
go install ${ARGA} ./qtwidgets
3450

3551
network-:
36-
go install -v -x ${ARGI} ./qtnetwork
52+
go install ${ARGA} ./qtnetwork
3753

3854
qmls: qml- quick- quickctrl- quickwgt-
3955
qml-:
40-
go install -v -x ${ARGI} ./qtqml
56+
go install ${ARGA} ./qtqml
4157
quick-:
42-
go install -v -x ${ARGI} ./qtquick
58+
go install ${ARGA} ./qtquick
4359
quickctrl-:
44-
go install -v -x ${ARGI} ./qtquicktemplates2
45-
go install -v -x ${ARGI} ./qtquickcontrols2
60+
go install ${ARGA} ./qtquicktemplates2
61+
go install ${ARGA} ./qtquickcontrols2
4662
quickwgt-:
47-
go install -v -x ${ARGI} ./qtquickwidgets
63+
go install ${ARGA} ./qtquickwidgets
4864

4965
extras:
50-
go install -v -x ${ARGI} ./qtandroidextras
51-
go install -v -x ${ARGI} ./qtmacextras
52-
go install -v -x ${ARGI} ./qtwinextras
66+
go install ${ARGA} ./qtandroidextras
67+
go install ${ARGA} ./qtmacextras
68+
go install ${ARGA} ./qtwinextras
5369

5470
webengines:
55-
go install -v -x ${ARGI} ./qtpositioning
56-
go install -v -x ${ARGI} ./qtprintsupport
57-
go install -v -x ${ARGI} ./qtwebchannel
58-
go install -v -x ${ARGI} ./qtwebenginecore
59-
go install -v -x ${ARGI} ./qtwebengine
60-
go install -v -x ${ARGI} ./qtwebenginewidgets
71+
go install ${ARGA} ./qtpositioning
72+
go install ${ARGA} ./qtprintsupport
73+
go install ${ARGA} ./qtwebchannel
74+
go install ${ARGA} ./qtwebenginecore
75+
go install ${ARGA} ./qtwebengine
76+
go install ${ARGA} ./qtwebenginewidgets
6177

6278
multimedias:
63-
go install -v -x ${ARGI} ./qtsvg
64-
go install -v -x ${ARGI} ./qtmultimedia
79+
go install ${ARGA} ./qtsvg
80+
go install ${ARGA} ./qtmultimedia
6581

6682
eg-:
6783
go build -v -x eg/coreapp.go
@@ -75,14 +91,14 @@ eg-:
7591
go build -v -x -o bui bigui/*.go
7692

7793
tools:
78-
go build -p 1 -v -i -o bin/go-uic ./cmd/go-uic
79-
go build -p 1 -v -i -o bin/go-rcc ./cmd/go-rcc
80-
go build -p 1 -v -i -o bin/cgo-rcc ./cmd/cgo-rcc
81-
go build -p 1 -v -i -o bin/go-qmlviewer ./cmd/go-qmlviewer
82-
go build -p 1 -v -i -o bin/go-dir2qrc ./cmd/dir2qrc
94+
go build ${ARGA} -o bin/go-uic ./cmd/go-uic
95+
go build ${ARGA} -o bin/go-rcc ./cmd/go-rcc
96+
go build ${ARGA} -o bin/cgo-rcc ./cmd/cgo-rcc
97+
go build ${ARGA} -o bin/go-qmlviewer ./cmd/go-qmlviewer
98+
go build ${ARGA} -o bin/go-dir2qrc ./cmd/dir2qrc
8399

84100
tst:
85-
go test -v -x tests/qstring_test.go
101+
go test ${ARGA} tests/qstring_test.go
86102

87103
updoc:
88104
curl -POST -d "path=github.com/kitech/qt.go/qtcore" "https://godoc.org/-/refresh"

‎qtandroidextras/qandroidactivityresultreceiver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func (this *QAndroidActivityResultReceiver) HandleActivityResult(receiverRequest
122122

123123
// keep block begin
124124

125-
func init() {
125+
func init_unused_14905() {
126126
if false {
127127
reflect.TypeOf(123)
128128
}

‎qtandroidextras/qandroidbinder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func QAndroidBinder_CallTypeItemName(val int) string {
297297

298298
// keep block begin
299299

300-
func init() {
300+
func init_unused_14907() {
301301
if false {
302302
reflect.TypeOf(123)
303303
}

‎qtandroidextras/qandroidintent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ func (this *QAndroidIntent) Handle() *QAndroidJniObject /*123*/ {
262262

263263
// keep block begin
264264

265-
func init() {
265+
func init_unused_14909() {
266266
if false {
267267
reflect.TypeOf(123)
268268
}

‎qtandroidextras/qandroidjnienvironment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func (this *QAndroidJniEnvironment) FindClass(className string) unsafe.Pointer /
167167

168168
// keep block begin
169169

170-
func init() {
170+
func init_unused_14911() {
171171
if false {
172172
reflect.TypeOf(123)
173173
}

‎qtandroidextras/qandroidjniexceptioncleaner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func QAndroidJniExceptionCleaner_OutputModeItemName(val int) string {
166166

167167
// keep block begin
168168

169-
func init() {
169+
func init_unused_14913() {
170170
if false {
171171
reflect.TypeOf(123)
172172
}

‎qtandroidextras/qandroidjniobject.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ func (this *QAndroidJniObject) IsValid() bool {
330330

331331
// keep block begin
332332

333-
func init() {
333+
func init_unused_14903() {
334334
if false {
335335
reflect.TypeOf(123)
336336
}

‎qtandroidextras/qandroidparcel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func (this *QAndroidParcel) Handle() *QAndroidJniObject /*123*/ {
268268

269269
// keep block begin
270270

271-
func init() {
271+
func init_unused_14915() {
272272
if false {
273273
reflect.TypeOf(123)
274274
}

‎qtandroidextras/qandroidservice.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func (this *QAndroidService) OnBind(intent QAndroidIntent_ITF) *QAndroidBinder /
154154

155155
// keep block begin
156156

157-
func init() {
157+
func init_unused_14917() {
158158
if false {
159159
reflect.TypeOf(123)
160160
}

‎qtandroidextras/qandroidserviceconnection.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func (this *QAndroidServiceConnection) Handle() *QAndroidJniObject /*123*/ {
186186

187187
// keep block begin
188188

189-
func init() {
189+
func init_unused_14919() {
190190
if false {
191191
reflect.TypeOf(123)
192192
}

0 commit comments

Comments
 (0)