Thanks for the testing everyone, we’re getting somewhere!
Re bashisms: I’m not a shell scripting guru either, I just keep banging at it until it works for me
. Using #!/bin/bash is probably the easiest solution for now, as I’m guessing that everyone should have bash available. I’ll probably have to test on Linux sometime too.
Re
abort: repository cwe-ou not found!: Doh! I only used the script with absolute paths in the command line arguments… fixed.
Hoikas wrote:A commit seems to have disappeared. The merge of skoader's pull request #18 is now 128:97c5091c1a9e. The corresponding commit from the repository backup of cwe-ou I acquired is 129:2a23f5511857.
Hmm, the disappeared commit is the same “Merged in cwalther/cwe (pull request #2)” that is also missing from Rarified’s
CWE-ou-NOBINK. I found where that comes from now: it’s a bug in the convert extension of Mercurial < 2.3, fixed in
http://selenic.com/hg/rev/5146de7bce96.
You also have some revisions in a different order than the original CWE-ou, so my identifying the commit to check as “129” was a bit fragile to begin with, I’ve changed that to identifying it by date.
I have addressed all the points above in
https://gist.github.com/4246319 now. Please try again, with Mercurial 2.3 or newer.
I have also added removal of the Bink header files (plLayerBink.h, plBinkPlayer.h, plBinkBitmap.h) and updated my reference repositories accordingly. This has the side effect that commit “Remove Bink from the build, unless BINK_SDK_AVAILABLE is defined.” (r5) is eliminated, as well as a few more on the H-uru side, as they would end up empty.
Next steps, probably tomorrow, depending on school work: Writing the simplified conversion scripts, using them to convert my own repositories and CWE-ou-minkata, seeing if I can get both forks to build again based on Hoikas’ bink-fallout work.