Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: plugin/build.scons

Issue 174369: Linux: fix a couple problems that Lintian reports for the .deb file:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « installer/linux/generic/setup.sh ('k') | site_scons/site_tools/component_builders.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2009, Google Inc. 1 # Copyright 2009, Google Inc.
2 # All rights reserved. 2 # All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 238
239 if env.Bit('linux'): 239 if env.Bit('linux'):
240 env_idlglue.Append(CPPDEFINES=['OS_LINUX']) 240 env_idlglue.Append(CPPDEFINES=['OS_LINUX'])
241 inputs += [env_idlglue.SharedObject(s, '$NIXYSA_STATIC_GLUE/%s.cc' % s) 241 inputs += [env_idlglue.SharedObject(s, '$NIXYSA_STATIC_GLUE/%s.cc' % s)
242 for s in idlglue_static_sources] 242 for s in idlglue_static_sources]
243 inputs += env_version.SharedObject('cross/main', 'cross/main.cc') 243 inputs += env_version.SharedObject('cross/main', 'cross/main.cc')
244 inputs += [ 244 inputs += [
245 'linux/main_linux.cc', 245 'linux/main_linux.cc',
246 'linux/config.cc', 246 'linux/config.cc',
247 ] 247 ]
248 # This sets the rpath property on the generated shared object, which specifies
249 # additional paths that the run-time linker/loader will search for its
250 # dependent shared libraries. We install libGLEW, libCg, and libCgGL to here.
251 env.Append(RPATH=['/opt/google/o3d/lib'])
248 252
249 253
250 # SCons doesn't really know about MacOSX bundles, so we need to override a 254 # SCons doesn't really know about MacOSX bundles, so we need to override a
251 # lot of its behavior to make one, ie -bundle flag, no lib prefix, no .dylib suf fix. 255 # lot of its behavior to make one, ie -bundle flag, no lib prefix, no .dylib suf fix.
252 if env.Bit('mac'): 256 if env.Bit('mac'):
253 breakpad_framework = env.Command( 257 breakpad_framework = env.Command(
254 env.Dir('$MAC_BREAKPAD_DIR/Breakpad.framework'), 258 env.Dir('$MAC_BREAKPAD_DIR/Breakpad.framework'),
255 env.Dir('$MAC_BREAKPAD_SRC_DIR/Breakpad.xcodeproj'), 259 env.Dir('$MAC_BREAKPAD_SRC_DIR/Breakpad.xcodeproj'),
256 ' '.join(['cd $MAC_BREAKPAD_SRC_DIR &&', 260 ' '.join(['cd $MAC_BREAKPAD_SRC_DIR &&',
257 'xcodebuild', 261 'xcodebuild',
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 if os.path.exists(swiftshader_path): 430 if os.path.exists(swiftshader_path):
427 env.Requires(plugin_install, 431 env.Requires(plugin_install,
428 env.Replicate('$FIREFOX_PLUGIN_DIR/O3DExtras', swiftshader_path)) 432 env.Replicate('$FIREFOX_PLUGIN_DIR/O3DExtras', swiftshader_path))
429 433
430 if env.Bit('windows'): 434 if env.Bit('windows'):
431 # Make the logging program 435 # Make the logging program
432 exe = env.ComponentProgram('statsLogger', 436 exe = env.ComponentProgram('statsLogger',
433 logging_lib + ['win/logger_main.cc']) 437 logging_lib + ['win/logger_main.cc'])
434 # Copy the resulting executable to the Artifacts directory. 438 # Copy the resulting executable to the Artifacts directory.
435 env.Replicate('$ARTIFACTS_DIR', [exe]) 439 env.Replicate('$ARTIFACTS_DIR', [exe])
OLDNEW
« no previous file with comments | « installer/linux/generic/setup.sh ('k') | site_scons/site_tools/component_builders.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698