configuration

git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@176 e7d03fd6-7b0d-0410-9947-9c21f3af8025

INSTALL

@@ -8,6 +8,7 @@ Distutils >= 0.9.1 from http://www.python.org/sigs/distutils-sig/
 Python 1.6 includes the Distutils 0.9.1,
 Python 2.0 includes the Distutils 1.0
 
+
 Optionally packages
 -------------------
 OpenSSL from http://www.openssl.org/
@@ -27,12 +28,22 @@ Run "python setup.py --help" for help.
 Debian users can build the .deb package with "debian/rules binary" as
 root or "fakeroot debian/rules binary" as a normal user.
 
-The system wide configuration file is in /etc/linkcheckerrc.
+After installation, the system wide configuration file is in 
+<prefix>/share/linkchecker/linkcheckerrc.
+Local configuration files are in ~/.linkcheckerrc on Unix platforms.
+
 To run the program type "linkchecker" followed by your URLs you want 
 to check.
 Type "linkchecker -h" for help.
 
 
+Note
+----
+If you want to make your own distribution with "python setup.py sdist",
+you will need Distutils >= 0.9.4. Older versions are hanging when
+they try to parse the MANIFEST.in file.
+
+
 (Fast)CGI web interface
 -----------------------
 The *cgi files are three CGI script which you can use to run LinkChecker

MANIFEST.in

@@ -1,15 +1,11 @@
 include MANIFEST.in
 include README FAQ INSTALL LICENSE TODO draft-gilman-news-url-00.txt
-include linkcheckerrc linkchecker linkchecker.bat
+include linkcheckerrc linkchecker linkchecker.bat create.sql
 include lc.cgi lc.fcgi lc.sz_fcgi
 include Makefile
 include create.sql
-include debian/rules
-include debian/changelog
-include debian/copyright
-include debian/control
-include debian/dirs
-include debian/docs
+include debian/rules debian/changelog debian/copyright debian/control
+include debian/dirs debian/docs debian/links
 include DNS/README
 include test/viewprof.py test/profiletest.py test/*.html
 recursive-include locale *.mo *.po

README

@@ -81,7 +81,7 @@ commandline options and stores them in a Config object.
 
 (2) Which leads us directly to the Config class. This class stores all
 options and works a little magic: it tries to find out if your platform
-supports threads. If so, they are enabled. If not, they are disabled.
+supports threads. If so, threading is enabled. If not, it is disabled.
 Several functions are replaced with their threaded equivalents if 
 threading is enabled.
 Another thing are config files. A Config object reads config file options

create.sql

@@ -1,8 +1,8 @@
 -- tested with postgresql
 
-drop table linkdb;
+drop table linksdb;
 
-create table linkdb (
+create table linksdb (
     urlname        varchar(50) not null,
     recursionlevel int not null,
     parentname     varchar(50),

debian/changelog

@@ -1,8 +1,11 @@
 linkchecker (1.2.6) unstable; urgency=low
 
-  * placeholder
+  * made a FAQ
+  * configuration changes: distutils are now required; because of that
+    we have no more .tmpl files
+  * correct db name in create.sql
 
- -- Bastian Kleineidam <calvin@users.sourceforge.net>  Sun, 17 Sep 2000 11:22:29 +0200
+ -- Bastian Kleineidam <calvin@users.sourceforge.net>  Fri, 13 Oct 2000 23:44:29 +0200
 
 linkchecker (1.2.5) unstable; urgency=low
 

debian/docs

@@ -5,3 +5,5 @@ FAQ
 lc.cgi
 lc.fcgi
 lc.sz_fcgi
+create.sql
+draft-gilman-news-url-00.txt

debian/links

@@ -0,0 +1 @@
+/usr/share/linkchecker/linkcheckerrc /etc/linkcheckerrc

debian/rules

@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
+DOC_DIR = debian/tmp/usr/share/doc/linkchecker
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -35,8 +36,12 @@ install: build
 	dh_installdirs
 	# ha! the root option finally made it into distutils
 	python setup.py install --root=`pwd`/debian/tmp
-	# put the README of the DNS package in doc (only on Debian)
-	install -c -m 644 DNS/README debian/tmp/usr/share/doc/linkchecker/README.dns
+	# install additional doc files
+	install -c -m 644 DNS/README $(DOC_DIR)/README_DNS.txt
+	install -d -m 755 $(DOC_DIR)/test
+	install -c -m 644 test/*.html test/*.py $(DOC_DIR)/test
+	install -d -m 755 $(DOC_DIR)/tests
+	install -c -m 644 tests/*.py $(DOC_DIR)/tests
 
 
 # Build architecture-independent files here.
@@ -48,7 +53,7 @@ binary-arch: build install
 #	dh_testversion
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
+#	dh_installdebconf
 	dh_installdocs
 #	dh_installexamples
 #	dh_installmenu
@@ -60,7 +65,7 @@ binary-arch: build install
 #	dh_installinfo
 	dh_undocumented linkchecker.1
 	dh_installchangelogs 
-#	dh_link
+	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms

linkcheck/Config.py

@@ -355,11 +355,8 @@ class Configuration(UserDict.UserDict):
     def read(self, files = []):
         if not files:
             files.insert(0,norm("~/.linkcheckerrc"))
-            if os.name=='nt':
-                path=os.getcwd()
-            else:
-                path="/etc"
-            files.insert(0,norm(join(path, "linkcheckerrc")))
+            config_dir = join(LinkCheckerConf.install_data, 'linkchecker')
+            files.insert(0,norm(join(config_dir, "linkcheckerrc")))
         self.readConfig(files)
 
     def warn(self, msg):

setup.py

@@ -173,7 +173,7 @@ o (Fast)CGI web interface
                      ('share/locale/fr/LC_MESSAGES',
                       ['locale/fr/LC_MESSAGES/linkcheck.mo',
 		       'locale/fr/LC_MESSAGES/linkcheck.po']),
-                     ('/etc', ['linkcheckerrc']),
-                     ('share/linkchecker',['linkchecker.bat']),
+                     ('share/linkchecker',['linkchecker.bat',
+		                           'linkcheckerrc',]),
 		    ],
 )