Re: [Emc-developers] Updates

Sorry to be a pain but… I have tried: linuxcnc-build: force build --branch-2.9 2000.docs And got the following: Something bad happened (see logs) I have tried master and Master instead of 2.9 and get the same result. Also when I look at this page http://buildbot.linuxcnc.org/dists/stretch/ <

[Emc-developers] Workflow

I noticed today when I pushed a commit that it also pushed a message about a merge between my branches which doesn't seem correct.Currently I do all my work on my plasmac branch. I checkout master, fetch from upstream then rebase upstream/master. I then checkout plasmac and merge master.Then I p

Re: [Emc-developers] How does motmod get built?

On Fri, Jun 28, 2019 at 4:52 PM Gene Heskett wrote: > On Friday 28 June 2019 15:08:01 Nathan Hartman wrote: > > > Studying the build system and I'm stumped on how motmod gets built. > > > > I see in src/Makefile, motmod-objs > > gets emc/motion/motion.o, emc/motion/command.o, etc., but where are

Re: [Emc-developers] How does motmod get built?

On Fri, 28 Jun 2019 at 20:09, Nathan Hartman wrote: > but where are these > object files being built from the .c files? I don't know for sure, but there seems to be some magic in the makefile that gets a list of the .c files based on the target .o file names. Maybe here: https://github.com/LinuxC

Re: [Emc-developers] How does motmod get built?

I did look at this to see if I could compile a plasmatask folder (and it was easy) In the main make file around line 110, there is a SUBDIRS section. I can't remember if I had to add a specific entry for the object file but further down around line 1000, there are some defined. See https://github.

Re: [Emc-developers] How does motmod get built?

> > > I see in src/Makefile, motmod-objs > > > gets emc/motion/motion.o, emc/motion/command.o, etc., but where are > > > these object files being built from the .c files? Submakefile under > > > emc/motion only copies headers to ../includes. There is nothing to > > > compile these source files. > >

Re: [Emc-developers] How does motmod get built?

On Sunday 30 June 2019 08:29:56 Nathan Hartman wrote: > On Fri, Jun 28, 2019 at 4:52 PM Gene Heskett wrote: > > On Friday 28 June 2019 15:08:01 Nathan Hartman wrote: > > > Studying the build system and I'm stumped on how motmod gets > > > built. > > > > > > I see in src/Makefile, motmod-objs > >

Re: [Emc-developers] How does motmod get built?

On Sun, Jun 30, 2019 at 9:36 AM Dmitry Yurtaev wrote: > > > > I see in src/Makefile, motmod-objs > > > > gets emc/motion/motion.o, emc/motion/command.o, etc., but where are > > > > these object files being built from the .c files? Submakefile under > > > > emc/motion only copies headers to ../inc

Re: [Emc-developers] Workflow

Just so you get an answer - not saying this is the best way (there is no written policy that I know of) and there are usually more then one way to do things in git. In my case I usually work in my local branch of master. When I get to the point of wanting to push my work, i: git push --dry-run

Re: [Emc-developers] Workflow

If my new stuff is a single commit I take a short-cut. On Sun, 30 Jun 2019 at 20:52, Chris Morley wrote: > If I am working on a private branch based on master and want to push my work : > and If my private branch is behind linuxcnc's master > > switch to my local master and pull to bring it up t

Re: [Emc-developers] Updates

On Sun, 30 Jun 2019 at 08:05, Phillip Carter wrote: > Also when I look at this page http://buildbot.linuxcnc.org/dists/stretch/ > it shows master and 2.7 haven’t > been updated since 09-Jun I think that the buildbot most have gone on strike for a c

Re: [Emc-developers] Workflow

Thanks guys, I think I have it sorted now. > On 1 Jul 2019, at 6:19 am, andy pugh wrote: > > If my new stuff is a single commit I take a short-cut. > > On Sun, 30 Jun 2019 at 20:52, Chris Morley wrote: > >> If I am working on a private branch based on master and want to push my work >> : >>