On Sep 11, 2014, at 7:10 AM, 赵安清 wrote:
> Sean and Daniel,
>
> Excuse me, can I merge the branch into trunk? or still need some more
> test/change. Please give me some more suggestions and ideas about continuing
> improving this part if necessary. Thanks!
Hi Zhao,
Before doing that, it'll be great to know exactly how your branch compares to
current trunk and the previous tagged release. There's a script that will tell
you this in the checkout that you can use to check the status.
Basically, compile BRL-CAD as you usually would on your branch, and then run
the script. Then do it again for trunk. It'd be a good idea to even do it for
the last release to see if anything has changed on trunk unexpectedly. Then we
can compare the logs to see what is different. Something like this will work:
# test trunk
cd ~
svn co https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/trunk
brlcad.trunk
mkdir ~/brlcad.trunk/.build && cd ~/brlcad.trunk/.build
cmake .. -DBRLCAD_ENABLE_STRICT=NO
make mged
../sh/conversion.sh GED=bin/mged share/db/*.g 2>&1 | tee
~/brlcad.trunk.convert.log
# test your branch
cd ~
svn co
https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/branches/nmgreorg
brlcad.nmg
mkdir ~/brlcad.nmg/.build && cd ~/brlcad.nmg/.build
cmake .. -DBRLCAD_ENABLE_STRICT=NO
make mged
../sh/conversion.sh GED=bin/mged share/db/*.g 2>&1 | tee
~/brlcad.nmg.convert.log
# test the last release
cd ~
svn co https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/tags/rel-7-24-0
brlcad-7.24.0
mkdir ~/brlcad-7.24.0/.build && cd ~/brlcad-7.24.0/.build
cmake .. -DBRLCAD_ENABLE_STRICT=NO
make mged
../sh/conversion.sh GED=bin/mged share/db/*.g 2>&1 | tee
~/brlcad.release.convert.log
Note that you should be able to copy-paste all of that, but I didn't check for
typos and you can change it around if you like. The important parts are 1)
compiling with the same options so we can compare performance and 2) running
the conversion.sh script using the mged we just compiled. We then just want to
capture everything from that conversion script into a log file.
The conversion will take a long time, like maybe 24 hours long.
When you get it all working, share the output! :)
with this: tail -16 ~/brlcad*convert.log
Cheers!
Sean
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Developer mailing list
brlcad-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-devel
