Skip to content

Commit 687b327

Browse files
committed
fix Makefiles
1 parent 5dc4caf commit 687b327

File tree

8 files changed

+23
-42
lines changed

8 files changed

+23
-42
lines changed

tests/analysis_tests/tests-generic-jsx-transform/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
SHELL = /bin/bash
22

3-
node_modules/.bin/rescript:
4-
npm install
5-
6-
build: node_modules/.bin/rescript
7-
node_modules/.bin/rescript
3+
build:
4+
npm run build
85

96
test: build
107
./test.sh
118

129
clean:
13-
rm -rf node_modules lib
10+
rm -rf lib
1411

1512
.DEFAULT_GOAL := test
1613

tests/analysis_tests/tests-incremental-typechecking/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
SHELL = /bin/bash
22

3-
node_modules/.bin/rescript:
4-
npm install
5-
6-
build: node_modules/.bin/rescript
7-
node_modules/.bin/rescript > /dev/null || true
3+
build:
4+
npm run build > /dev/null || true
85

96
test: build
107
./test.sh
118

129
clean:
13-
rm -rf node_modules lib
10+
rm -rf lib
1411

1512
.DEFAULT_GOAL := test
1613

tests/analysis_tests/tests-reanalyze/deadcode/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
SHELL = /bin/bash
22

3-
node_modules/.bin/rescript:
4-
npm install
5-
6-
build: node_modules/.bin/rescript
7-
node_modules/.bin/rescript
3+
build:
4+
npm run build
85

96
test: build node_modules/.bin/rescript
107
./test.sh
118

129
clean:
13-
rm -rf node_modules lib
10+
rm -rf lib
1411

1512
.DEFAULT_GOAL := build
1613

tests/analysis_tests/tests-reanalyze/termination/Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
SHELL = /bin/bash
22

3-
node_modules/.bin/rescript:
4-
npm install
3+
build:
4+
npm run build
55

6-
build: node_modules/.bin/rescript
7-
node_modules/.bin/rescript
8-
9-
test: build node_modules/.bin/rescript
6+
test: build
107
./test.sh
118

129
clean:
13-
rm -rf node_modules lib
10+
rm -rf lib
1411

1512
.DEFAULT_GOAL := build
1613

tests/analysis_tests/tests/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
SHELL = /bin/bash
22

3-
node_modules/.bin/rescript:
4-
npm install
5-
6-
build: node_modules/.bin/rescript
7-
node_modules/.bin/rescript
3+
build:
4+
npm run build
85

96
test: build
107
./test.sh
118

129
clean:
13-
rm -rf node_modules lib
10+
rm -rf lib
1411

1512
.DEFAULT_GOAL := test
1613

tests/gentype_tests/typescript-react-example/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
SHELL = /bin/bash
22

33
test:
4-
npm install
54
npm run lint
65
npm run build
76
npm run tsc
@@ -10,7 +9,7 @@ test:
109
|| exit 1
1110

1211
clean:
13-
rm -rf node_modules lib src/*.res.js src/*.gen.tsx
12+
rm -rf lib src/*.res.js src/*.gen.tsx
1413

1514
.DEFAULT_GOAL := test
1615

tests/tools_tests/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
SHELL = /bin/bash
22

3-
node_modules/.bin/rescript:
4-
npm install
5-
6-
build: node_modules/.bin/rescript
7-
node_modules/.bin/rescript
3+
build:
4+
npm run build
85

96
test: build
107
./test.sh
118

129
clean:
13-
rm -rf node_modules lib
10+
rm -rf lib
1411

1512
.DEFAULT_GOAL := test
1613

tests/tools_tests/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"name": "@tests/tools",
33
"private": true,
44
"scripts": {
5-
"res:build": "rescript",
6-
"res:clean": "rescript clean",
7-
"res:dev": "rescript -w"
5+
"build": "rescript",
6+
"clean": "rescript clean",
7+
"dev": "rescript -w"
88
},
99
"dependencies": {
1010
"@rescript/react": "^0.13.0",

0 commit comments

Comments
 (0)