Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Commit a276d55

Browse files
committed
Fix directory copy for gyp on Windows.
1 parent eb7c1e4 commit a276d55

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

appshell.gyp.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,7 @@
107107
# The '/' at the end of the 'files' directory is very important and magically
108108
# causes 'xcopy' to get used instead of 'copy' for recursive copies.
109109
# This seems to be an undocumented feature of gyp.
110-
# Also, the ../ before the PRODUCT_DIR variable is correct. Gyp doesn't seem to
111-
# munge paths properly when copying a nested subdirectory. This seems to be
112-
# an undocumented 'feature' of gyp.
113-
'destination': '../<(PRODUCT_DIR)',
110+
'destination': '<(PRODUCT_DIR)',
114111
'files': ['appshell/node-core/'],
115112
},
116113
{
@@ -120,7 +117,7 @@
120117
},
121118
{
122119
# Copy locales
123-
'destination': '../<(PRODUCT_DIR)',
120+
'destination': '<(PRODUCT_DIR)',
124121
'files': ['Resources/locales/'],
125122
}
126123
],

gyp/pylib/gyp/generator/msvs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@ def _GetCopies(spec):
15391539
src_bare = src[:-1]
15401540
base_dir = posixpath.split(src_bare)[0]
15411541
outer_dir = posixpath.split(src_bare)[1]
1542-
cmd = 'cd "%s" && xcopy /e /f /y "%s" "%s\\%s\\"' % (
1542+
cmd = 'xcopy /e /f /y "%s\\%s" "%s\\%s\\"' % (
15431543
_FixPath(base_dir), outer_dir, _FixPath(dst), outer_dir)
15441544
copies.append(([src], ['dummy_copies', dst], cmd,
15451545
'Copying %s to %s' % (src, dst)))

0 commit comments

Comments
 (0)