Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve DDR support to allow use of VS 2017 #2798

Merged

Conversation

ChengJin01
Copy link

@ChengJin01 ChengJin01 commented Jul 25, 2018

The change is to improve DDR support in script/code
so as to allow use of VS 2017 on Windows.

Signed-off-by: CHENGJin [email protected]

@ChengJin01
Copy link
Author

ChengJin01 commented Jul 25, 2018

The changes mainly stet up the path to cl.exe in VS2017
(configure was genereated with omr/configure.ac via autoconf)

Reviewer: @keithc-ca , @pshipton
FYI: @DanHeidinga

@charliegracie
Copy link
Contributor

@genie-omr build all

@ChengJin01 ChengJin01 force-pushed the OMR_Fix_issues_JDK11_Windows branch from a96a222 to 7e1e58f Compare July 30, 2018 17:53
@charliegracie
Copy link
Contributor

@keithc-ca what are your thoughts on this change?

@charliegracie charliegracie self-assigned this Aug 1, 2018
]
diasdk_dir1="$vc_bin_dir/../../DIA SDK"
diasdk_dir2="$vc_bin_dir/../../../DIA SDK"
diasdk_dir3="$vc_bin_dir/../../../../../../../DIA SDK"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For diasdk_dir3, please provide example absolute paths that are covered by this addition.

Copy link
Author

@ChengJin01 ChengJin01 Aug 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diasdk_dir3 is used to cover the case of VS2017 (works for both Professional and Community version). The reason is that the path to cl.exe has changed on VS2017.

Administrator@JCHTORWIN101 /cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2017/Professional
$ ls
 Common7      'DIA SDK'         JS         SDK           VB    VSSDK
 CoreCon       ImportProjects   Licenses  'Team Tools'   VC    Web
 DesignTools   JavaScript       MSBuild    TS            VC#   Xml

Administrator@JCHTORWIN101 /cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2017/Professional
$ find . -name cl.exe
./VC/Tools/MSVC/14.14.26428/bin/Hostx64/x64/cl.exe
./VC/Tools/MSVC/14.14.26428/bin/Hostx64/x86/cl.exe
./VC/Tools/MSVC/14.14.26428/bin/Hostx86/x64/cl.exe
./VC/Tools/MSVC/14.14.26428/bin/Hostx86/x86/cl.exe

e.g.
In VS2017 Professional, the path to DIA SDK: C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\DIA SDK while vc_bin_dir is C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.14.26428\bin\Hostx86\x64\cl.exe. So, we need to step backwards from the path to cl.exe by 7 levels to reach the DIA SDK directory.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the explanation.

@keithc-ca
Copy link
Contributor

The change to PdbScanner.cpp looks good, although I would have preferred the case labels in alphabetical order.

@charliegracie
Copy link
Contributor

@genie-omr build all

@keithc-ca
Copy link
Contributor

I think the title of the commit and this PR should make it clearer that this is about improving DDR support to allow use of VS 2017.

@ChengJin01 ChengJin01 force-pushed the OMR_Fix_issues_JDK11_Windows branch from 7e1e58f to 3a37dfe Compare August 7, 2018 14:03
@ChengJin01
Copy link
Author

Already updated the title and the description of commit/PR.

The change is to improve DDR support in script/code
so as to allow use of VS 2017 on Windows.

Signed-off-by: CHENGJin <[email protected]>
@ChengJin01 ChengJin01 force-pushed the OMR_Fix_issues_JDK11_Windows branch from 3a37dfe to dfb5021 Compare August 7, 2018 14:11
@charliegracie
Copy link
Contributor

@genie-omr build all

@keithc-ca
Copy link
Contributor

@ChengJin01 Can this PR title be changed to match the commit message: 'Improve DDR support to allow use of VS 2017', please?

@ChengJin01 ChengJin01 changed the title Fix various config/code issues with JDK11 Improve DDR support to allow use of VS 2017 Aug 16, 2018
@ChengJin01
Copy link
Author

Already changed the PR's title.

@charliegracie charliegracie merged commit fb7d17a into eclipse-omr:master Aug 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants