Re: [Emc-developers] git questions

[Jeff Epler]

On Thu, Jul 02, 2009 at 04:09:22AM +, Chris Morley wrote:
 It does seem to promote waiting to push until
 something is quite far along - not sure if thats
 goos or bad. Good cause trunk is more stable
 bad cause you could get along ways before
 you find out about problems from interaction
 of other's work. I'll be interesting to see
 how it changes development.

If you want to share work earlier than when it's ready to go on 'master'
there are lots of options.

You can push the branch to git.linuxcnc.org, and then collaborate with
others on it.

You can use 'git format-patch' to create a bunch of patch-emails to send
to the list for discussion.

You can create a repository on a free site like github or gitorious,
push your work there, and tell others where it is so that they can pull
it.

And, yes, you can work on it privately a lot easier too, committing work
as you see fit but only pushing to master when it's time.

Jeff

--
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

[Emc-developers] [PATCH] stepconf fix for non-standard directory install

[Moses O McKnight]

This patch is on the master branch, and makes a small fix in stepconf
for installing with a --prefix other than /usr (such as /usr/local)

I also removed the code to copy the sample emc.nml and emc.var files,
specifically emc.var because it is no longer there - emc.nml because
jepler said that is no longer needed on master.

Moses

From 9227b7f2038114b937b26e8f67ed916b0335e82a Mon Sep 17 00:00:00 2001
From: Moses McKnight mo...@skytex.net
Date: Thu, 2 Jul 2009 22:06:22 -0500
Subject: [PATCH] stepconf fixes for non-standard directory installs

Signed-off-by: Moses McKnight mo...@skytex.net
---
 src/emc/usr_intf/stepconf/stepconf.py |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/emc/usr_intf/stepconf/stepconf.py b/src/emc/usr_intf/stepconf/stepconf.py
index 995a573..dd9dfbe 100755
--- a/src/emc/usr_intf/stepconf/stepconf.py
+++ b/src/emc/usr_intf/stepconf/stepconf.py
@@ -105,6 +105,8 @@ if not os.path.isdir(distdir):
 if not os.path.isdir(distdir):
 distdir = os.path.join(os.path.abspath(os.path.dirname(__file__)), .., emc2, sample-configs, common)
 if not os.path.isdir(distdir):
+distdir = os.path.join(os.path.abspath(os.path.dirname(__file__)), .., share, doc, emc2, examples, sample-configs, common)
+if not os.path.isdir(distdir):
 distdir = /usr/share/doc/emc2/examples/sample-configs/common
 
 (XSTEP, XDIR, YSTEP, YDIR,
@@ -1041,9 +1043,7 @@ class Data:
 self.write_readme(base)
 self.write_inifile(base)
 self.write_halfile(base)
-self.copy(base, emc.nml)
 self.copy(base, tool.tbl)
-self.copy(base, emc.var)
 
 filename = %s.stepconf % base
 
-- 
1.6.0.4

--
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers