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

Commit

Permalink
Print the environment before starting wine
Browse files Browse the repository at this point in the history
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
  • Loading branch information
sjoelund authored and OpenModelica-Hudson committed Feb 22, 2018
1 parent 88711c9 commit 19b3154
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ OMDEV_CMAKE="$(OMDEV)/bin/cmake/bin/cmake.exe"

checkMSVCwine:
@echo 'Test for WINE, OMDEV, VS140COMNTOOLS env.vars'
env
test ! -z "$(WINE)"
test ! -z "$(OMDEV)"
test ! -z "$(VS140COMNTOOLS)"
Expand Down
4 changes: 2 additions & 2 deletions scripts/wine-msvc.source
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ export WINEARCH
export WINEPREFIX
export WINEDEBUG=-all
export DevEnvDir="$WSDK\\Common7\\IDE"
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;"
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;"
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;"
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;"
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;"
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;"
export VS140COMNTOOLS="$WSDK\\Common7\\Tools"
export VSINSTALLDIR="$WSDK\\"
export WindowsLibPath="$W10SDK\\8.1\\References\\CommonConfiguration\\Neutral"
Expand Down

0 comments on commit 19b3154

Please sign in to comment.