diff --git a/Makefile b/Makefile index fc6f7627..3c2b41ec 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,17 @@ # This Makefile is only used by developers. PYVER:=2.7 PYTHON?=python$(PYVER) -APPNAME:=$(shell $(PYTHON) setup.py --name) -LAPPNAME:=$(shell echo $(APPNAME)|tr "[A-Z]" "[a-z]") VERSION:=$(shell $(PYTHON) setup.py --version) PLATFORM:=$(shell $(PYTHON) -c "from distutils.util import get_platform; print get_platform()") +APPNAME:=$(shell $(PYTHON) setup.py --name) +LAPPNAME:=$(shell echo $(APPNAME)|tr "[A-Z]" "[a-z]") +ARCHIVE_SOURCE:=$(APPNAME)-$(VERSION).tar.xz +ARCHIVE_WIN32:=$(APPNAME)-$(VERSION).exe +GITUSER:=wummel +GITREPO:=$(LAPPNAME) +HOMEPAGE:=$(HOME)/public_html/$(LAPPNAME).git +DEBUILDDIR:=$(HOME)/projects/debian/official +DEBORIGFILE:=$(DEBUILDDIR)/$(LAPPNAME)_$(VERSION).orig.tar.xz FILESCHECK_URL:=http://localhost/~calvin/ SRCDIR:=${HOME}/src PY_FILES_DIRS:=linkcheck tests *.py linkchecker linkchecker-nagios linkchecker-gui cgi-bin config doc @@ -12,9 +19,6 @@ TESTS ?= tests # set test options, eg. to "--verbose" TESTOPTS= PAGER ?= less -# build dir for debian package -BUILDDIR:=$(HOME)/projects/debian/official -DEB_ORIG_TARGET:=$(BUILDDIR)/linkchecker_$(VERSION).orig.tar.xz # original dnspython repository module DNSPYTHON:=$(HOME)/src/dnspython-git # options to run the pep8 utility @@ -31,6 +35,7 @@ endif # Pytest options: # - use multiple processors # - write test results in file +# - log test durations PYTESTOPTS:=-n $(NUMPROCESSORS) --resultlog=testresults.txt --durations=0 @@ -46,7 +51,7 @@ clean: rm -f linkcheck/network/_network*.so find . -name '*.py[co]' -exec rm -f {} \; -distclean: clean cleandeb +distclean: clean rm -rf build dist $(APPNAME).egg-info rm -f _$(APPNAME)_configdata.py MANIFEST Packages.gz # clean aborted dist builds and -out files @@ -55,11 +60,6 @@ distclean: clean cleandeb rm -rf $(APPNAME)-$(VERSION) rm -rf coverage dist-stamp python-build-stamp* -cleandeb: - rm -rf debian/$(LAPPNAME) debian/tmp - rm -f debian/*.debhelper debian/{files,substvars} - rm -f configure-stamp build-stamp - MANIFEST: MANIFEST.in setup.py $(PYTHON) setup.py sdist --manifest-only @@ -74,34 +74,44 @@ localbuild: MANIFEST locale cp -f build/lib.$(PLATFORM)-$(PYVER)*/linkcheck/HtmlParser/htmlsax*.so linkcheck/HtmlParser cp -f build/lib.$(PLATFORM)-$(PYVER)*/linkcheck/network/_network*.so linkcheck/network -deb_orig: - if [ ! -e $(DEB_ORIG_TARGET) ]; then \ - cp dist/$(APPNAME)-$(VERSION).tar.xz $(DEB_ORIG_TARGET); \ - fi +release: distclean releasecheck filescheck + $(MAKE) dist sign upload homepage tag register deb -release: distclean releasecheck filescheck clean dist-stamp sign_distfiles upload - git tag v$(VERSION) - $(MAKE) homepage - $(MAKE) register - $(MAKE) announce +tag: + git tag upstream/$(VERSION) + git push --tags origin upstream/$(VERSION) + +upload: + github-upload $(GITUSER) $(GITREPO) \ + dist/$(ARCHIVE_SOURCE) dist/$(ARCHIVE_WIN32) \ + dist/$(ARCHIVE_SOURCE).asc dist/$(ARCHIVE_WIN32).asc homepage: - @echo "Updating $(APPNAME) Homepage..." +# update documentation and man pages $(MAKE) -C doc man - sed -i -e "s/version = '.*'/version = '$(VERSION)'/" ~/public_html/linkchecker.sf.net/source/conf.py - $(MAKE) -C ~/public_html/linkchecker.sf.net update upload - @echo "done." +# generate static files + make -C $(HOMEPAGE) gen upload register: @echo "Register at Python Package Index..." $(PYTHON) setup.py register @echo "done." - -announce: @echo "Submitting to Freecode..." freecode-submit < $(LAPPNAME).freecode @echo "done." +deb: +# build a debian package + [ -f $(DEBORIGFILE) ] || cp dist/$(ARCHIVE_SOURCE) $(DEBORIGFILE) + sed -i -e 's/VERSION_$(LAPPNAME):=.*/VERSION_$(LAPPNAME):=$(VERSION)/' $(DEBUILDDIR)/$(LAPPNAME).mak + [ -d $(DEBPACKAGEDIR) ] || (cd $(DEBUILDDIR); \ + patool extract $(DEBORIGFILE); \ + cd $(CURDIR); \ + git checkout debian; \ + cp -r debian $(DEBPACKAGEDIR); \ + git checkout master) + $(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)_clean $(LAPPNAME) + chmod: -chmod -R a+rX,u+w,go-w $(CHMODMINUSMINUS) * find . -type d -exec chmod 755 {} \; @@ -110,10 +120,7 @@ dist: locale MANIFEST chmod rm -f dist/$(APPNAME)-$(VERSION).tar.xz $(PYTHON) setup.py sdist --formats=tar xz dist/$(APPNAME)-$(VERSION).tar - -dist-stamp: changelog config/ca-certificates.crt - $(MAKE) dist - touch $@ + [ ! -f ../$(ARCHIVE_WIN32) ] || cp ../$(ARCHIVE_WIN32) dist # Build OSX installer with py2app app: distclean localbuild chmod @@ -128,7 +135,6 @@ rpm: # The check programs used here are mostly local scripts on my private system. # So for other developers there is no need to execute this target. check: - [ ! -d .svn ] || check-nosvneolstyle -v check-copyright check-pofiles -v py-tabdaddy @@ -175,19 +181,20 @@ filescheck: localbuild update-copyright: update-copyright --holder="Bastian Kleineidam" -releasecheck: check +releasecheck: check update-certificates @if egrep -i "xx\.|xxxx|\.xx" doc/changelog.txt > /dev/null; then \ echo "Could not release: edit doc/changelog.txt release date"; false; \ fi + @if [ ! -f ../$(ARCHIVE_WIN32) ]; then \ + echo "Missing WIN32 distribution archive at ../$(ARCHIVE_WIN32)"; \ + false; \ + fi @if ! grep "Version: $(VERSION)" $(LAPPNAME).freecode > /dev/null; then \ echo "Could not release: edit $(LAPPNAME).freecode version"; false; \ fi - @if grep "UNRELEASED" debian/changelog > /dev/null; then \ - echo "Could not release: edit debian/changelog distribution name"; false; \ - fi $(PYTHON) setup.py check --restructuredtext -sign_distfiles: +sign: for f in $(shell find dist -name *.xz -o -name *.exe -o -name *.zip -o -name *.dmg); do \ [ -f $${f}.asc ] || gpg --detach-sign --armor $$f; \ done @@ -240,6 +247,6 @@ config/ca-certificates.crt: /etc/ssl/certs/ca-certificates.crt cp $< $@ .PHONY: test changelog gui count pyflakes ide login upload all clean distclean -.PHONY: pep8 cleandeb locale localbuild deb_orig diff dnsdiff sign_distfiles +.PHONY: pep8 cleandeb locale localbuild deb diff dnsdiff sign .PHONY: filescheck update-copyright releasecheck check register announce .PHONY: chmod dist app rpm release homepage update-certificates diff --git a/cgi-bin/lconline/lc_cgi.html.de b/cgi-bin/lconline/lc_cgi.html.de index ae2551d6..3aa53cb7 100644 --- a/cgi-bin/lconline/lc_cgi.html.de +++ b/cgi-bin/lconline/lc_cgi.html.de @@ -23,7 +23,7 @@ function gettext (s) { alink="#191c83">

LinkChecker Online

-(läuft mit Öl vom LinkChecker)
diff --git a/cgi-bin/lconline/lc_cgi.html.en b/cgi-bin/lconline/lc_cgi.html.en index 559c7db1..e3c3165a 100644 --- a/cgi-bin/lconline/lc_cgi.html.en +++ b/cgi-bin/lconline/lc_cgi.html.en @@ -17,7 +17,7 @@ function gettext (s) { alink="#191c83">

LinkChecker Online

-(powered by LinkChecker)
diff --git a/debian/control b/debian/control index fa8e3cf8..a91c7318 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 9), qt4-dev-tools X-Python-Version: >= 2.7 Standards-Version: 3.9.3.1 -Homepage: http://linkchecker.sourceforge.net/ -Vcs-Git: git://linkchecker.git.sourceforge.net/gitroot/linkchecker/linkchecker -Vcs-Browser: http://linkchecker.git.sourceforge.net/ +Homepage: http://wummel.github.com/linkchecker/ +XS-Vcs-Git-Upstream: git://github.com/wummel/linkchecker.git +XS-Vcs-Browser-Upstream: https://github.com/wummel/linkchecker Package: linkchecker Architecture: any diff --git a/debian/copyright b/debian/copyright index 7a321c07..94eb999b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ This is linkchecker, written and maintained by Bastian Kleineidam on Sat, 8 Jan 2000 11:00:35 +0100. The original source can always be found at: - http://linkchecker.sourceforge.net/ + http://wummel.github.com/linkchecker/ Copyright (C) 2000-2012 Bastian Kleineidam diff --git a/doc/changelog.txt b/doc/changelog.txt index fa91eeae..bc4c61ef 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -1,5 +1,9 @@ 8.3 "" (released xx.xx.xxxx) +Features: +- project: The Project moved to Github. + Closes: GH bug #368 + Changes: - logging: Print system arguments (sys.argv) and variable values in internal error information. diff --git a/doc/de.po b/doc/de.po index 35cef619..fd4dc4d3 100644 --- a/doc/de.po +++ b/doc/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: linkchecker 3.4\n" -"POT-Creation-Date: 2012-11-08 11:13+0100\n" +"POT-Creation-Date: 2013-01-06 18:09+0100\n" "PO-Revision-Date: 2012-11-08 11:14+0100\n" "Last-Translator: Bastian Kleineidam \n" "Language-Team: de \n" @@ -1805,7 +1805,9 @@ msgstr "AUTHOR" # type: Plain text #. type: Plain text #: en/linkchecker.1:513 en/linkcheckerrc.5:592 en/linkchecker-gui.1:21 -msgid "Bastian Kleineidam Ecalvin@users.sourceforge.netE" +#, fuzzy +#| msgid "Bastian Kleineidam Ecalvin@users.sourceforge.netE" +msgid "Bastian Kleineidam Ebastian.kleineidam@web.deE" msgstr "Bastian Kleineidam Ecalvin@users.sourceforge.netE" # type: SH diff --git a/doc/de/linkchecker-gui.1 b/doc/de/linkchecker-gui.1 index b78d84a6..ec8a9f1b 100644 --- a/doc/de/linkchecker-gui.1 +++ b/doc/de/linkchecker-gui.1 @@ -24,7 +24,7 @@ Menü oder mit Drag\-And\-Drop auf das GUI\-Fenster geladen werden. \fBlinkchecker\fP(1) . .SH AUTHOR -Bastian Kleineidam +Bastian Kleineidam . .SH COPYRIGHT Copyright \(co 2009\-2012 Bastian Kleineidam diff --git a/doc/de/linkchecker.1 b/doc/de/linkchecker.1 index 85397d10..12a2dfd9 100644 --- a/doc/de/linkchecker.1 +++ b/doc/de/linkchecker.1 @@ -512,7 +512,7 @@ Ausdrücken \fBlinkcheckerrc\fP(5) . .SH AUTHOR -Bastian Kleineidam +Bastian Kleineidam . .SH COPYRIGHT Copyright \(co 2000\-2012 Bastian Kleineidam diff --git a/doc/de/linkcheckerrc.5 b/doc/de/linkcheckerrc.5 index efc02344..0b9dd7f1 100644 --- a/doc/de/linkcheckerrc.5 +++ b/doc/de/linkcheckerrc.5 @@ -592,7 +592,7 @@ Die URL %(url)s enthält Leerzeichen am Anfang oder Ende. BEISPIEL . .SH AUTHOR -Bastian Kleineidam +Bastian Kleineidam . .SH COPYRIGHT Copyright \(co 2000\-2012 Bastian Kleineidam diff --git a/doc/en/linkchecker-gui.1 b/doc/en/linkchecker-gui.1 index 7df2c912..edca6559 100644 --- a/doc/en/linkchecker-gui.1 +++ b/doc/en/linkchecker-gui.1 @@ -17,7 +17,7 @@ menu entry or with drag-and-drop on the GUI window. \fBlinkchecker\fP(1) . .SH AUTHOR -Bastian Kleineidam +Bastian Kleineidam . .SH COPYRIGHT Copyright \(co 2009-2012 Bastian Kleineidam diff --git a/doc/en/linkchecker.1 b/doc/en/linkchecker.1 index 43518314..55032f52 100644 --- a/doc/en/linkchecker.1 +++ b/doc/en/linkchecker.1 @@ -509,7 +509,7 @@ might slow down the program or even the whole system. \fBlinkcheckerrc\fP(5) . .SH AUTHOR -Bastian Kleineidam +Bastian Kleineidam . .SH COPYRIGHT Copyright \(co 2000-2012 Bastian Kleineidam diff --git a/doc/en/linkcheckerrc.5 b/doc/en/linkcheckerrc.5 index 3c535ae8..3a4dee74 100644 --- a/doc/en/linkcheckerrc.5 +++ b/doc/en/linkcheckerrc.5 @@ -588,7 +588,7 @@ The URL contains leading or trailing whitespace. linkchecker(1) . .SH AUTHOR -Bastian Kleineidam +Bastian Kleineidam . .SH COPYRIGHT Copyright \(co 2000-2012 Bastian Kleineidam diff --git a/doc/html/index.html b/doc/html/index.html index 8130028c..369633e3 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -46,7 +46,7 @@ can be used to check all browser bookmarks.

Options

The commandline client options are documented -in the linkchecker(1) manual page.

+in the linkchecker(1) manual page.

In the GUI client, the following options are available:

@@ -66,7 +66,7 @@ A negative depth (eg. -1) will enable infinite recursion.

Profiles memory usage and writes statistics and a dump file when checking stops. The dump file can be examined with -external tools. +external tools. This option should only be useful for developers.

  • Warning strings

    @@ -86,7 +86,7 @@ Useful if certain URL types should not be checked like emails (ie.

    Each user can edit a configuration with advanced options for checking or filtering. The -linkcheckerrc(5) manual page +linkcheckerrc(5) manual page documents all the options.

    In the GUI client the configuration file can be edited directly from @@ -161,7 +161,7 @@ article is specified, it will be requested from the server.

    • will be made.

    The complete list of recognized, but unsupported links can be seen in the -unknownurl.py +unknownurl.py source file. The most prominent of them are JavaScript links.

    diff --git a/doc/html/index.txt b/doc/html/index.txt index 404b4ee4..5992b825 100644 --- a/doc/html/index.txt +++ b/doc/html/index.txt @@ -22,7 +22,7 @@ can be used to check all browser bookmarks. ## Options The commandline client options are documented -in the [linkchecker(1) manual page](http://linkchecker.sourceforge.net/man1/linkchecker.1.html). +in the [linkchecker(1) manual page](http://wummel.github.com/linkchecker/man1/linkchecker.1.html). In the GUI client, the following options are available: @@ -44,7 +44,7 @@ In the GUI client, the following options are available: Profiles memory usage and writes statistics and a dump file when checking stops. The dump file can be examined with - [external tools](http://linkchecker.git.sourceforge.net/git/gitweb.cgi?p=linkchecker/linkchecker;a=blob;f=tests/analyze_memdump.py;hb=HEAD). + [external tools](https://github.com/wummel/linkchecker/blob/master/tests/analyze_memdump.py). This option should only be useful for developers. - Warning strings @@ -65,7 +65,7 @@ In the GUI client, the following options are available: Each user can edit a configuration with advanced options for checking or filtering. The -[linkcheckerrc(5) manual page](http://linkchecker.sourceforge.net/man5/linkcheckerrc.5.html) +[linkcheckerrc(5) manual page](http://wummel.github.com/linkchecker/man5/linkcheckerrc.5.html) documents all the options. In the GUI client the configuration file can be edited directly from @@ -141,7 +141,7 @@ checking. All connection check types are described below. will be made. The complete list of recognized, but unsupported links can be seen in the - [unknownurl.py](http://linkchecker.git.sourceforge.net/git/gitweb.cgi?p=linkchecker/linkchecker;a=blob;f=linkcheck/checker/unknownurl.py;hb=HEAD) + [unknownurl.py](https://github.com/wummel/linkchecker/blob/master/linkcheck/checker/unknownurl.py) source file. The most prominent of them are JavaScript links. ## Recursion diff --git a/doc/linkchecker.doc.pot b/doc/linkchecker.doc.pot index f97d99a2..5ed023ee 100644 --- a/doc/linkchecker.doc.pot +++ b/doc/linkchecker.doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-11-08 11:13+0100\n" +"POT-Creation-Date: 2013-01-06 18:09+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1420,7 +1420,7 @@ msgstr "" #. type: Plain text #: en/linkchecker.1:513 en/linkcheckerrc.5:592 en/linkchecker-gui.1:21 -msgid "Bastian Kleineidam Ecalvin@users.sourceforge.netE" +msgid "Bastian Kleineidam Ebastian.kleineidam@web.deE" msgstr "" #. type: SH diff --git a/linkcheck/configuration/__init__.py b/linkcheck/configuration/__init__.py index ec6af5f7..6a5d2e0c 100644 --- a/linkcheck/configuration/__init__.py +++ b/linkcheck/configuration/__init__.py @@ -38,13 +38,13 @@ AppName = configdata.name App = AppName+u" "+Version Author = configdata.author HtmlAuthor = Author.replace(u' ', u' ') -Copyright = u"Copyright (C) 2000-2012 "+Author -HtmlCopyright = u"Copyright © 2000-2012 "+HtmlAuthor +Copyright = u"Copyright (C) 2000-2013 "+Author +HtmlCopyright = u"Copyright © 2000-2013 "+HtmlAuthor AppInfo = App+u" "+Copyright HtmlAppInfo = App+u", "+HtmlCopyright Url = configdata.url -SupportUrl = u"http://sourceforge.net/projects/linkchecker/support" -DonateUrl = u"http://linkchecker.sourceforge.net/donations.html" +SupportUrl = u"https://github.com/wummel/linkchecker/issues" +DonateUrl = u"http://wummel.github.com/linkchecker/donations.html" Email = configdata.author_email UserAgent = u"Mozilla/5.0 (compatible; %s/%s; +%s)" % (AppName, Version, Url) Freeware = AppName+u""" comes with ABSOLUTELY NO WARRANTY! diff --git a/linkcheck/updater.py b/linkcheck/updater.py index 9b0b24fe..3420003b 100644 --- a/linkcheck/updater.py +++ b/linkcheck/updater.py @@ -25,7 +25,7 @@ from distutils.version import StrictVersion # Use the Freecode submit file as source since that file gets updated # only when releasing a new version. -UPDATE_URL = "http://linkchecker.git.sourceforge.net/git/gitweb.cgi?p=linkchecker/linkchecker;a=blob_plain;f=linkchecker.freecode;hb=HEAD" +UPDATE_URL = "https://raw.github.com/wummel/linkchecker/master/linkchecker.freecode" VERSION_TAG = 'Version:' if os.name == 'nt': URL_TAG = 'Windows-installer-URL:' diff --git a/linkchecker.freecode b/linkchecker.freecode index b09b0501..70a9c990 100644 --- a/linkchecker.freecode +++ b/linkchecker.freecode @@ -2,12 +2,12 @@ Project: LinkChecker Version: 8.2 Release-Focus: Minor bugfixes Hide: N -Website-URL: http://linkchecker.sourceforge.net/ -Changelog-URL: http://linkchecker.git.sourceforge.net/git/gitweb.cgi?p=linkchecker/linkchecker;a=blob;f=doc/changelog.txt;hb=HEAD -Source-Package-URL: http://downloads.sourceforge.net/linkchecker/LinkChecker-${version}.tar.xz +Website-URL: http://wummel.github.com/linkchecker/ +Changelog-URL: https://github.com/wummel/linkchecker/blob/master/doc/changelog.txt +Source-Package-URL: http://github.com/downloads/wummel/linkchecker/LinkChecker-${version}.tar.xz Debian-Package-URL: http://packages.debian.org/linkchecker -GIT-Tree-URL: http://linkchecker.git.sourceforge.net/ -Windows-installer-URL: http://downloads.sourceforge.net/linkchecker/LinkChecker-${version}.exe +GIT-Tree-URL: https://github.com/wummel/linkchecker.git +Windows-installer-URL: http://github.com/downloads/wummel/linkchecker/LinkChecker-${version}.exe Anchor checking, cookie path matching, non-ASCII exception handling and configuration directory creation on Windows systems has been fixed. diff --git a/setup.cfg b/setup.cfg index b3e6e342..147b3180 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ [bdist_rpm] release = 1 -packager = Bastian Kleineidam +packager = Bastian Kleineidam doc_files = doc/examples/ cgi-bin/lconline/ provides = linkchecker diff --git a/setup.py b/setup.py index 95ae4a47..36c25369 100644 --- a/setup.py +++ b/setup.py @@ -631,7 +631,7 @@ else: extra_compile_args.append("-pedantic") myname = "Bastian Kleineidam" -myemail = "calvin@users.sourceforge.net" +myemail = "bastian.kleineidam@web.de" data_files = [ ('share/linkchecker', @@ -868,8 +868,7 @@ args = dict( author_email = myemail, maintainer = myname, maintainer_email = myemail, - url = "http://linkchecker.sourceforge.net/", - download_url="http://sourceforge.net/project/showfiles.php?group_id=1913", + url = "http://wummel.github.com/linkchecker/", license = "GPL", long_description = """Linkchecker features: