diff options
author | chrisha@chromium.org <chrisha@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2014-04-03 18:34:24 +0000 |
---|---|---|
committer | chrisha@chromium.org <chrisha@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2014-04-03 18:34:24 +0000 |
commit | 611f8b7f32397768e57d88daf264ec1452eb6e9e (patch) | |
tree | f81714dce0a47121c27503130a623aca13bf264e | |
parent | Fix ElfCoreDumpTest.ValidCoreFile unit test. (diff) | |
download | breakpad-611f8b7f32397768e57d88daf264ec1452eb6e9e.tar.xz |
Move build configuration to root of repository.
This is in preparation for creating GYP build files for each platform.
BUG=https://code.google.com/p/google-breakpad/issues/detail?id=575
R=mark@chromium.org
Review URL: https://breakpad.appspot.com/1414002
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1304 4c0a9323-5329-0410-9bdc-e9ce6186880e
18 files changed, 24 insertions, 45 deletions
@@ -1,4 +1,4 @@ -# Copyright 2014, Google Inc. All rights reserved. +# Copyright 2014 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -30,6 +30,7 @@ *.filters *.sdf *.sln +*.suo *.vcproj *.vcxproj @@ -1,4 +1,4 @@ -# Copyright 2010, Google Inc. All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are diff --git a/src/client/windows/build/common.gypi b/build/common.gypi index 2c792d54..52d5686e 100644 --- a/src/client/windows/build/common.gypi +++ b/build/common.gypi @@ -1,5 +1,4 @@ -# Copyright (c) 2010, Google Inc. -# All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -1324,9 +1323,3 @@ 'SYMROOT': '<(DEPTH)/xcodebuild', }, } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/src/client/windows/build/external_code.gypi b/build/external_code.gypi index 906cfe03..57fa8805 100644 --- a/src/client/windows/build/external_code.gypi +++ b/build/external_code.gypi @@ -1,5 +1,4 @@ -# Copyright (c) 2010, Google Inc. -# All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -63,9 +62,3 @@ }], ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/src/client/windows/build/internal/release_defaults.gypi b/build/internal/release_defaults.gypi index 1bf6bbee..1bf6bbee 100644 --- a/src/client/windows/build/internal/release_defaults.gypi +++ b/build/internal/release_defaults.gypi diff --git a/src/client/windows/build/internal/release_impl.gypi b/build/internal/release_impl.gypi index aff06dc6..aff06dc6 100644 --- a/src/client/windows/build/internal/release_impl.gypi +++ b/build/internal/release_impl.gypi diff --git a/src/client/windows/build/internal/release_impl_official.gypi b/build/internal/release_impl_official.gypi index 18f79282..18f79282 100644 --- a/src/client/windows/build/internal/release_impl_official.gypi +++ b/build/internal/release_impl_official.gypi diff --git a/src/client/windows/build/release.gypi b/build/release.gypi index c12526b8..4b012b51 100644 --- a/src/client/windows/build/release.gypi +++ b/build/release.gypi @@ -16,4 +16,3 @@ # purify ], } - diff --git a/src/client/windows/breakpad_client.gyp b/src/client/windows/breakpad_client.gyp index ae26b91d..0c52d86e 100644 --- a/src/client/windows/breakpad_client.gyp +++ b/src/client/windows/breakpad_client.gyp @@ -1,5 +1,4 @@ -# Copyright (c) 2010, Google Inc. -# All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -29,7 +28,7 @@ { 'includes': [ - 'build/common.gypi', + '../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/crash_generation/crash_generation.gyp b/src/client/windows/crash_generation/crash_generation.gyp index 23862d75..3293110f 100644 --- a/src/client/windows/crash_generation/crash_generation.gyp +++ b/src/client/windows/crash_generation/crash_generation.gyp @@ -1,5 +1,4 @@ -# Copyright (c) 2010, Google Inc. -# All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -29,7 +28,7 @@ { 'includes': [ - '../build/common.gypi', + '../../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/handler/exception_handler.gyp b/src/client/windows/handler/exception_handler.gyp index 77293627..5d052d0c 100644 --- a/src/client/windows/handler/exception_handler.gyp +++ b/src/client/windows/handler/exception_handler.gyp @@ -1,5 +1,4 @@ -# Copyright (c) 2010, Google Inc. -# All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -29,7 +28,7 @@ { 'includes': [ - '../build/common.gypi', + '../../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/sender/crash_report_sender.gyp b/src/client/windows/sender/crash_report_sender.gyp index e4db3a86..f87824b1 100644 --- a/src/client/windows/sender/crash_report_sender.gyp +++ b/src/client/windows/sender/crash_report_sender.gyp @@ -1,5 +1,4 @@ -# Copyright (c) 2010, Google Inc. -# All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -29,7 +28,7 @@ { 'includes': [ - '../build/common.gypi', + '../../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/tests/crash_generation_app/crash_generation_app.gyp b/src/client/windows/tests/crash_generation_app/crash_generation_app.gyp index 963d9cd1..690898dd 100644 --- a/src/client/windows/tests/crash_generation_app/crash_generation_app.gyp +++ b/src/client/windows/tests/crash_generation_app/crash_generation_app.gyp @@ -1,5 +1,4 @@ -# Copyright (c) 2010, Google Inc. -# All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -29,7 +28,7 @@ { 'includes': [ - '../../build/common.gypi', + '../../../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/unittests/client_tests.gyp b/src/client/windows/unittests/client_tests.gyp index 6dc9fe71..034c130a 100644 --- a/src/client/windows/unittests/client_tests.gyp +++ b/src/client/windows/unittests/client_tests.gyp @@ -1,5 +1,4 @@ -# Copyright (c) 2010, Google Inc. -# All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -29,7 +28,7 @@ { 'includes': [ - '../build/common.gypi', + '../../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/unittests/testing.gyp b/src/client/windows/unittests/testing.gyp index 3234f46c..02d98ded 100644 --- a/src/client/windows/unittests/testing.gyp +++ b/src/client/windows/unittests/testing.gyp @@ -1,5 +1,4 @@ -# Copyright (c) 2010, Google Inc. -# All rights reserved. +# Copyright 2010 Google Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -29,7 +28,7 @@ { 'includes': [ - '../build/common.gypi', + '../../../../build/common.gypi', ], 'target_defaults': { }, diff --git a/src/common/windows/common_windows.gyp b/src/common/windows/common_windows.gyp index 6b877759..47336589 100644 --- a/src/common/windows/common_windows.gyp +++ b/src/common/windows/common_windows.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../client/windows/build/common.gypi', + '../../../build/common.gypi', ], 'targets': [ { diff --git a/src/tools/windows/dump_syms/dump_syms.gyp b/src/tools/windows/dump_syms/dump_syms.gyp index d4964b4a..f60c1bff 100644 --- a/src/tools/windows/dump_syms/dump_syms.gyp +++ b/src/tools/windows/dump_syms/dump_syms.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../client/windows/build/common.gypi', + '../../../../build/common.gypi', ], 'targets': [ { @@ -38,7 +38,7 @@ 'dump_syms.cc', ], 'dependencies': [ - '<(DEPTH)/common/windows/common_windows.gyp:common_windows_lib', + '../../../common/windows/common_windows.gyp:common_windows_lib', ], }, { diff --git a/src/tools/windows/symupload/symupload.gyp b/src/tools/windows/symupload/symupload.gyp index 01fd2ba9..71c50890 100644 --- a/src/tools/windows/symupload/symupload.gyp +++ b/src/tools/windows/symupload/symupload.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../client/windows/build/common.gypi', + '../../../../build/common.gypi', ], 'targets': [ { @@ -38,7 +38,7 @@ 'symupload.cc', ], 'dependencies': [ - '<(DEPTH)/common/windows/common_windows.gyp:common_windows_lib', + '../../../common/windows/common_windows.gyp:common_windows_lib', ], }, ], |