OLD | NEW |
1 # Copyright (c) 2012 Google Inc. All rights reserved. | 1 # Copyright (c) 2012 Google Inc. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import copy | 5 import copy |
6 import gyp | 6 import gyp |
7 import gyp.common | 7 import gyp.common |
8 import gyp.msvs_emulation | 8 import gyp.msvs_emulation |
9 import gyp.MSVSVersion | 9 import gyp.MSVSVersion |
10 import gyp.system_test | 10 import gyp.system_test |
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
942 if is_command_start: | 942 if is_command_start: |
943 return '(' + command_string + ' && ' | 943 return '(' + command_string + ' && ' |
944 else: | 944 else: |
945 return '$ && (' + command_string | 945 return '$ && (' + command_string |
946 | 946 |
947 def ComputeExportEnvString(self, env): | 947 def ComputeExportEnvString(self, env): |
948 """Given an environment, returns a string looking like | 948 """Given an environment, returns a string looking like |
949 'export FOO=foo; export BAR="${FOO} bar;' | 949 'export FOO=foo; export BAR="${FOO} bar;' |
950 that exports |env| to the shell.""" | 950 that exports |env| to the shell.""" |
951 export_str = [] | 951 export_str = [] |
952 for k in gyp.xcode_emulation.TopologicallySortedEnvVarKeys(env): | 952 for k in reversed(gyp.xcode_emulation.TopologicallySortedEnvVarKeys(env)): |
953 export_str.append('export %s=%s;' % | 953 export_str.append('export %s=%s;' % |
954 (k, ninja_syntax.escape(gyp.common.EncodePOSIXShellArgument(env[k])))) | 954 (k, ninja_syntax.escape(gyp.common.EncodePOSIXShellArgument(env[k])))) |
955 return ' '.join(export_str) | 955 return ' '.join(export_str) |
956 | 956 |
957 def ComputeMacBundleOutput(self): | 957 def ComputeMacBundleOutput(self): |
958 """Return the 'output' (full output path) to a bundle output directory.""" | 958 """Return the 'output' (full output path) to a bundle output directory.""" |
959 assert self.is_mac_bundle | 959 assert self.is_mac_bundle |
960 path = self.ExpandSpecial(generator_default_variables['PRODUCT_DIR']) | 960 path = self.ExpandSpecial(generator_default_variables['PRODUCT_DIR']) |
961 return os.path.join(path, self.xcode_settings.GetWrapperName()) | 961 return os.path.join(path, self.xcode_settings.GetWrapperName()) |
962 | 962 |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1483 | 1483 |
1484 user_config = params.get('generator_flags', {}).get('config', None) | 1484 user_config = params.get('generator_flags', {}).get('config', None) |
1485 if user_config: | 1485 if user_config: |
1486 GenerateOutputForConfig(target_list, target_dicts, data, params, | 1486 GenerateOutputForConfig(target_list, target_dicts, data, params, |
1487 user_config) | 1487 user_config) |
1488 else: | 1488 else: |
1489 config_names = target_dicts[target_list[0]]['configurations'].keys() | 1489 config_names = target_dicts[target_list[0]]['configurations'].keys() |
1490 for config_name in config_names: | 1490 for config_name in config_names: |
1491 GenerateOutputForConfig(target_list, target_dicts, data, params, | 1491 GenerateOutputForConfig(target_list, target_dicts, data, params, |
1492 config_name) | 1492 config_name) |
OLD | NEW |