From b6a205ccbaf65572c385e4e72e6dd69573cacb5e Mon Sep 17 00:00:00 2001 From: calvin Date: Tue, 23 May 2000 21:49:48 +0000 Subject: [PATCH] setup.py fixed git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@92 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- INSTALL | 6 +++--- README | 4 ++-- debian/rules | 2 +- linkchecker | 2 +- setup.py | 12 +++++++----- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/INSTALL b/INSTALL index 2bcbc4d0..a148afad 100644 --- a/INSTALL +++ b/INSTALL @@ -2,12 +2,11 @@ ========================== Requirements: -You need Python >= 1.5.2 -You get Python from http://www.python.org +You need Python >= 1.5.2 from http://www.python.org/ Optionally packages: Distutils >= 0.8.3 from http://www.python.org/sigs/distutils-sig/ -OpenSSL from http://www.openssl.org +OpenSSL from http://www.openssl.org/ You will need Perl for Win32 (available from http://www.activestate.com/ActivePerl) if you want to install OpenSSL on Windows! @@ -27,6 +26,7 @@ Windows users copy 'linkchecker.bat.tmpl' to 'linkchecker.bat' and replace $install_scripts with the distribution directory. After all, put the distribution directory in your path. + Running LinkChecker: Type "linkchecker" followed by your URLs you want to check. Type "linkchecker -h" for help. diff --git a/README b/README index 1c7719e8..ada0c4ed 100644 --- a/README +++ b/README @@ -7,9 +7,9 @@ Features -------- o recursive checking o multithreaded -o output can be colored or normal text, HTML, SQL, CSV or a GML sitemap +o output can be colored or normal text, HTML, SQL, CSV or a GML sitemap graph -o HTTP/1.1, HTTPS, FTP, mailto:, news:, Gopher, Telnet and local file links +o HTTP/1.1, HTTPS, FTP, mailto:, news:, Gopher, Telnet and local file links are supported Javascript links are currently ignored o restrict link checking with regular expression filters for URLs diff --git a/debian/rules b/debian/rules index b158a2ed..aecddffb 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ install: build dh_installdirs # ha! the root option finally made it into distutils ./setup.py install --root=`pwd`/debian/tmp - install -c -m 644 linkcheckerrc debian/tmp/etc/ + install -c -m 644 linkcheckerrc debian/tmp/etc install -c -m 644 DNS/README debian/tmp/usr/share/doc/$(PACKAGE)/README.dns diff --git a/linkchecker b/linkchecker index a716544c..5200043a 100755 --- a/linkchecker +++ b/linkchecker @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python -O import sys diff --git a/setup.py b/setup.py index 35e9c058..17e03bdf 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ class LCDistribution(Distribution): "Use the -I option for the build_ext command.") def has_ssl(self): - incls = self.find_command_obj("build_ext").include_dirs + incls = self.get_command_obj("build_ext").include_dirs incls = (incls and string.split(incls, os.pathsep)) or [] for d in incls + self.default_include_dirs: if os.path.exists(os.path.join(d, "ssl.h")): @@ -54,7 +54,7 @@ class LCDistribution(Distribution): def replace_vars(self): - inst = self.find_command_obj("install") + inst = self.get_command_obj("install") inst.ensure_ready() t = Template("linkcheck/__init__.py.tmpl") f = open("linkcheck/__init__.py","w") @@ -66,6 +66,7 @@ class LCDistribution(Distribution): f.write(t.fill_in({"install_scripts": inst.install_scripts})) f.close() self.scripts.append('linkchecker.bat') + self.scripts.append('linkcheckerrc') setup (name = "linkchecker", @@ -94,7 +95,8 @@ o internationalization support (currently english and german) distclass = LCDistribution, packages = ['','DNS','linkcheck'], scripts = ['linkchecker'], - data = ['locale/de/LC_MESSAGES/linkcheck.mo', - 'locale/de/LC_MESSAGES/linkcheck.po', - ], + data_files = [('locale/de/LC_MESSAGES', + ['locale/de/LC_MESSAGES/linkcheck.mo', + 'locale/de/LC_MESSAGES/linkcheck.po']), + ], )