diff options
| -rw-r--r-- | remoting/host/win/chromoting.wxs (renamed from remoting/host/installer/chromoting.wxs) | 0 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 10 | ||||
| -rwxr-xr-x | remoting/tools/candle_and_light.py (renamed from remoting/candle_and_light.py) | 0 | ||||
| -rwxr-xr-x | remoting/tools/dark_and_candle_and_light.py (renamed from remoting/dark_and_candle_and_light.py) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/installer/chromoting.wxs b/remoting/host/win/chromoting.wxs index 2f5d811..2f5d811 100644 --- a/remoting/host/installer/chromoting.wxs +++ b/remoting/host/win/chromoting.wxs diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index d44361b..01e5bea 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -727,7 +727,7 @@ 'remoting_me2me_host', ], 'sources': [ - 'host/installer/chromoting.wxs', + 'host/win/chromoting.wxs', ], 'outputs': [ '<(PRODUCT_DIR)/chromoting.msi', @@ -752,14 +752,14 @@ '<(PRODUCT_DIR)/remoting_service.exe', '<(sas_dll_path)/sas.dll', 'resources/chromoting.ico', - 'candle_and_light.py', + 'tools/candle_and_light.py', ], 'outputs': [ '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', ], 'msvs_cygwin_shell': 0, 'action': [ - 'python', 'candle_and_light.py', + 'python', 'tools/candle_and_light.py', '--wix_path', '<(wix_path)', '--version', '<(version_full)', '--product_dir', '<(PRODUCT_DIR).', @@ -800,7 +800,7 @@ 'rule_name': 'dark_and_candle_and_light', 'extension': 'msi', 'inputs': [ - 'dark_and_candle_and_light.py', + 'tools/dark_and_candle_and_light.py', ], 'outputs': [ '<(INTERMEDIATE_DIR)/chromoting-test.msi', @@ -808,7 +808,7 @@ 'msvs_cygwin_shell': 0, 'action': [ 'python', - 'dark_and_candle_and_light.py', + 'tools/dark_and_candle_and_light.py', '--wix_path', '<(wix_path)', '--input', '<(RULE_INPUT_PATH)', '--intermediate_dir', '<(INTERMEDIATE_DIR).', diff --git a/remoting/candle_and_light.py b/remoting/tools/candle_and_light.py index 056bffd..056bffd 100755 --- a/remoting/candle_and_light.py +++ b/remoting/tools/candle_and_light.py diff --git a/remoting/dark_and_candle_and_light.py b/remoting/tools/dark_and_candle_and_light.py index c3858cc..c3858cc 100755 --- a/remoting/dark_and_candle_and_light.py +++ b/remoting/tools/dark_and_candle_and_light.py |