Back
[11:12:51] <KGB-linuxcnc> 03Dewey Garrett 052.7 f9bdd7f 06linuxcnc 10src/hal/hal_lib.c 10src/hal/hal_priv.h 10src/hal/utils/halcmd_commands.c 10tests/save.0/expected hal_lib: new pin,param for thread time,tmax * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=f9bdd7f
[11:12:51] <KGB-linuxcnc> 03Dewey Garrett 052.7 de4fc78 06linuxcnc 10src/hal/utils/halrmt.c halrmt.c fix readClient() incorrect goto finished * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=de4fc78
[11:12:51] <KGB-linuxcnc> 03Dewey Garrett 052.7 4393531 06linuxcnc 10src/hal/utils/halrmt.c halrmt.c report thread .time pin value * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=4393531
[11:13:45] <KGB-linuxcnc> 05dgarr/threadtiming e309beb 06linuxcnc 04. branch deleted * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=e309beb
[11:40:51] <mozmck> I'd like to update the debian/configure and control.in for 2.7 a little bit.
[11:42:15] <mozmck> control.in has texlive-lang-french, texlive-lang-spanish, texlive-lang-german as build dependencies, but they are also added as extra depends in configure
[11:43:39] <mozmck> I also would like to modify things so Ubuntu 14.04 does not have libgnomeprintui2.2-dev as a build dependency, because it is not available in 14.04.
[11:44:03] <mozmck> The only thing I think that would affect is printing from classic ladder.
[11:49:14] <mozmck> at least that's what ./configure says: "checking for libgnomeprintui-2.2... no -- printing from classicladder will not be possible"
[12:10:30] <mozmck> Here are my proposed changes for comment:
http://pastie.org/10206693
[12:11:20] <mozmck> I also combined the distributions that were identical in the case statement which cleans up ./configure a little bit more.
[12:16:48] <mozmck> hmm, that paste was bad. Here's a better one:
http://pastebin.com/zbJRqdYK
[12:39:37] <cradek> mozmck: because this is a hard diff to read, I thought I'd whip up a script that would expand all this stuff and display it in a way that makes it easy to see whether you got just the changes you want ... and I'm getting bogged down. I'm not sure how to verify this.
[12:40:29] <cradek> the buildbot would be a good test for some of it - a missing build dep shows up that way I think
[12:41:29] <cradek> maybe you should give a push to a new branch and try it
[12:42:30] <cradek> when you make the commits I'd recommend doing the different things as different commits - first fix the bug of tex being specified twice, then do the combining of identical architectures, then fix up libgnomeprintui
[12:42:37] <cradek> or whichever order you think makes the most sense
[12:43:23] <cradek> but I do see three different things combined together, and it'd be easier on the brain to check each of them separately
[12:44:18] <cradek> thanks for doing dirty work - this stuff is hard :-)
[12:48:08] <mozmck> ok, I figured the changes were trivial enough that 3 commits would just clutter things.
[12:48:32] <mozmck> I'll push a new branch - will the buildbot build it automatically?
[12:48:43] <cradek> yep
[12:50:12] <mozmck> I forget how to push a new branch :(
[12:52:38] <KGB-linuxcnc> 03Moses McKnight 05mozmck/2.7 3501042 06linuxcnc 10debian/configure 10debian/control.in Clean up debian/configure and control.in * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=3501042
[12:52:38] <KGB-linuxcnc> 03Moses McKnight 05mozmck/2.7 e790a23 06linuxcnc 10docs/src/hal/haltcl.txt Added to the haltcl docs * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=e790a23
[12:54:34] <mozmck> what is the best way to get the haltcl commit on 2.6 and 2.7? cherry-pick to 2.6 and then merge into 2.7 and master?
[13:09:34] <cradek> it isn't on any shared branch yet (except this test branch)?
[13:10:42] <cradek> if so, then yes get it on 2.6 using whatever method (cherry pick is fine if it's already a commit in your repo) and then merge up
[13:11:23] <cradek> so ideally you wouldn't put it in 2.7 separately - just let the merge do it
[13:12:38] <mozmck> ok, I'll try that. I don't know that I've cherry picked anything yet.
[13:13:08] <mozmck> If I can't get that I'll just copy the file into 2.6 and commit it there and then merge up.
[13:14:49] <mozmck> will the buildbot post here if my branch build fails?
[13:40:03] <KGB-linuxcnc> 03Moses McKnight 052.6 f03c2ce 06linuxcnc 10docs/src/hal/haltcl.txt Added to the haltcl docs * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=f03c2ce
[13:43:05] <KGB-linuxcnc> 03Moses McKnight 052.7 e944466 06linuxcnc 10docs/src/hal/haltcl.txt Merge branch '2.6' into 2.7 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=e944466
[13:46:02] <CaptHindsight> http://linuxgizmos.com/fpga-add-on-boards-support-raspberry-pi-beaglebone-black/
[13:46:24] <CaptHindsight> integrate Xilinx SPARTAN-6 XC6SLX9 FPGAs
[20:35:25] <cradek> http://timeguy.com/cradek-files/emc/ao-screws-done.jpg
[20:36:03] <Tom_itx> pretty clean looking threads
[20:36:12] <cradek> thanks
[20:36:34] <cradek> I put a 60 degree point on a parting tool
[20:37:02] <cradek> I did 2 dozen in brass and then 1 dozen in drill rod
[20:37:08] <cradek> bbl
[20:40:01] <andypugh> The steel ones have no crest flat. Did the same settings give a larger OD on steel?
[21:06:38] <kwallace2> Those screws look pretty good and way tiny.
[21:11:08] <Tom_itx> oddball size for some old eyeglasses
[21:11:11] <Tom_itx> pretty darn tiny
[21:25:47] <cradek> andypugh: the steel ones I touched with a file to deburr, so don't trust what you see. they ended up with nasty burrs.
[21:26:41] <cradek> kwallace2: .045" x 90tpi
[21:29:26] <skunkworks> what did you use? hardige?
[21:29:49] <cradek> nope, the sherline
[21:30:12] <skunkworks> cool
[21:30:18] <cradek> it has a spindle adapter that takes WW collets
[21:30:42] <skunkworks> what did you use to make the slot?
[21:30:46] <cradek> so it handles up to 5mm really nicely
[21:31:13] <cradek> a screwhead file on top of an adjustable parallel on the tool post!
[21:31:22] <cradek> it's really funny to watch it file the slots
[21:31:46] <mozmck> I presume the build-bot did not have an issue with my debian/configure changes?
[21:32:18] <skunkworks> I have often used files for machining operations..
[21:32:36] <cradek> mozmck:
http://buildbot.linuxcnc.org/buildbot/grid
[21:32:51] <cradek> looks like yours is the center column
[21:32:58] <cradek> it looks great
[21:34:01] <mozmck> good deal. So what do you think of my changes?
[21:36:18] <cradek> I think they're good. I would prefer them split up as I suggested before, but I think all 3 changes are good.
[21:37:16] <mozmck> So how would I split them up now?
[21:37:32] <mozmck> I guess I could just redo each change on 2.7 manually
[21:38:22] <cradek> when they're separate chunks it is very easy to split them up - but unfortunately when they affect the same lines (or very near the same lines) there's no good way to do it.
[21:39:24] <cradek> sorry, I wouldn't normally be such a pedant, but these are super important to get right, and that would help me/us look at them and see they're right
[21:40:12] <mozmck> It easy enough to redo on 2.7 and commit each change separately, so I guess I'll do that. The distribution combining is simply a matter of using | in the case statements for distributions that are identical.
[21:41:10] <cradek> yeah, and in that case, it will be easy to see in the - parts of the patch that they are identical
[21:41:12] <mozmck> Removing redundant dependencies was simply removing from the extra dependencies what was in the control.in (because that is common to all distibutions).
[21:41:52] <mozmck> yes
[22:13:36] <KGB-linuxcnc> 03Moses McKnight 05mozmck/2.7 749f398 06linuxcnc 10debian/configure Removed redundant dependencies from debian/configure * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=749f398
[22:13:36] <KGB-linuxcnc> 03Moses McKnight 05mozmck/2.7 0115cfb 06linuxcnc 10debian/configure 10debian/control.in Remove libgnomeprintui2.2-dev as dependency in Ubuntu 14.04 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=0115cfb
[22:13:36] <KGB-linuxcnc> 03Moses McKnight 05mozmck/2.7 f422776 06linuxcnc 10debian/configure Combined some distributions in debian/configure * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=f422776
[22:15:18] <mozmck> cradek: see how that looks.
[22:15:28] <cradek> sweet
[22:18:48] <cradek> that is MUCH easier to review and trust, thank you
[22:18:56] <mozmck> you're welcome
[22:19:07] <cradek> you added a new architecture too - mint 17 is the same as ubuntu 14?
[22:19:19] <mozmck> yes, it's based on it.
[22:19:58] <mozmck> it's what I use for my desktop, so adding that is handy, and only adds the one word in configure
[22:25:35] <cradek> cool
[22:25:59] <cradek> I used whichever mint was based on ubuntu12 briefly; happily on debian everywhere now
[22:26:15] <cradek> who knows what the future holds
[22:26:39] <mozmck> I used debian unstable for years. Stable was always too far behind as far as age of applications.
[22:27:31] <mozmck> Mint really seems to put things together well. I use the XFCE version and Cinnamon, and like them both.
[22:28:10] <mozmck> PPAs can be really nice to get more up-to-date software that is packaged
[23:07:52] <cmorley> mozmck: you have linuxcnc and mint together? I much prefer mint over debian. How difficult was it?
