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

Fix older VS compatibility issues and PDB files generation issue. #1435

Merged
merged 7 commits into from
Nov 7, 2018

Conversation

ikifof
Copy link
Contributor

@ikifof ikifof commented May 1, 2018

This fixes several windows builds related issue:

  • the issue MSVC 12 bot broken after high-res timestamp change #1411 (with visual studio 2013 and earlier);
  • another compilation issue with VS2012 (strtoll not defined)
  • the PDB files related warnings when building ninja/ninja_test by providing a unique name per library/binary for the PDB file.

configure.py Outdated Show resolved Hide resolved
src/deps_log.cc Outdated Show resolved Hide resolved
src/build_log.cc Show resolved Hide resolved
@jhasse jhasse added the windows label Oct 29, 2018
configure.py Outdated Show resolved Hide resolved
@jhasse
Copy link
Collaborator

jhasse commented Nov 5, 2018

Looks like you merge the changes? Can you do

git rebase origin/master
git push ikifof issue1411_MSVC12_broken --force

?

(I'm assuming that origin is https://github.com/ninja-build/ninja.git and ikifof is your fork)

@ikifof ikifof force-pushed the issue1411_MSVC12_broken branch from 11276c2 to 5dce088 Compare November 5, 2018 23:46
@ikifof
Copy link
Contributor Author

ikifof commented Nov 5, 2018

Did I do something wrong? I hope not... Git has some cool features... but way too uselessly complex... :(

I just ran the 2 commands you gave. I think I answered all your review comments but somehow the CR summary still shows an open request... Let me know if I need to do something.

Note that the MinGW build has some bad warnings and fails the disk_interface_test that was disabled for msvc only. It probably should be disabled on windows.

@jhasse
Copy link
Collaborator

jhasse commented Nov 5, 2018

What's your output of git remote -v?

the disk_interface_test that was disabled for msvc only. It probably should be disabled on windows.

Will do that tomorrow.

@ikifof
Copy link
Contributor Author

ikifof commented Nov 6, 2018

@jhasse
Copy link
Collaborator

jhasse commented Nov 6, 2018

Ah! Run these then please:

git rebase upstream/master
git push origin issue1411_MSVC12_broken --force

@ikifof ikifof force-pushed the issue1411_MSVC12_broken branch from 5dce088 to 6ec1c13 Compare November 6, 2018 00:02
@ikifof
Copy link
Contributor Author

ikifof commented Nov 6, 2018

Let me know if I need to do anything else. I can create a new clean pull request if I made things complicated by messing up this one.

@jhasse jhasse merged commit 0db30f2 into ninja-build:master Nov 7, 2018
@jhasse
Copy link
Collaborator

jhasse commented Nov 7, 2018

No it's okay, I squashed the commits using GitHub. Thank you!

@ikifof
Copy link
Contributor Author

ikifof commented Nov 7, 2018

Thanks!

mydongistiny pushed a commit to mydongistiny/ninja that referenced this pull request Oct 1, 2019
This is a merge of upstream master up until this dep file parsing
change, which will need more verification given our depfiles:
  ninja-build#1039

The biggest change in this merge is probably the use of 64-bit
timestamps.

* commit '5a78423193c48cae4800eb1ec44b62d14ae03920': (80 commits)
  Add OSX build on travis (ninja-build#1502)
  Fit --help output into 80 columns and move verbose up, fix ninja-build#1500
  Improve error message when Python wasn't found for the browse tool
  Explain why there's no browse tool, fix ninja-build#1478
  HACKING: use `Python` for the project
  HACKING: fix some whitespace nits
  Fix rendering of code block, fix ninja-build#955
  Make -j 0 run unlimited parallel builds, fix ninja-build#1309
  Enable ANSI escape sequences on Windows 10 terminals
  Add --verbose as an alternative spelling for -v, fix ninja-build#1310
  Add unit test for ninja-build#1491
  Allow disabling of escape code stripping, fix ninja-build#1475
  subprocess-win32: add hint on ERROR_INVALID_PARAMETER
  Win32Fatal: support a "hint" for the error
  manual: mention the "invalid parameter" case
  util: don't add ellipses width when deciding if they're necessary
  Verify GetFullPathName return value
  Make output_test.py independent of the environment
  Fix older VS compatibility issues and PDB files generation issue. (ninja-build#1435)
  Fix parsing some special chars in depfiles
  ...

Change-Id: I315385cecc748ff351614792a9921ec87e5f4cf3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants