Changeset 112408 in webkit
- Timestamp:
- Mar 28, 2012 9:33:03 AM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r112406 r112408 1 2012-03-28 Philippe Normand <pnormand@igalia.com> 2 3 [GTK] generate-gtk-doc doesn't cope with custom build directory 4 https://bugs.webkit.org/show_bug.cgi?id=82448 5 6 Reviewed by Martin Robinson. 7 8 Pass the product directory in generate-gtkdoc arguments from 9 build-webkit. 10 11 * Scripts/webkitdirs.pm: 12 (buildAutotoolsProject): 13 * gtk/common.py: 14 (get_build_path): 15 1 16 2012-03-28 Carlos Garcia Campos <cgarcia@igalia.com> 2 17 -
trunk/Tools/Scripts/webkitdirs.pm
r112372 r112408 1982 1982 if ($project eq 'WebKit' && !isCrossCompilation()) { 1983 1983 my @docGenerationOptions = ($runWithJhbuild, "$gtkScriptsPath/generate-gtkdoc", "--skip-html"); 1984 if ($debug) { 1985 push(@docGenerationOptions, "--debug"); 1986 } 1984 push(@docGenerationOptions, productDir()); 1987 1985 1988 1986 if (system(@docGenerationOptions)) { -
trunk/Tools/gtk/common.py
r111313 r112408 43 43 return os.path.exists(os.path.join(path, 'GNUmakefile')) 44 44 45 if len(sys.argv[1:]) > 1 and os.path.exists(sys.argv[-1]) and is_valid_build_directory(sys.argv[-1]): 46 return sys.argv[-1] 47 45 48 # Debian and Ubuntu build both flavours of the library (with gtk2 46 49 # and with gtk3); they use directories build-2.0 and build-3.0 for … … 52 55 return build_dir 53 56 54 build_types = ['Release', 'Debug'] 55 if '--debug' in sys.argv: 56 build_types.reverse() 57 58 for build_type in build_types: 57 for build_type in ('Release', 'Debug'): 59 58 build_dir = top_level_path('WebKitBuild', build_type) 60 59 if is_valid_build_directory(build_dir):
Note: See TracChangeset
for help on using the changeset viewer.