Skip to content

Commit 3d8864e

Browse files
authored
Merge pull request #8 from aminya/msvc
2 parents 7d0cc67 + 631a302 commit 3d8864e

21 files changed

+508
-195
lines changed

Diff for: .github/workflows/CI.yml

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ jobs:
5353
run: |
5454
pnpm install
5555
56+
# - name: Setup SSH debugging session
57+
# uses: mxschmitt/action-tmate@v3
58+
5659
- name: Test
5760
run: |
5861
pnpm run test

Diff for: .gitmodules

-8
This file was deleted.

Diff for: LICENSE.dependencies.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ setup-cpp reused some code from the following projects:
44
- [install-cmake](https://github.com/Symbitic/install-cmake/blob/master/LICENSE.md): MIT
55
- [get-cmake](https://github.com/lukka/get-cmake/blob/main/LICENSE.txt): MIT
66
- [gha-setup-ninja](https://github.com/seanmiddleditch/gha-setup-ninja): MIT
7-
- [setup-python](https://github.com/actions/setup-python): MIT
87

98
This package also uses the depedencies listed in package.json. You can get the list of their licenses using the following command:
109
```
1110
npm install -g license-checker
12-
license-checker --summary --production
11+
license-checker --summary --production --excludePackages "[email protected]"
1312
```
1413

1514
```
16-
├─ MIT: 8
15+
├─ MIT: 9
1716
├─ ISC: 2
1817
└─ Apache-2.0: 1
19-
```
18+
```
19+
20+
[email protected] is MIT license.

Diff for: README.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ The package can be used locally or from CI services like GitHub Actions. Stay tu
1515

1616
`setup-cpp` can install all of these tools:
1717

18-
- llvm
19-
- gcc
2018
- cmake
2119
- ninja
20+
- llvm
21+
- gcc
22+
- msvc
23+
- vcvarsall
2224
- vcpkg
2325
- meson
2426
- conan
@@ -182,7 +184,3 @@ After build, run the following to start an interactive shell in your container
182184
```ps1
183185
docker run -it setup_cpp
184186
```
185-
186-
### Incomplete
187-
188-
- `msvc`. It is implemented, but it has bugs. See [this issue](https://github.com/aminya/setup-cpp/issues/1)

Diff for: action.yml

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ inputs:
1818
msvc:
1919
description: "The msvc version to install"
2020
required: false
21+
vcvarsall:
22+
description: "If should run vcvarsall?"
23+
required: false
2124
cmake:
2225
description: "The cmake version to install."
2326
required: false

Diff for: dist/setup_cpp.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/setup_cpp.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"format": "prettier --write .",
2020
"lint": "eslint . --fix",
2121
"pack.exe": "shx rm -rf ./dist/tsconfig.tsbuildinfo && node ./building/scripts/pack-exe.js",
22-
"prepare": "git submodule update --init --recursive && npm run build",
22+
"prepare": "npm run build",
2323
"start.docker": "docker run -t setup_cpp .",
2424
"test": "run-p test.format test.lint test.tsc test.unit",
2525
"test.format": "prettier . --check",
@@ -36,7 +36,9 @@
3636
"execa": "^5.1.1",
3737
"hasha": "^5.2.2",
3838
"mri": "^1.2.0",
39+
"msvc-dev-cmd": " https://github.com/aminya/msvc-dev-cmd",
3940
"semver": "^7.3.5",
41+
"setup-python": "https://github.com/actions/setup-python",
4042
"untildify": "^4.0.0",
4143
"which": "^2.0.2"
4244
},

0 commit comments

Comments
 (0)