[gentoo-commits] proj/catalyst:3.0 commit in: /

[gentoo-commits] proj/catalyst:3.0 commit in: /

[Brian Dolbec]

commit:     c874a8d1dffbba5436f75fdea29898b3c95844a8
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Thu Jun  6 22:05:12 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Nov 21 09:00:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c874a8d1

Makefiles: create files directory before populating it

The syntax for the rules is:

  targets ...: target-pattern: prereq-patterns | order-only-prerequisites

For details, see:

http://www.gnu.org/software/make/manual/html_node/Static-Usage.html
http://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 52e0297..6f69e5c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,13 +16,16 @@ distdir = catalyst-$(PACKAGE_VERSION)
 
 all: $(EXTRA_DIST)
 
-$(MAN_PAGES): files/%: doc/%.txt doc/asciidoc.conf Makefile catalyst
+files:
+	mkdir files
+
+$(MAN_PAGES): files/%: doc/%.txt doc/asciidoc.conf Makefile catalyst | files
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \
 		 --format=manpage -D files "$<"
 
 # Additional dependencies due to inclusion
-files/catalyst.1: doc/subarches.generated.txt
-files/catalyst-spec.5: doc/subarches.generated.txt doc/targets.generated.txt
+files/catalyst.1: doc/subarches.generated.txt | files
+files/catalyst-spec.5: doc/subarches.generated.txt doc/targets.generated.txt | files
 
 doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py) doc/make_subarch_table_guidexml.py
 	./doc/make_subarch_table_guidexml.py
@@ -30,7 +33,7 @@ doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py) doc/make_subarch_tab
 doc/targets.generated.txt: doc/make_target_table.py $(wildcard catalyst/targets/*.py)
 	"./$<" > "$@"
 
-$(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile
+$(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile | files
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \
 		 --format=xhtml -D files "$<"
 

[gentoo-commits] proj/catalyst:3.0 commit in: /

[Brian Dolbec]

commit:     5768d9b9d2a0fbe1c91e5e24f02448e127b2921d
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 14:42:27 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Nov 21 09:00:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5768d9b9

Streamline data_files generation with additional keys

* Move data_file generation out of setup().
* Return per-directory keys, since distutils only uses the directory
  key and value filename (not the value path) when installing
  data_files.
* Use relative key paths for more flexible installation.
* Raise NotImplementedError if os.path.sep is not '/', which allows
  for simpler path handling.

---
 setup.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/setup.py b/setup.py
index f585b99..6bc4a06 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,6 @@ from __future__ import print_function
 
 import codecs as _codecs
 from distutils.core import setup as _setup, Command as _Command
-import itertools as _itertools
 import os as _os
 
 from catalyst import __version__
@@ -35,7 +34,10 @@ package_name = 'catalyst'
 tag = '{0}-{1}'.format(package_name, __version__)
 
 
-def files(root):
+if _os.path.sep != '/':
+	raise NotImplementedError('Non-POSIX paths are not supported')
+
+def files(root, target):
 	"""Iterate through all the file paths under `root`
 
 	Distutils wants all paths to be written in the Unix convention
@@ -44,11 +46,18 @@ def files(root):
 	[1]: http://docs.python.org/2/distutils/setupscript.html#writing-the-setup-script
 	"""
 	for dirpath, dirnames, filenames in _os.walk(root):
-		for filename in filenames:
-			path = _os.path.join(dirpath, filename)
-			if _os.path.sep != '/':
-				path = path.replace(_os.path.sep, '/')
-			yield path
+		key = _os.path.join(target, dirpath)
+		filepaths = [_os.path.join(dirpath, filename)
+		             for filename in filenames]
+		yield (key, filepaths)
+
+
+_data_files = [('/etc/catalyst', ['etc/catalyst.conf','etc/catalystrc']),
+	('/usr/share/man/man1', ['files/catalyst.1']),
+	('/usr/share/man/man5', ['files/catalyst-config.5', 'files/catalyst-spec.5'])
+	]
+_data_files.extend(files('livecd', 'lib/catalyst/'))
+_data_files.extend(files('targets', 'lib/catalyst/'))
 
 
 class set_version(_Command):
@@ -106,16 +115,7 @@ _setup(
 		'{0}.base'.format(package_name),
 		'{0}.targets'.format(package_name),
 		],
-	data_files=[
-		('/etc/catalyst', [
-			'etc/catalyst.conf',
-			'etc/catalystrc',
-			]),
-		('lib/catalyst/', list(_itertools.chain(
-			files('livecd'),
-			files('targets'),
-			))),
-		],
+	data_files=_data_files,
 	provides=[package_name],
 	cmdclass={
 		'set_version': set_version

[gentoo-commits] proj/catalyst:3.0 commit in: /

[Brian Dolbec]

commit:     ece724c74da43bf12489a4e809e7c6e1665ff1a9
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Thu Jun  6 22:32:40 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Nov 21 09:00:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ece724c7

Makefile: Set PYTHONPATH=. for make_target_table.py

Avoid:

  $ make
  ...
  "./doc/make_target_table.py" > "doc/targets.generated.txt"
  Traceback (most recent call last):
    File "./doc/make_target_table.py", line 34, in <module>
      __import__(module_name)
  ImportError: No module named catalyst.targets.embedded
  make: *** [doc/targets.generated.txt] Error 1

This also ensures that the local catalyst package takes precedence
over any previously installed version.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6f69e5c..a130fb3 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py) doc/make_subarch_tab
 	./doc/make_subarch_table_guidexml.py
 
 doc/targets.generated.txt: doc/make_target_table.py $(wildcard catalyst/targets/*.py)
-	"./$<" > "$@"
+	PYTHONPATH=. "./$<" > "$@"
 
 $(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile | files
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \

[gentoo-commits] proj/catalyst:3.0 commit in: /

[Brian Dolbec]

commit:     f818ff71b51ca7d6d94dab9852129c78e7bb20c9
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 19:27:43 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Nov 21 09:00:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f818ff71

Add my outgoing directory to ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0cf4f26..4543cdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ build
 dist
 files
 MANIFEST
+outgoing
 
 test.*
 *.geany

[gentoo-commits] proj/catalyst:3.0 commit in: /

[Brian Dolbec]

commit:     1a7ca7043c69e4b8eab71a5726d2da263242a535
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Fri Feb  1 01:31:03 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Nov 21 09:00:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1a7ca704

Move bug-reporting and mailing list notes from TODO to README

This information is generally useful, and folks probably only read
TODO if they want to help but don't already have an idea of what to
help with ;).  Having the contact information in the README should
raise its visibility.

---
 README | 8 ++++++++
 TODO   | 6 +-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README b/README
index ef41380..0674e07 100644
--- a/README
+++ b/README
@@ -60,3 +60,11 @@ There are many more options that can be set, but those defaults are good
 for out of the box operation. For more documentation on what you can do
 with catalyst, please check the man page or the online documentation at
 http://www.gentoo.org/proj/en/releng/catalyst.
+
+Bugs
+========================
+
+If you have questions or wish to help with development, contact the
+gentoo-catalyst@lists.gentoo.org mailing list.  Bug reports should be
+filed at http://tinyurl.com/79slrk (http://bugs.gentoo.org) under the
+"Catalyst" component of the "Gentoo Hosted Projects" product.

diff --git a/TODO b/TODO
index bebdec7..a868508 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,6 @@
 # $Id$
 
-This file is a rough list of changes that need to be made to catalyst.  If you
-have questions about any of these items, or wish to help with development, send
-them to the gentoo-catalyst@lists.gentoo.org mailing list.  Bug reports should
-be filed at http://tinyurl.com/79slrk (http://bugs.gentoo.org) under the
-Catalyst component.
+This file is a rough list of changes that need to be made to catalyst.
 
 Global:
 - Remove spec_prefix from all exported variables

[gentoo-commits] proj/catalyst:3.0 commit in: /

[Brian Dolbec]

commit:     08a003583bac63f9bc7b1752ebb52396294a9c3a
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 19:27:43 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Jun 12 19:27:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=08a00358

Add my outgoing directory to ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0cf4f26..4543cdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ build
 dist
 files
 MANIFEST
+outgoing
 
 test.*
 *.geany