Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit 19b3154

Browse files
sjoelundOpenModelica-Hudson
authored andcommitted
Print the environment before starting wine
This enables us to perform some debugging of the wine environment without running commands manually on the server. Belonging to [master]: - #2227 - OpenModelica/OpenModelica-testsuite#858
1 parent 88711c9 commit 19b3154

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ OMDEV_CMAKE="$(OMDEV)/bin/cmake/bin/cmake.exe"
137137

138138
checkMSVCwine:
139139
@echo 'Test for WINE, OMDEV, VS140COMNTOOLS env.vars'
140+
env
140141
test ! -z "$(WINE)"
141142
test ! -z "$(OMDEV)"
142143
test ! -z "$(VS140COMNTOOLS)"

scripts/wine-msvc.source

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ export WINEARCH
1111
export WINEPREFIX
1212
export WINEDEBUG=-all
1313
export DevEnvDir="$WSDK\\Common7\\IDE"
14-
export WINEPATH="$WSDK\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\Program Files (x86)\\MSBuild\\14.0\\bin;$WSDK\\Common7\\IDE\\;$WSDK\\VC\\BIN;$WSDK\\Common7\\Tools;C:\\WINDOWS\\Microsoft.NET\\Framework\\v4.0.30319;$WSDK\\VC\\VCPackages;$WSDK\\Team Tools\\Performance Tools;$W10SDK\\8.1\\bin\\x86;c:\\windows;c:\\windows\\system32;"
14+
export WINEPATH="$WSDK/Common7/IDE/CommonExtensions/Microsoft/TestWindow;C:/Program Files (x86)/MSBuild/14.0/bin;$WSDK/Common7/IDE/;$WSDK/VC/bin/;$WSDK/Common7/Tools;C:/WINDOWS/Microsoft.NET/Framework/v4.0.30319;$WSDK\\VC\\VCPackages;$WSDK\\Team Tools\\Performance Tools;$W10SDK\\8.1\\bin\\x86;c:\\windows;c:\\windows\\system32;"
1515
export INCLUDE="$WSDK/VC/INCLUDE;$WSDK/VC/ATLMFC/INCLUDE;$W10SDK/10/include/10.0.10240.0/ucrt;$W10SDK/8.1/include/shared;$W10SDK/8.1/include/um;$W10SDK/8.1/include/winrt;"
1616
export LIB="$WSDK/VC/LIB;$WSDK/VC/ATLMFC/LIB;$W10SDK/10/lib/10.0.10240.0/ucrt/x86;$W10SDK/8.1/lib/winv6.3/um/x86;"
17-
export LIBPATH="C:/WINDOWS/Microsoft.NET/Framework/v4.0.30319;$WSDK/VC/LIB;$WSDK/VC/ATLMFC/LIB;$W10SDK/8.1/References/CommonConfiguration/Neutral;/Microsoft.VCLibs/14.0/References/CommonConfiguration/neutral;"
17+
export LIBPATH="C:/WINDOWS/Microsoft.NET/Framework/v4.0.30319;$WSDK/VC/lib/;$WSDK/VC/ATLMFC/LIB;$W10SDK/8.1/References/CommonConfiguration/Neutral;/Microsoft.VCLibs/14.0/References/CommonConfiguration/neutral;"
1818
export VS140COMNTOOLS="$WSDK\\Common7\\Tools"
1919
export VSINSTALLDIR="$WSDK\\"
2020
export WindowsLibPath="$W10SDK\\8.1\\References\\CommonConfiguration\\Neutral"

0 commit comments

Comments
 (0)