namespace {
-enum SeparatorConversion {
- SEP_TO_SLASH, // All slashes to forward.
- SEP_TO_SYSTEM, // Slashes to system ones.
-};
-
-// Does the specified path separator conversion in-place.
-void ConvertSlashes(std::string* str, SeparatorConversion mode) {
-#if defined(OS_WIN)
- if (mode == SEP_TO_SYSTEM)
- std::replace(str->begin(), str->end(), '/', '\\');
- else
-#endif
- if (mode == SEP_TO_SLASH)
- std::replace(str->begin(), str->end(), '\\', '/');
-}
-
// We want the output to match the input in terms of ending in a slash or not.
// Through all the transformations, these can get added or removed in various
// cases.
const SourceDir& from_dir,
const SourceDir& to_dir,
bool convert_to_system_absolute,
- SeparatorConversion separator_conversion,
Err* err) {
Value result; // Ensure return value optimization.
result = Value(function, FilePathToUTF8(system_path));
if (looks_like_dir)
MakeSlashEndingMatchInput(string_value, &result.string_value());
- ConvertPathToSystem(&result.string_value());
return result;
}
to_dir);
}
- ConvertSlashes(&result.string_value(), separator_conversion);
return result;
}
} // namespace
const char kRebasePath[] = "rebase_path";
+const char kRebasePath_HelpShort[] =
+ "rebase_path: Rebase a file or directory to another location.";
const char kRebasePath_Help[] =
"rebase_path: Rebase a file or directory to another location.\n"
"\n"
" converted = rebase_path(input,\n"
" new_base = \"\",\n"
- " current_base = \".\",\n"
- " path_separators = \"to_slash\")\n"
+ " current_base = \".\")\n"
"\n"
" Takes a string argument representing a file name, or a list of such\n"
" strings and converts it/them to be relative to a different base\n"
" current directory to be relative to the build directory (which will\n"
" be the current directory when executing scripts).\n"
"\n"
- "Arguments\n"
+ " If you want to convert a file path to be source-absolute (that is,\n"
+ " beginning with a double slash like \"//foo/bar\"), you should use\n"
+ " the get_path_info() function. This function won't work because it will\n"
+ " always make relative paths, and it needs to support making paths\n"
+ " relative to the source root, so can't also generate source-absolute\n"
+ " paths without more special-cases.\n"
+ "\n"
+ "Arguments:\n"
"\n"
" input\n"
" A string or list of strings representing file or directory names\n"
" relative to the current build file. Use \".\" (the default) to\n"
" convert paths from the current BUILD-file's directory.\n"
"\n"
- " path_separators\n"
- " On Windows systems, indicates whether and how path separators\n"
- " should be converted as part of the transformation. It can be one\n"
- " of the following strings:\n"
- " - \"to_slash\" Normalize all types of slashes to forward slashes.\n"
- " This is the default if this argument is unspecified.\n"
- " - \"to_system\" Convert to the system path separators\n"
- " (backslashes on Windows).\n"
- "\n"
" On Posix systems there are no path separator transformations\n"
" applied. If the new_base is empty (specifying absolute output)\n"
" this parameter should not be supplied since paths will always be\n"
static const size_t kArgIndexInputs = 0;
static const size_t kArgIndexDest = 1;
static const size_t kArgIndexFrom = 2;
- static const size_t kArgIndexPathConversion = 3;
// Inputs.
- if (args.size() < 1 || args.size() > 4) {
+ if (args.size() < 1 || args.size() > 3) {
*err = Err(function->function(), "Wrong # of arguments for rebase_path.");
return result;
}
}
// Path conversion.
- SeparatorConversion sep_conversion = SEP_TO_SLASH;
- if (args.size() > kArgIndexPathConversion) {
- if (convert_to_system_absolute) {
- *err = Err(function, "Can't specify slash conversion.",
- "You specified absolute system path output by using an empty string "
- "for the destination directory on rebase_path(). In this case, you "
- "can't specify slash conversion.");
- return result;
- }
-
- if (!args[kArgIndexPathConversion].VerifyTypeIs(Value::STRING, err))
- return result;
- const std::string& sep_string =
- args[kArgIndexPathConversion].string_value();
- if (sep_string == "to_slash") {
- sep_conversion = SEP_TO_SLASH;
- } else if (sep_string == "to_system") {
- sep_conversion = SEP_TO_SYSTEM;
- } else {
- *err = Err(args[kArgIndexPathConversion],
- "Invalid path separator conversion mode.",
- "I was expecting \"to_slash\" or \"to_system\" and\n"
- "you gave me \"" + args[kArgIndexPathConversion].string_value() +
- "\".");
- return result;
- }
- }
-
if (inputs.type() == Value::STRING) {
return ConvertOnePath(scope, function, inputs,
- from_dir, to_dir, convert_to_system_absolute,
- sep_conversion, err);
+ from_dir, to_dir, convert_to_system_absolute, err);
} else if (inputs.type() == Value::LIST) {
result = Value(function, Value::LIST);
result.list_value().reserve(inputs.list_value().size());
- for (size_t i = 0; i < inputs.list_value().size(); i++) {
+ for (const auto& input : inputs.list_value()) {
result.list_value().push_back(
- ConvertOnePath(scope, function, inputs.list_value()[i],
- from_dir, to_dir, convert_to_system_absolute,
- sep_conversion, err));
+ ConvertOnePath(scope, function, input,
+ from_dir, to_dir, convert_to_system_absolute, err));
if (err->has_error()) {
result = Value();
return result;
projects / platform / framework / web / crosswalk.git / blobdiff