Stefano Lattarini skrev 2012-01-30 18:27: > On 01/30/2012 12:39 PM, Peter Rosin wrote: >> Hi! >> > Hi Peter, thanks for the patches.
Thanks for looking! >> This series addresses some nits in master that makes various >> tests PASS where they presently FAIL. >> >> 1/4: ar-lib: ignore the verbose modifier instead of erroring out >> 2/4: tests: fetch the 'ar-lib' script for archiver usage >> 3/4: tests: fetch the 'compile' script for subdir objects >> 4/4: tests: do not assume the object file extension is .o >> >> I would really like to commit 1/4 somewhere other than master, >> such as on msvc, but the freshest ar-lib is only available on >> master so there is little one can do to fix that cleanly. Bummer. >> > Huh? The only relevant differences between the copy of 'ar-lib' in > master and the one in msvc are one quoting format in an error message: > > - func_error "no command. Try \`$0 --help' for more information." > + func_error "no command. Try '$0 --help' for more information." > > (change proposed by Paul Eggert and ACK'd by me, and meant to keep up > with the new GCS quoting suggestions) and a change in a comment, to prefer > the term "Windows" over the term "Win32": > > -# Currently only supports Win32 hosts. > +# Currently only supports Windows hosts. > > (change meant to keep the terminology more in sync with the gnulib one). There is one more difference, which is more relevant IMHO, and that is the scriptversion variable. If we start commiting changes to ar-lib on the msvc branch at this point, there will be a conflict once we merge that into master. What scriptversion should we then put on master? It gets ugly, and it was bad to let the lib/scripts diverge in this manner, methinks. I think the best thing to do at this point would be to cherry-pick (using the term loosely) the changes to ar-lib (and compile) into the msvc branch so that things are in sync again. I don't know if you still want me to push this out on the msvc branch? Should I sync the scripts first? >> Anyway, ok for master? >> > See the answers to the individual patches. Pushed 2/4 and 3/4 to master, and 4/4 to maint, all with the silly '*' thing fixed. I did not merge maint into master, there were too many conflicts and I didn't feel like resolving them. Cheers, Peter
