GeezerVison is showing github.com — tools: update gyp-next to v0.7.0 · nodejs/node@b367d5a
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: tools/gyp/CHANGELOG.md +19Lines changed: 19 additions & 0 deletions - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | # Changelog | 2 | 2 |
| | 3 | +## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17) | | 4 | + | | 5 | + | | 6 | +### ⚠ BREAKING CHANGES | | 7 | + | | 8 | +* **msvs:** On Windows, arguments passed to the "action" commands are no longer transformed to replace slashes with backslashes. | | 9 | + | | 10 | +### Features | | 11 | + | | 12 | +* **xcode:** --cross-compiling overrides arch-specific settings ([973bae0](https://www.github.com/nodejs/gyp-next/commit/973bae0b7b08be7b680ecae9565fbd04b3e0787d)) | | 13 | + | | 14 | + | | 15 | +### Bug Fixes | | 16 | + | | 17 | +* **msvs:** do not fix paths in action command arguments ([fc22f83](https://www.github.com/nodejs/gyp-next/commit/fc22f8335e2016da4aae4f4233074bd651d2faea)) | | 18 | +* cmake on python 3 ([fd61f5f](https://www.github.com/nodejs/gyp-next/commit/fd61f5faa5275ec8fc98e3c7868c0dd46f109540)) | | 19 | +* ValueError: invalid mode: 'rU' while trying to load binding.gyp ([d0504e6](https://www.github.com/nodejs/gyp-next/commit/d0504e6700ce48f44957a4d5891b142a60be946f)) | | 20 | +* xcode cmake parsing ([eefe8d1](https://www.github.com/nodejs/gyp-next/commit/eefe8d10e99863bc4ac7e2ed32facd608d400d4b)) | | 21 | + | 3 | 22 | ### [0.6.2](https://www.github.com/nodejs/gyp-next/compare/v0.6.1...v0.6.2) (2020-10-16) | 4 | 23 |
| 5 | 24 |
| |
Collapse file Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/cmake.py +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 41 | 41 | try: | 42 | 42 | # maketrans moved to str in python3. | 43 | 43 | _maketrans = string.maketrans | 44 | | -except NameError: | | 44 | +except (NameError, AttributeError): | 45 | 45 | _maketrans = str.maketrans | 46 | 46 |
| 47 | 47 | generator_default_variables = { | @@ -1047,7 +1047,7 @@ def WriteTarget( | 1047 | 1047 |
| 1048 | 1048 | # XCode settings | 1049 | 1049 | xcode_settings = config.get("xcode_settings", {}) | 1050 | | - for xcode_setting, xcode_value in xcode_settings.viewitems(): | | 1050 | + for xcode_setting, xcode_value in xcode_settings.items(): | 1051 | 1051 | SetTargetProperty( | 1052 | 1052 | output, | 1053 | 1053 | cmake_target_name, | |
Collapse file Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/msvs.py +1-7Lines changed: 1 addition & 7 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -423,13 +423,7 @@ def _BuildCommandLineForRuleRaw( | 423 | 423 | # file out of the raw command string, and some commands (like python) are | 424 | 424 | # actually batch files themselves. | 425 | 425 | command.insert(0, "call") | 426 | | - # Fix the paths | 427 | | - # TODO(quote): This is a really ugly heuristic, and will miss path fixing | 428 | | - # for arguments like "--arg=path" or "/opt:path". | 429 | | - # If the argument starts with a slash or dash, it's probably a command line | 430 | | - # switch | 431 | | - arguments = [i if (i[:1] in "/-") else _FixPath(i) for i in cmd[1:]] | 432 | | - arguments = [i.replace("$(InputDir)", "%INPUTDIR%") for i in arguments] | | 426 | + arguments = [i.replace("$(InputDir)", "%INPUTDIR%") for i in cmd[1:]] | 433 | 427 | arguments = [MSVSSettings.FixVCMacroSlashes(i) for i in arguments] | 434 | 428 | if quote_cmd: | 435 | 429 | # Support a mode for using cmd directly. | |
Collapse file Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/input.py +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -231,7 +231,7 @@ def LoadOneBuildFile(build_file_path, data, aux_data, includes, is_target, check | 231 | 231 | # Open the build file for read ('r') with universal-newlines mode ('U') | 232 | 232 | # to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n' | 233 | 233 | # which otherwise will fail eval() | 234 | | - if sys.platform == "zos": | | 234 | + if PY3 or sys.platform == "zos": | 235 | 235 | # On z/OS, universal-newlines mode treats the file as an ascii file. | 236 | 236 | # But since node-gyp produces ebcdic files, do not use that mode. | 237 | 237 | build_file_contents = open(build_file_path, "r").read() | |
Collapse file Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/xcode_emulation.py +37-32Lines changed: 37 additions & 32 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -654,28 +654,32 @@ def GetCflags(self, configname, arch=None): | 654 | 654 | self._WarnUnimplemented("MACH_O_TYPE") | 655 | 655 | self._WarnUnimplemented("PRODUCT_TYPE") | 656 | 656 |
| 657 | | - if arch is not None: | 658 | | - archs = [arch] | 659 | | - else: | 660 | | - assert self.configname | 661 | | - archs = self.GetActiveArchs(self.configname) | 662 | | - if len(archs) != 1: | 663 | | - # TODO: Supporting fat binaries will be annoying. | 664 | | - self._WarnUnimplemented("ARCHS") | 665 | | - archs = ["i386"] | 666 | | - cflags.append("-arch " + archs[0]) | 667 | | - | 668 | | - if archs[0] in ("i386", "x86_64"): | 669 | | - if self._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"): | 670 | | - cflags.append("-msse3") | 671 | | - if self._Test( | 672 | | - "GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO" | 673 | | - ): | 674 | | - cflags.append("-mssse3") # Note 3rd 's'. | 675 | | - if self._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"): | 676 | | - cflags.append("-msse4.1") | 677 | | - if self._Test("GCC_ENABLE_SSE42_EXTENSIONS", "YES", default="NO"): | 678 | | - cflags.append("-msse4.2") | | 657 | + # If GYP_CROSSCOMPILE (--cross-compiling), disable architecture-specific | | 658 | + # additions and assume these will be provided as required via CC_host, | | 659 | + # CXX_host, CC_target and CXX_target. | | 660 | + if not gyp.common.CrossCompileRequested(): | | 661 | + if arch is not None: | | 662 | + archs = [arch] | | 663 | + else: | | 664 | + assert self.configname | | 665 | + archs = self.GetActiveArchs(self.configname) | | 666 | + if len(archs) != 1: | | 667 | + # TODO: Supporting fat binaries will be annoying. | | 668 | + self._WarnUnimplemented("ARCHS") | | 669 | + archs = ["i386"] | | 670 | + cflags.append("-arch " + archs[0]) | | 671 | + | | 672 | + if archs[0] in ("i386", "x86_64"): | | 673 | + if self._Test("GCC_ENABLE_SSE3_EXTENSIONS", "YES", default="NO"): | | 674 | + cflags.append("-msse3") | | 675 | + if self._Test( | | 676 | + "GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS", "YES", default="NO" | | 677 | + ): | | 678 | + cflags.append("-mssse3") # Note 3rd 's'. | | 679 | + if self._Test("GCC_ENABLE_SSE41_EXTENSIONS", "YES", default="NO"): | | 680 | + cflags.append("-msse4.1") | | 681 | + if self._Test("GCC_ENABLE_SSE42_EXTENSIONS", "YES", default="NO"): | | 682 | + cflags.append("-msse4.2") | 679 | 683 |
| 680 | 684 | cflags += self._Settings().get("WARNING_CFLAGS", []) | 681 | 685 |
| @@ -938,16 +942,17 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None): | 938 | 942 | + gyp_to_build_path(self._Settings()["ORDER_FILE"]) | 939 | 943 | ) | 940 | 944 |
| 941 | | - if arch is not None: | 942 | | - archs = [arch] | 943 | | - else: | 944 | | - assert self.configname | 945 | | - archs = self.GetActiveArchs(self.configname) | 946 | | - if len(archs) != 1: | 947 | | - # TODO: Supporting fat binaries will be annoying. | 948 | | - self._WarnUnimplemented("ARCHS") | 949 | | - archs = ["i386"] | 950 | | - ldflags.append("-arch " + archs[0]) | | 945 | + if not gyp.common.CrossCompileRequested(): | | 946 | + if arch is not None: | | 947 | + archs = [arch] | | 948 | + else: | | 949 | + assert self.configname | | 950 | + archs = self.GetActiveArchs(self.configname) | | 951 | + if len(archs) != 1: | | 952 | + # TODO: Supporting fat binaries will be annoying. | | 953 | + self._WarnUnimplemented("ARCHS") | | 954 | + archs = ["i386"] | | 955 | + ldflags.append("-arch " + archs[0]) | 951 | 956 |
| 952 | 957 | # Xcode adds the product directory by default. | 953 | 958 | # Rewrite -L. to -L./ to work around http://www.openradar.me/25313838 | |
Collapse file Copy file name to clipboard100755100644 Expand all lines: tools/gyp/setup.py +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 15 | 15 |
| 16 | 16 | setup( | 17 | 17 | name="gyp-next", | 18 | | - version="0.6.2", | | 18 | + version="0.7.0", | 19 | 19 | description="A fork of the GYP build system for use in the Node.js projects", | 20 | 20 | long_description=long_description, | 21 | 21 | long_description_content_type="text/markdown", | |
Collapse file Copy file name to clipboardExpand all lines: tools/js2c.py +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -123,7 +123,7 @@ def AddModule(filename, definitions, initializers): | 123 | 123 | initializers.append(initializer) | 124 | 124 |
| 125 | 125 | def NormalizeFileName(filename): | 126 | | - split = filename.split(os.path.sep) | | 126 | + split = filename.split('/') | 127 | 127 | if split[0] == 'deps': | 128 | 128 | split = ['internal'] + split | 129 | 129 | else: # `lib/**/*.js` so drop the 'lib' part | |
|