Greetings,
I'm a big fan of using `git status` to determine the state of my local git repository. The following patch adds a .gitignore file to ignore any files or directories built during the cobbler build process. This includes rpm-build/, dist/, *.pyc files etc... Now `git status` will show you what local changes haven't yet been commited, excluding *.pyc, tmp files, and other cobbler `make` created files.
In addition to the .gitignore, a very minor change was made to the Makefile. I'm not sure if the 'rpms' target was intended as the default build target, but I'm more famililar having just a 'build' target which does any pre-processing and docs generation prior to `python setup.py sdist`.
Comments appreciated.
Thanks, James
--- .gitignore | 6 ++++++ docs/.gitignore | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 docs/.gitignore
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..29d0e23 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.pyc +*.swp +*.tmp +dist +rpm-build +MANIFEST diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 index 0000000..791deda --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1,3 @@ +# ignore pod output +*.gz +*.html
--- docs/.gitignore | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) delete mode 100644 docs/.gitignore
diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 791deda..0000000 --- a/docs/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# ignore pod output -*.gz -*.html
--- .gitignore | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore index 29d0e23..e1f4ca7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,15 @@ *.tmp dist rpm-build +build MANIFEST + +# docs - ignore pod output +docs/*.gz +docs/*.html + +# Build output +cobbler/webui/master.py +config/modules.conf +config/settings +config/version
--- Makefile | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile index baba51d..7130799 100644 --- a/Makefile +++ b/Makefile @@ -3,22 +3,15 @@ prefix=devinstall statepath=/tmp/cobbler_settings/$(prefix)
-all: clean rpms +all: clean build
clean: - -rm -f pod2htm*.tmp -rm -f cobbler*.gz cobbler*.rpm MANIFEST - -rm -rf cobbler-* dist build - -rm -rf *~ - -rm -rf rpm-build/ - #-rm -f docs/cobbler.1.gz - #-rm -f docs/cobbler.html - #-rm -f po/messages.pot* - -rm -f cobbler/*.pyc - -rm -f cobbler/yaml/*.pyc - -rm -f cobbler/webui/master.py - -rm -f config/modules.conf config/settings config/version - -rm -f docs/cobbler.1.gz docs/cobbler.html + -rm -rf cobbler-* dist build rpm-build + -rm -f *~ + -rm -f cobbler/*.pyc cobbler/yaml/*.pyc + -rm -f cobbler/webui/master.py config/modules.conf config/settings config/version + -rm -f docs/cobbler.1.gz docs/cobbler.html pod2htm*.tmp
manpage: pod2man --center="cobbler" --release="" ./docs/cobbler.pod | gzip -c > ./docs/cobbler.1.gz
James Laska wrote:
Makefile | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile index baba51d..7130799 100644 --- a/Makefile +++ b/Makefile @@ -3,22 +3,15 @@ prefix=devinstall statepath=/tmp/cobbler_settings/$(prefix)
-all: clean rpms +all: clean build
clean:
- -rm -f pod2htm*.tmp -rm -f cobbler*.gz cobbler*.rpm MANIFEST
- -rm -rf cobbler-* dist build
- -rm -rf *~
- -rm -rf rpm-build/
- #-rm -f docs/cobbler.1.gz
- #-rm -f docs/cobbler.html
- #-rm -f po/messages.pot*
- -rm -f cobbler/*.pyc
- -rm -f cobbler/yaml/*.pyc
- -rm -f cobbler/webui/master.py
- -rm -f config/modules.conf config/settings config/version
- -rm -f docs/cobbler.1.gz docs/cobbler.html
- -rm -rf cobbler-* dist build rpm-build
- -rm -f *~
- -rm -f cobbler/*.pyc cobbler/yaml/*.pyc
- -rm -f cobbler/webui/master.py config/modules.conf config/settings config/version
- -rm -f docs/cobbler.1.gz docs/cobbler.html pod2htm*.tmp
manpage: pod2man --center="cobbler" --release="" ./docs/cobbler.pod | gzip -c > ./docs/cobbler.1.gz
Patch series merged to devel. This is probably all safe for master though I expect that we'll do /less/ maintaince on 1.4 this time as I really want to get major releases out faster than we're doing in the past. Does this sound ok?
Also: you now have commit access. (Patches to the list seem to be goodness though, so everyone let's keep doing that so folks can comment if they want?).
--Michael
On Tue, 2009-01-06 at 11:06 -0500, Michael DeHaan wrote:
Patch series merged to devel. This is probably all safe for master though I expect that we'll do /less/ maintaince on 1.4 this time as I really want to get major releases out faster than we're doing in the past. Does this sound ok?
That works for me, but I'm selfish and all my efforts are on the devel branch at this time.
Also: you now have commit access. (Patches to the list seem to be goodness though, so everyone let's keep doing that so folks can comment if they want?).
Thank you! I will continue to send any patches to the list.
Thanks, James
cobbler@lists.fedorahosted.org