Fix incorrect path usage in generate_projects.

We should use the cross-platform os.path.join() to support platforms other than Windows. BUG=angle:577 Change-Id: I9d96fc1b13731a57ffcd97469632f0acedb8e5c7 Reviewed-on: https://chromium-review.googlesource.com/188879Reviewed-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Shannon Woods <shannonwoods@chromium.org> Conflicts: generate_projects Change-Id: I76cacb8ee3acf477c0e99cd73cf91622efc3c9b4 Reviewed-on: https://chromium-review.googlesource.com/189131Tested-by: Shannon Woods <shannonwoods@chromium.org> Reviewed-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix incorrect path usage in generate_projects.
72b16b25 · Jamie Madill · Shannon Woods · 9a2e5b94 · 72b16b25 · 72b16b25
Commit 72b16b25 authored Mar 06, 2014 by Jamie Madill Committed by Shannon Woods Mar 14, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

generate_projects generate_projects +1 -1

angle.gypi src/angle.gypi +4 -4

No files found.
--- a/generate_projects
+++ b/generate_projects
@@ -33,7 +33,7 @@ if __name__ == '__main__':
    gyp_cmd += ' -G msvs_version=' + msvs_version
    gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0')
    gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0')
-    gyp_cmd += ' -D angle_relative_src_path=..\\..\\src\\'
+    gyp_cmd += ' -D angle_relative_src_path=' + os.path.join('..', '..', 'src')
    gyp_cmd += ' -D release_symbols=' + ('true' if release_symbols else 'false')
    gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp')

--- a/src/angle.gypi
+++ b/src/angle.gypi
@@ -7,7 +7,7 @@
    {
        'angle_code': 1,
        'angle_post_build_script%': 0,
-        'angle_relative_src_path%': '',
+        'angle_relative_src_path%': '.',
        'angle_build_scripts_path': '..',
    },
@@ -38,7 +38,7 @@
                                'message': 'Generating commit ID header...',
                                'inputs': [ 'commit_id.bat' ],
                                'outputs': ['<(SHARED_INTERMEDIATE_DIR)/commit.h'],
-                                'action': ['<(angle_relative_src_path)commit_id.bat', '<(SHARED_INTERMEDIATE_DIR)'],
+                                'action': ['<(angle_relative_src_path)/commit_id.bat', '<(SHARED_INTERMEDIATE_DIR)'],
                            }
                        ] #actions
                    },
@@ -54,7 +54,7 @@
                                'message': 'Copying D3D Compiler DLL...',
                                'inputs': [ 'copy_compiler_dll.bat' ],
                                'outputs': [ '<(PRODUCT_DIR)/D3DCompiler_46.dll' ],
-                                'action': ["<(angle_relative_src_path)copy_compiler_dll.bat", "$(PlatformName)", "<(windows_sdk_path)", "<(PRODUCT_DIR)" ],
+                                'action': ["<(angle_relative_src_path)/copy_compiler_dll.bat", "$(PlatformName)", "<(windows_sdk_path)", "<(PRODUCT_DIR)" ],
                            }
                        ] #actions
                    },
@@ -103,7 +103,7 @@
                                'message': 'Generating commit ID header...',
                                'inputs': [ 'commit_id.py' ],
                                'outputs': ['<(SHARED_INTERMEDIATE_DIR)/commit.h'],
-                                'action': ['python', '<(angle_relative_src_path)commit_id.py', '<(SHARED_INTERMEDIATE_DIR)/commit.h'],
+                                'action': ['python', '<(angle_relative_src_path)/commit_id.py', '<(SHARED_INTERMEDIATE_DIR)/commit.h'],
                            }
                        ] #actions
                    },