Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 146d84b

Browse files
redsun82redsun82
committed
Go: rework makefile
1 parent bfa189e commit 146d84b

1 file changed

Lines changed: 7 additions & 68 deletions

File tree

‎go/Makefile‎

Lines changed: 7 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
all: extractor ql/lib/go.dbscheme
1+
all: gen extractor
22

33
ifeq ($(OS),Windows_NT)
44
EXE = .exe
@@ -14,17 +14,11 @@ CODEQL_PLATFORM = osx64
1414
endif
1515
endif
1616

17-
CODEQL_TOOLS = $(addprefix codeql-tools/,autobuild.cmd autobuild.sh baseline-config-empty.json baseline-config-vendor.json configure-baseline.cmd configure-baseline.sh identify-environment.cmd identify-environment.sh index.cmd index.sh pre-finalize.cmd pre-finalize.sh tracing-config.lua)
18-
1917
EXTRACTOR_PACK_OUT = build/codeql-extractor-go
2018

21-
BINARIES = go-extractor go-tokenizer go-autobuilder go-build-runner go-bootstrap go-gen-dbscheme
22-
23-
.PHONY: tools tools-codeql tools-codeql-full clean autoformat \
24-
tools-linux64 tools-osx64 tools-win64 check-formatting
19+
.PHONY: extractor gen clean autoformat check-formatting
2520

2621
clean:
27-
rm -rf tools/bin tools/linux64 tools/osx64 tools/win64 tools/net tools/opencsv
2822
rm -rf $(EXTRACTOR_PACK_OUT) build/stats build/testdb
2923

3024
autoformat:
@@ -47,66 +41,11 @@ endif
4741
qhelp-to-markdown:
4842
scripts/qhelp-to-markdown.sh ql/src "$(QHELP_OUT_DIR)"
4943

50-
tools: tools-codeql tools/tokenizer.jar
51-
52-
.PHONY: $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES)))
53-
$(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES))):
54-
go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
55-
56-
tools-codeql: tools-$(CODEQL_PLATFORM)
57-
58-
tools-codeql-full: tools-linux64 tools-osx64 tools-win64
59-
60-
tools-linux64: $(addprefix tools/linux64/,$(BINARIES))
61-
62-
.PHONY: $(addprefix tools/linux64/,$(BINARIES))
63-
$(addprefix tools/linux64/,$(BINARIES)):
64-
GOOS=linux GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(@F)
65-
66-
tools-osx64: $(addprefix tools/osx64/,$(BINARIES))
67-
68-
.PHONY: $(addprefix tools/osx64/,$(BINARIES))
69-
$(addprefix tools/osx64/,$(BINARIES)):
70-
GOOS=darwin GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@.amd64 ./cli/$(@F)
71-
GOOS=darwin GOARCH=arm64 go build -C extractor -mod=vendor -o ../$@.arm64 ./cli/$(@F)
72-
lipo -create $@.amd64 $@.arm64 -output $@
73-
rm $@.amd64 $@.arm64
74-
75-
tools-win64: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
76-
77-
.PHONY: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
78-
$(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES))):
79-
env GOOS=windows GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
80-
81-
.PHONY: extractor-common extractor extractor-full
82-
extractor-common: codeql-extractor.yml LICENSE ql/lib/go.dbscheme \
83-
tools/tokenizer.jar $(CODEQL_TOOLS)
84-
rm -rf $(EXTRACTOR_PACK_OUT)
85-
mkdir -p $(EXTRACTOR_PACK_OUT)
86-
cp codeql-extractor.yml LICENSE ql/lib/go.dbscheme ql/lib/go.dbscheme.stats $(EXTRACTOR_PACK_OUT)
87-
mkdir $(EXTRACTOR_PACK_OUT)/tools
88-
cp -r tools/tokenizer.jar $(CODEQL_TOOLS) $(EXTRACTOR_PACK_OUT)/tools
89-
cp -r downgrades $(EXTRACTOR_PACK_OUT)
90-
91-
extractor: extractor-common tools-codeql
92-
cp -r tools/$(CODEQL_PLATFORM) $(EXTRACTOR_PACK_OUT)/tools
93-
94-
extractor-full: extractor-common tools-codeql-full
95-
cp -r $(addprefix tools/,linux64 osx64 win64) $(EXTRACTOR_PACK_OUT)/tools
96-
97-
tools/tokenizer.jar: tools/net/sourceforge/pmd/cpd/GoLanguage.class
98-
jar cf $@ -C tools net
99-
jar uf $@ -C tools opencsv
100-
101-
tools/net/sourceforge/pmd/cpd/GoLanguage.class: extractor/net/sourceforge/pmd/cpd/GoLanguage.java
102-
javac -cp extractor -d tools $<
103-
rm tools/net/sourceforge/pmd/cpd/AbstractLanguage.class
104-
rm tools/net/sourceforge/pmd/cpd/SourceCode.class
105-
rm tools/net/sourceforge/pmd/cpd/TokenEntry.class
106-
rm tools/net/sourceforge/pmd/cpd/Tokenizer.class
44+
extractor:
45+
bazel run :create-extractor-pack
10746

108-
ql/lib/go.dbscheme: tools/$(CODEQL_PLATFORM)/go-gen-dbscheme$(EXE)
109-
$< $@
47+
gen:
48+
bazel run :gen
11049

11150
build/stats/src.stamp:
11251
mkdir -p $(@D)/src
@@ -123,7 +62,7 @@ test: all build/testdb/check-upgrade-path
12362
codeql test run -j0 ql/test --search-path build/codeql-extractor-go --consistency-queries ql/test/consistency --compilation-cache=$(cache)
12463
# use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
12564
env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path build/codeql-extractor-go --consistency-queries ql/test/consistency --compilation-cache=$(cache)
126-
cd extractor; go test -mod=vendor ./...
65+
cd extractor; bazel test ...
12766
bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)
12867

12968
.PHONY: build/testdb/check-upgrade-path

0 commit comments

Comments
 (0)