Skip to content

Commit 7bd58bd

Browse files
committed
Refactor binding Makefiles for Windows
1 parent 80edaf2 commit 7bd58bd

File tree

6 files changed

+4
-30
lines changed

6 files changed

+4
-30
lines changed

common/binding.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
BINDING-NAME := $(shell basename $(shell pwd))
22

3+
ifeq ($(OS-NAME),windows)
4+
override export PATH := "$(LIBYS)/lib:$$PATH"
5+
endif
6+
37
release:: release-deps
48
$(ROOT)/util/release release-$(BINDING-NAME)
59

fortran/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ DEPS := \
1010
$(FPM) \
1111
$(LIBYAMLSTAR-SO) \
1212

13-
ifeq ($(OS-NAME),windows)
14-
override export PATH := "$(LIBYS)/lib:$$PATH"
15-
endif
16-
1713

1814
test: $(DEPS)
1915
fpm test --flag "-L$(LIBYS)/lib"

go/Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,12 @@ export CGO_LDFLAGS := -L $(ROOT)/libyamlstar/lib
1313
endif
1414

1515

16-
ifeq ($(OS-NAME),windows)
17-
build: $(GO) $(LIBYAMLSTAR-SO-VERSION) $(LIBYAMLSTAR-HEADER)
18-
PATH="$(LIBYS)/lib:$$PATH" go build
19-
else
2016
build: $(GO) $(LIBYAMLSTAR-SO-VERSION) $(LIBYAMLSTAR-HEADER)
2117
go build
22-
endif
2318

24-
ifeq ($(OS-NAME),windows)
25-
test: $(GO) $(LIBYAMLSTAR-SO-VERSION) $(LIBYAMLSTAR-HEADER)
26-
PATH="$(LIBYS)/lib:$$PATH" go test$(if $v, -v)
27-
chmod -R u+w $(GOPATH) 2>/dev/null || true
28-
else
2919
test: $(GO) $(LIBYAMLSTAR-SO-VERSION) $(LIBYAMLSTAR-HEADER)
3020
go test$(if $v, -v)
3121
chmod -R u+w $(GOPATH) 2>/dev/null || true
32-
endif
3322

3423
check: $(GO)
3524
go vet

nodejs/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@ MAKES-REALCLEAN := \
1313
$(NODE-MODULES) \
1414

1515

16-
ifeq ($(OS-NAME),windows)
17-
test: $(NODE-MODULES) $(LIBYAMLSTAR-SO)
18-
PATH="$(LIBYS)/lib:$$PATH" node test/test.js
19-
else
2016
test: $(NODE-MODULES) $(LIBYAMLSTAR-SO)
2117
node test/test.js
22-
endif
2318

2419
build: $(LIBYAMLSTAR-SO)
2520

python/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,8 @@ PYTHON-VENV-SETUP := pip install pytest setuptools twine
1717

1818
test: test-pytest
1919

20-
ifeq ($(OS-NAME),windows)
21-
test-pytest: $(LIBYAMLSTAR-SO) $(PYTHON-VENV)
22-
PATH="$(LIBYS)/lib:$$PATH" $(VENV) && pytest test/
23-
else
2420
test-pytest: $(LIBYAMLSTAR-SO) $(PYTHON-VENV)
2521
$(VENV) && pytest test/
26-
endif
2722

2823
build: $(LIBYAMLSTAR-SO)
2924

rust/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@ MAKES-CLEAN := \
88
target \
99

1010

11-
ifeq ($(OS-NAME),windows)
12-
test: $(CARGO) $(LIBYAMLSTAR-SO)
13-
PATH="$(LIBYS)/lib:$$PATH" cargo $@
14-
else
1511
test: $(CARGO) $(LIBYAMLSTAR-SO)
1612
cargo $@
17-
endif
1813

1914
build check clippy fmt: $(CARGO)
2015
cargo $@

0 commit comments

Comments
 (0)