projects / packages / seamonkey.git / blame
| Commit | Line | Data |
|---|---|---|
| 16e155ba JB |
1 | --- xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.orig 2013-01-05 00:44:41.000000000 +0100 |
| 2 | +++ xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-13 20:13:40.033894757 +0100 | |
| 3 | @@ -114,6 +114,12 @@ | |
| 4 | if dir and not os.path.exists(dir): | |
| 5 | os.makedirs(dir) | |
| 6 | ||
| 7 | +def append_relative(base, rel): | |
| 8 | + if rel == '': | |
| 9 | + return base | |
| 10 | + else: | |
| 11 | + return base + '/' + rel | |
| 12 | + | |
| 13 | def GetFlavor(params): | |
| 14 | """Returns |params.flavor| if it's set, the system's default flavor else.""" | |
| 15 | flavors = { | |
| 16 | @@ -142,9 +148,9 @@ | |
| 17 | ||
| 18 | def WriteMakefile(filename, data, build_file, depth, topsrcdir, srcdir, relative_path, extra_data=None): | |
| 19 | if not os.path.isabs(topsrcdir): | |
| 20 | - topsrcdir = depth + "/" + topsrcdir | |
| 21 | + topsrcdir = append_relative(depth, topsrcdir) | |
| 22 | if not os.path.isabs(srcdir): | |
| 23 | - srcdir = depth + "/" + srcdir | |
| 24 | + srcdir = append_relative(depth, srcdir) | |
| 25 | #TODO: should compare with the existing file and not overwrite it if the | |
| 26 | # contents are the same! | |
| 27 | ensure_directory_exists(filename) | |
| 28 | @@ -261,7 +267,7 @@ | |
| 29 | qualified_target) | |
| 30 | build_file = os.path.abspath(build_file) | |
| 31 | rel_path, output_file = self.CalculateMakefilePath(build_file, target) | |
| 32 | - subdepth = self.depth + "/" + getdepth(rel_path) | |
| 33 | + subdepth = append_relative(self.depth, getdepth(rel_path)) | |
| 34 | if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth): | |
| 35 | # If WriteTargetMakefile returns True, then this is a useful target | |
| 36 | dirs.append(rel_path) | |
| 37 | @@ -376,7 +382,7 @@ | |
| 38 | WriteMakefile(output_file, data, build_file, depth, top, | |
| 39 | # we set srcdir up one directory, since the subdir | |
| 40 | # doesn't actually exist in the source directory | |
| 41 | - swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])), | |
| 42 | + swapslashes(append_relative(append_relative(top, self.relative_srcdir), os.path.split(rel_path)[0])), | |
| 43 | self.relative_srcdir) | |
| 44 | return True | |
| 45 | ||
| 46 | @@ -399,7 +405,7 @@ | |
| 47 | # The relative path from objdir to gyp_file_dir | |
| 48 | srcdir = gyp.common.RelativePath(gyp_file_dir, objdir) | |
| 49 | # The absolute path to the source dir | |
| 50 | - abs_srcdir = topsrcdir + "/" + relative_srcdir | |
| 51 | + abs_srcdir = append_relative(topsrcdir, relative_srcdir) | |
| 52 | # The path to get up to the root of the objdir from the output dir. | |
| 53 | depth = getdepth(relative_srcdir) | |
| 54 | # The output directory. | |
| 55 | @@ -408,9 +414,9 @@ | |
| 56 | makefile_path = os.path.join(output_dir, "Makefile") | |
| 57 | ||
| 58 | def topsrcdir_path(path): | |
| 59 | - return "$(topsrcdir)/" + swapslashes(gyp.common.RelativePath(path, topsrcdir)) | |
| 60 | + return append_relative("$(topsrcdir)", swapslashes(gyp.common.RelativePath(path, topsrcdir))) | |
| 61 | def objdir_path(path): | |
| 62 | - return "$(DEPTH)/" + swapslashes(gyp.common.RelativePath(path, objdir)) | |
| 63 | + return append_relative("$(DEPTH)", swapslashes(gyp.common.RelativePath(path, objdir))) | |
| 64 | ||
| 65 | # Find the list of targets that derive from the gyp file(s) being built. | |
| 66 | needed_targets = set() |