author | Nathan Froyd <froydnj@mozilla.com> |
Wed, 19 Sep 2012 10:34:02 -0400 | |
changeset 107505 | ed057f2acc295b8f2b2bba04e528342bb1863b20 |
parent 107504 | 959cef323ed741e1e32796bb164ddaffc547e26c |
child 107506 | 7ba5f2abe804d4120ed56d66417afcd8b67efa97 |
push id | 23490 |
push user | Ms2ger@gmail.com |
push date | Thu, 20 Sep 2012 11:22:06 +0000 |
treeherder | mozilla-central@6a2d1a3556b9 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 746223 |
milestone | 18.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/config/nsinstall.c +++ b/config/nsinstall.c @@ -280,25 +280,22 @@ main(int argc, char **argv) cwd = optarg; break; case 'D': onlydir = 1; break; case 'd': dodir = 1; break; - case 'l': - dolink = 1; - break; case 'L': linkprefix = optarg; lplen = strlen(linkprefix); dolink = 1; break; - case 'R': + case 'R': dolink = dorelsymlink = 1; break; case 'm': mode = strtoul(optarg, &cp, 8); if (mode == 0 && cp == optarg) usage(); break; case 'o': @@ -384,17 +381,17 @@ main(int argc, char **argv) if (access(name, R_OK) != 0) { fail("cannot access %s", name); } if (*name == '/') { /* source is absolute pathname, link to it directly */ linkname = 0; } else { if (linkprefix) { - /* -L implies -l and prefixes names with a $cwd arg. */ + /* -L prefixes names with a $cwd arg. */ len += lplen + 1; linkname = xmalloc((unsigned int)(len + 1)); sprintf(linkname, "%s/%s", linkprefix, name); } else if (dorelsymlink) { /* Symlink the relative path from todir to source name. */ linkname = xmalloc(PATH_MAX); if (*todir == '/') {
--- a/config/nsinstall.py +++ b/config/nsinstall.py @@ -26,18 +26,16 @@ def _nsinstall_internal(argv): p.add_option('-t', action="store_true", help="Preserve time stamp") p.add_option('-m', action="store", help="Set mode", metavar="mode") p.add_option('-d', action="store_true", help="Create directories in target") p.add_option('-R', action="store_true", help="Use relative symbolic links (ignored)") - p.add_option('-l', action="store_true", - help="Create link (ignored)") p.add_option('-L', action="store", metavar="linkprefix", help="Link prefix (ignored)") p.add_option('-X', action="append", metavar="file", help="Ignore a file when installing a directory recursively.") # The remaining arguments are not used in our tree, thus they're not # implented. def BadArg(option, opt, value, parser):
--- a/js/src/config/nsinstall.c +++ b/js/src/config/nsinstall.c @@ -280,25 +280,22 @@ main(int argc, char **argv) cwd = optarg; break; case 'D': onlydir = 1; break; case 'd': dodir = 1; break; - case 'l': - dolink = 1; - break; case 'L': linkprefix = optarg; lplen = strlen(linkprefix); dolink = 1; break; - case 'R': + case 'R': dolink = dorelsymlink = 1; break; case 'm': mode = strtoul(optarg, &cp, 8); if (mode == 0 && cp == optarg) usage(); break; case 'o': @@ -384,17 +381,17 @@ main(int argc, char **argv) if (access(name, R_OK) != 0) { fail("cannot access %s", name); } if (*name == '/') { /* source is absolute pathname, link to it directly */ linkname = 0; } else { if (linkprefix) { - /* -L implies -l and prefixes names with a $cwd arg. */ + /* -L prefixes names with a $cwd arg. */ len += lplen + 1; linkname = xmalloc((unsigned int)(len + 1)); sprintf(linkname, "%s/%s", linkprefix, name); } else if (dorelsymlink) { /* Symlink the relative path from todir to source name. */ linkname = xmalloc(PATH_MAX); if (*todir == '/') {
--- a/js/src/config/nsinstall.py +++ b/js/src/config/nsinstall.py @@ -26,18 +26,16 @@ def _nsinstall_internal(argv): p.add_option('-t', action="store_true", help="Preserve time stamp") p.add_option('-m', action="store", help="Set mode", metavar="mode") p.add_option('-d', action="store_true", help="Create directories in target") p.add_option('-R', action="store_true", help="Use relative symbolic links (ignored)") - p.add_option('-l', action="store_true", - help="Create link (ignored)") p.add_option('-L', action="store", metavar="linkprefix", help="Link prefix (ignored)") p.add_option('-X', action="append", metavar="file", help="Ignore a file when installing a directory recursively.") # The remaining arguments are not used in our tree, thus they're not # implented. def BadArg(option, opt, value, parser):