| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # TODO(polina): for Mac build check if no longer need .r files and/or document | 6 # TODO(polina): for Mac build check if no longer need .r files and/or document |
| 7 # target browsers for each bundle target. | 7 # target browsers for each bundle target. |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 # site_scons/site_tools/target_platform_mac.py | 165 # site_scons/site_tools/target_platform_mac.py |
| 166 bundle_name = '${STAGING_DIR}/' + ppNaClPlugin + '.bundle' | 166 bundle_name = '${STAGING_DIR}/' + ppNaClPlugin + '.bundle' |
| 167 plugin_env.Bundle(bundle_name, | 167 plugin_env.Bundle(bundle_name, |
| 168 BUNDLE_EXE = ppapi_plugin, | 168 BUNDLE_EXE = ppapi_plugin, |
| 169 BUNDLE_PKGINFO_FILENAME = 0, | 169 BUNDLE_PKGINFO_FILENAME = 0, |
| 170 BUNDLE_RESOURCES = 'ppNaClPlugin.rsrc', | 170 BUNDLE_RESOURCES = 'ppNaClPlugin.rsrc', |
| 171 BUNDLE_INFO_PLIST = 'osx_ppapi/Info.plist') | 171 BUNDLE_INFO_PLIST = 'osx_ppapi/Info.plist') |
| 172 | 172 |
| 173 plugin_env.Alias('plugin', plugin_env.GetPPAPIPluginPath(False)) | 173 plugin_env.Alias('plugin', plugin_env.GetPPAPIPluginPath(False)) |
| 174 | 174 |
| 175 if env.Bit('windows'): | |
| 176 env.SDKInstallBin(ppNaClPlugin + '.dll', ppapi_plugin) | |
| 177 else: | |
| 178 env.SDKInstallBin(ppNaClPlugin + '.so', ppapi_plugin) | |
| 179 | 175 |
| 180 ############################################################################### | 176 ############################################################################### |
| 181 # PPAPI Plugin Test | 177 # PPAPI Plugin Test |
| 182 ############################################################################### | 178 ############################################################################### |
| 183 | 179 |
| 184 # Rather than link ppNaClPlugin statically, this unittest uses the dynamic | 180 # Rather than link ppNaClPlugin statically, this unittest uses the dynamic |
| 185 # library. Note that these tests do not yet run on ARM. | 181 # library. Note that these tests do not yet run on ARM. |
| 186 unittest_sources = ['dylib_unittest.cc', 'plugin_unittest.cc'] | 182 unittest_sources = ['dylib_unittest.cc', 'plugin_unittest.cc'] |
| 187 if env.Bit('target_x86'): | 183 if env.Bit('target_x86'): |
| 188 if env.Bit('linux'): | 184 if env.Bit('linux'): |
| 189 unittest = env.ComponentProgram('ppapi_plugin_unittest', | 185 unittest = env.ComponentProgram('ppapi_plugin_unittest', |
| 190 unittest_sources, | 186 unittest_sources, |
| 191 no_import_lib=True, | 187 no_import_lib=True, |
| 192 EXTRA_LIBS=['dl']) | 188 EXTRA_LIBS=['dl']) |
| 193 elif env.Bit('mac'): | 189 elif env.Bit('mac'): |
| 194 unittest = env.ComponentProgram('ppapi_plugin_unittest', unittest_sources) | 190 unittest = env.ComponentProgram('ppapi_plugin_unittest', unittest_sources) |
| 195 elif env.Bit('windows'): | 191 elif env.Bit('windows'): |
| 196 unittest = env.ComponentProgram('ppapi_plugin_unittest', | 192 unittest = env.ComponentProgram('ppapi_plugin_unittest', |
| 197 unittest_sources, | 193 unittest_sources, |
| 198 no_import_lib=True) | 194 no_import_lib=True) |
| 199 node = env.CommandTest('ppapi_plugin_unittest.out', | 195 node = env.CommandTest('ppapi_plugin_unittest.out', |
| 200 command=[unittest, | 196 command=[unittest, |
| 201 ppapi_plugin, | 197 ppapi_plugin, |
| 202 env['BUILD_ISA_NAME']]) | 198 env['BUILD_ISA_NAME']]) |
| 203 env.AddNodeToTestSuite(node, ['small_tests'], 'run_ppapi_plugin_unittest') | 199 env.AddNodeToTestSuite(node, ['small_tests'], 'run_ppapi_plugin_unittest') |
| 204 | 200 |
| 205 | 201 |
| 206 # TODO(polina,sehr): add a test for the PPAPI plugin on ARM. | 202 # TODO(polina,sehr): add a test for the PPAPI plugin on ARM. |
| OLD | NEW |