Skip to content

Commit cb24641

Browse files
committed
Attempt boostrap of premake using vs build tools only
1 parent aa06dff commit cb24641

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.travis.before_install.windows.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
#!/bin/bash
22

33
echo before_install...
4-
5-
choco install visualstudio2017community visualstudio2017-workload-nativedesktop

premake.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@ if [ ! -f $DIR/Dependencies/premake/bin/release/premake5 ]; then
2525
else
2626

2727
VSINSTALL=`"/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -property installationPath`
28+
VSVERSION=`"/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -property catalog_productLineVersion`
29+
2830
if [ -z "$VSINSTALL" ]; then
2931
VSINSTALL=`"/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -products 'Microsoft.VisualStudio.Product.BuildTools' -property installationPath`
32+
VSVERSION=`"/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -products 'Microsoft.VisualStudio.Product.BuildTools' -property catalog_productLineVersion`
3033
fi
31-
echo $VSINSTALL
32-
VSINSTALL_BASH=`cygpath -a "$VSINSTALL"`
33-
echo $VSINSTALL_BASH
34+
3435
echo Calling premake bootstrap...
35-
cmd //c "$VSINSTALL_BASH/VC/Auxiliary/Build/vcvars64.bat" \&\& nmake -f Bootstrap.mak windows
36+
VSINSTALL_BASH=`cygpath -a "$VSINSTALL"`
37+
cmd //c "$VSINSTALL_BASH/VC/Auxiliary/Build/vcvars64.bat" \&\& nmake -f Bootstrap.mak MSDEV=vs$VSVERSION windows-msbuild
3638
if [ "$?" -ne "0" ]; then
3739
exit 1
3840
fi

0 commit comments

Comments
 (0)