Merge master fd40ebbc7252 into doc

This commit is contained in:
Mark Mentovai 2015-10-09 12:16:45 -04:00
commit 56c61d9bea
6 changed files with 84 additions and 6 deletions

View File

@ -57,6 +57,15 @@ def main(args):
print test
print '-' * 80
subprocess.check_call(os.path.join(binary_dir, test))
if sys.platform == 'win32':
name = 'snapshot/win/end_to_end_test.py'
print '-' * 80
print name
print '-' * 80
subprocess.check_call(
[sys.executable, os.path.join(crashpad_dir, name), args[0]])
return 0

View File

@ -16,16 +16,16 @@
= Crashpad
https://crashpad.googlecode.com/[Crashpad] is a crash-reporting system.
https://crashpad-home.appspot.com/[Crashpad] is a crash-reporting system.
== Documentation
* link:status.html[Project status]
* link:developing.html[Developing Crashpad]: instructions for getting the
source code, building, testing, and contributing to the project.
* http://docs.crashpad.googlecode.com/git/doxygen/index.html[Crashpad
interface documentation]
* http://docs.crashpad.googlecode.com/git/man/[Crashpad tool man pages]
* https://crashpad-home.appspot.com/doxygen/index.html[Crashpad interface
documentation]
* https://crashpad-home.appspot.com/man/index.html[Crashpad tool man pages]
== Source Code

View File

@ -45,6 +45,7 @@ done
# doc.
${sed_ext} -e 's%<a href="([^/]+)\.html">%<a href="doc/\1.html">%g' \
< "${output_dir}/doc/index.html" > "${output_dir}/index.html"
rm "${output_dir}/doc/index.html"
# Create man/index.html
cd "${output_dir}/man"

View File

@ -14,7 +14,7 @@
== Resources
Crashpad home page: https://crashpad.googlecode.com/.
Crashpad home page: https://crashpad-home.appspot.com/.
Report bugs at https://code.google.com/p/crashpad/issues/entry.

View File

@ -24,6 +24,6 @@
#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION
#define PACKAGE_TARNAME "crashpad"
#define PACKAGE_VERSION "0.7.0"
#define PACKAGE_URL "https://crashpad.googlecode.com/"
#define PACKAGE_URL "https://crashpad-home.appspot.com/"
#endif // CRASHPAD_PACKAGE_H_

View File

@ -0,0 +1,68 @@
#!/usr/bin/env python
# Copyright 2015 The Crashpad Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import os
import sys
def FindInstalledWindowsApplication(app_path):
search_paths = [os.getenv('PROGRAMFILES(X86)'),
os.getenv('PROGRAMFILES'),
os.getenv('LOCALAPPDATA')]
search_paths += os.getenv('PATH', '').split(os.pathsep)
for search_path in search_paths:
if not search_path:
continue
path = os.path.join(search_path, app_path)
if os.path.isfile(path):
return path
return None
def GetCdbPath():
possible_paths = (
os.path.join('Windows Kits', '10', 'Debuggers', 'x64'),
os.path.join('Windows Kits', '10', 'Debuggers', 'x86'),
os.path.join('Windows Kits', '8.1', 'Debuggers', 'x64'),
os.path.join('Windows Kits', '8.1', 'Debuggers', 'x86'),
os.path.join('Windows Kits', '8.0', 'Debuggers', 'x64'),
os.path.join('Windows Kits', '8.0', 'Debuggers', 'x86'),
'Debugging Tools For Windows (x64)',
'Debugging Tools For Windows (x86)',
'Debugging Tools For Windows',
os.path.join('win_toolchain', 'vs2013_files', 'win8sdk', 'Debuggers',
'x64'),
os.path.join('win_toolchain', 'vs2013_files', 'win8sdk', 'Debuggers',
'x86'),
)
for possible_path in possible_paths:
app_path = os.path.join(possible_path, 'cdb.exe')
app_path = FindInstalledWindowsApplication(app_path)
if app_path:
return app_path
return None
def main(args):
cdb_path = GetCdbPath()
print 'cdb_path:', cdb_path
return 0
if __name__ == '__main__':
sys.exit(main(sys.argv[1:]))