[gentoo-commits] proj/catalyst:master commit in: /, doc/

[gentoo-commits] proj/catalyst:master commit in: /, doc/

[Brian Dolbec]

commit:     773ae7f9ee04cedba218a9abdc9f9b7e8360f055
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 25 04:26:38 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Apr  2 20:04:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=773ae7f9

Commit a testpath file to source with instructions on it's use.

Make testpath automagic via dwfeed's tweak
Update HOWTO on how to run the git checkout code directly without being installed.

---
 doc/HOWTO.txt | 10 ++++++++--
 testpath      | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
index 8fe63c1..cec22c3 100644
--- a/doc/HOWTO.txt
+++ b/doc/HOWTO.txt
@@ -233,9 +233,15 @@ Running catalyst from a Git checkout
 
 If you're developing catalyst, you'll want to test your altered
 version.  An easy way to run it without reinstalling is to setup a
-local configuration file and run:
+local configuration file.  The checkout also includes a testpath file
+which when sourced adds it's bin/ to PATH and it's checkout dir to
+PYTHONPATH.  That terminal will then use the checkout bin/catalyst and
+the checkout's python modules.
 
-    # ./catalyst -c catalyst.conf -f path/to/your.spec
+cd into the checkout directory and run:
+
+    # source ./testpath
+    # catalyst -c catalyst.conf -f path/to/your.spec
 
 The local configuration file can use all the defaults except for
 `sharedir`, which you should change to point to your development

diff --git a/testpath b/testpath
new file mode 100644
index 0000000..37af9c9
--- /dev/null
+++ b/testpath
@@ -0,0 +1,18 @@
+
+# edit the following 2 paths to point to your catalyst git checkout if nessecary
+# then in a terminal window you wish to run the git code in...
+# cd ~/catalyst
+# source ./testpath
+# edit a config catalyst.conf file. Make similar path changes for it to
+# find and use/run the git checkout code.
+# The catalyst code can then be run on a system without being installed or
+# replacing an existing catalyst install which may be used for production.
+#
+# then run catalyst from there
+#  eg:
+#
+# catalyst -c catalyst.conf -p -f stage1.spec
+
+export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
+
+export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"

[gentoo-commits] proj/catalyst:pending commit in: /, doc/

[Brian Dolbec]

commit:     773ae7f9ee04cedba218a9abdc9f9b7e8360f055
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 25 04:26:38 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Apr  2 20:04:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=773ae7f9

Commit a testpath file to source with instructions on it's use.

Make testpath automagic via dwfeed's tweak
Update HOWTO on how to run the git checkout code directly without being installed.

---
 doc/HOWTO.txt | 10 ++++++++--
 testpath      | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
index 8fe63c1..cec22c3 100644
--- a/doc/HOWTO.txt
+++ b/doc/HOWTO.txt
@@ -233,9 +233,15 @@ Running catalyst from a Git checkout
 
 If you're developing catalyst, you'll want to test your altered
 version.  An easy way to run it without reinstalling is to setup a
-local configuration file and run:
+local configuration file.  The checkout also includes a testpath file
+which when sourced adds it's bin/ to PATH and it's checkout dir to
+PYTHONPATH.  That terminal will then use the checkout bin/catalyst and
+the checkout's python modules.
 
-    # ./catalyst -c catalyst.conf -f path/to/your.spec
+cd into the checkout directory and run:
+
+    # source ./testpath
+    # catalyst -c catalyst.conf -f path/to/your.spec
 
 The local configuration file can use all the defaults except for
 `sharedir`, which you should change to point to your development

diff --git a/testpath b/testpath
new file mode 100644
index 0000000..37af9c9
--- /dev/null
+++ b/testpath
@@ -0,0 +1,18 @@
+
+# edit the following 2 paths to point to your catalyst git checkout if nessecary
+# then in a terminal window you wish to run the git code in...
+# cd ~/catalyst
+# source ./testpath
+# edit a config catalyst.conf file. Make similar path changes for it to
+# find and use/run the git checkout code.
+# The catalyst code can then be run on a system without being installed or
+# replacing an existing catalyst install which may be used for production.
+#
+# then run catalyst from there
+#  eg:
+#
+# catalyst -c catalyst.conf -p -f stage1.spec
+
+export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
+
+export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"

[gentoo-commits] proj/catalyst:master commit in: /, doc/

[Sebastian Pipping]

commit:     c107f6d4ec7e984c8d309f32e92e386b202e158f
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun 25 18:02:02 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 18:02:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c107f6d4

Fix man page automation for catalyst 3.x ("arch/" vs. "modules/catalyst/arch")

---
 Makefile                           |    2 +-
 doc/make_subarch_table_guidexml.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 83fbd5a..bb8a228 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ files/catalyst.1: doc/catalyst.1.txt doc/subarches.generated.txt doc/asciidoc.co
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \
 		 --format=manpage -D files "$<"
 
-doc/subarches.generated.txt: $(wildcard arch/*.py)
+doc/subarches.generated.txt: $(wildcard modules/catalyst/arch/*.py)
 	./doc/make_subarch_table_guidexml.py
 
 clean:

diff --git a/doc/make_subarch_table_guidexml.py b/doc/make_subarch_table_guidexml.py
index 22e6c6d..94c4af0 100755
--- a/doc/make_subarch_table_guidexml.py
+++ b/doc/make_subarch_table_guidexml.py
@@ -101,7 +101,7 @@ if __name__ == '__main__':
 	subarch_title_to_subarch_id = dict()
 	subarch_id_to_pattern_arch_genericrch_id = dict()
 
-	for (dirpath, dirnames, filenames) in os.walk('arch'):
+	for (dirpath, dirnames, filenames) in os.walk('modules/catalyst/arch'):
 		for _fn in filenames:
 			if not _fn.endswith('.py'):
 				continue