Fix compilation on windows #7074
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since this commit VS2022 with v141 tools and Windows SDK 10.0.19041.0 is required to build RethinkDB on windows. VS2015 no longer has to be installed.
Required for compilation on windows. This commit also removes old gtest source files from this repo, as no-fetch approach is no longer valid.
Original quickjs doesn't support MSVC compiler, hence this change is required for windows build.
- adjust includes - fix metadata_file_t namespacing - fix remove_directory_helper function
Drops the requirement to install cmake explicitly
points out new requirements
srh
approved these changes
Jun 13, 2022
Contributor
srh
left a comment
srh
left a comment
There was a problem hiding this comment.
It looks great! I've left notes for myself for some petty fix-ups after merging.
| @@ -86,6 +86,8 @@ | |||
| RAPIDJSON_HAS_STDSTRING; | |||
| RAPIDJSON_PARSE_DEFAULT_FLAGS=kParseFullPrecisionFlag; | |||
| BOOST_DATE_TIME_NO_LIB; | |||
| JS_STRICT_NAN_BOXING; | |||
Contributor
There was a problem hiding this comment.
Note to self to review what this does.
| @@ -86,6 +86,8 @@ | |||
| RAPIDJSON_HAS_STDSTRING; | |||
| RAPIDJSON_PARSE_DEFAULT_FLAGS=kParseFullPrecisionFlag; | |||
| BOOST_DATE_TIME_NO_LIB; | |||
| JS_STRICT_NAN_BOXING; | |||
| CURL_STATICLIB; | |||
Contributor
There was a problem hiding this comment.
Got this.
c:\cygwin64\home\sam\rethinkdb\src\extproc\http_job.cc(8): warning C4005: 'CURL_STATICLIB': macro redefinition [C:\cygwin64\home\sam\rethinkd
b\rethinkdb.vcxproj]
c:\cygwin64\home\sam\rethinkdb\src\extproc\http_job.cc: note: see previous definition of 'CURL_STATICLIB'
|
|
||
| project "quickjs" | ||
| language "C" | ||
| + staticruntime "on" |
Contributor
There was a problem hiding this comment.
Sounds... fine? Noting to review this...
| @@ -270,7 +270,7 @@ with_vs_env () { | |||
| # GNU make sets $MAKE and $MAKEFLAGS to values that are not | |||
| # compatible with Windows' nmake | |||
|
|
|||
| env -u MAKE -u MAKEFLAGS cmd /c "$vcvarsall" "$machine" "&&" "$@" | |||
| env -u MAKE -u MAKEFLAGS cmd /c "$vcvarsall" "$machine" "--vcvars_ver=14.1" "&&" "$@" | |||
Contributor
There was a problem hiding this comment.
There's some v141, 14.1, etc. constants around. It might be a good idea to either define these as constants somewhere or leave a comment providing search terms to grep the repository for these strings.
This was referenced Aug 8, 2022
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR revives the windows support, which was dropped after the 2.3.6 release. I'm keeping this on a separate branch because some time is still needed to audit quickjspp code changes.
Since this PR, windows build additionally requires:
Visual Studio 2015 and CMake installed globally are no longer required. Instructions in WINDOWS.md have been updated.
List of changes
Issues
JSProc.InfiniteRecursionFunctiontest fails.Special thanks to @MrBoombastic for an idea and help with testing.