Commit e28ea074 authored by Guido Günther's avatar Guido Günther

Get rid of the symlink

by moving the commands to gbp/scripts/
parent abf90abc
......@@ -2,16 +2,6 @@
.noseids
.coverage
gbp/gbp_version.py
gbp_clone.py
gbp_pq.py
gbp_pull.py
gbp_create_remote_repo.py
git_buildpackage.py
git_dch.py
git_import_dsc.py
git_import_dscs.py
git_import_orig.py
links_stamp
build/
docs/*.1
......
#! /usr/bin/python -u
import sys
from gbp.scripts.clone import main
sys.exit(main(sys.argv))
#! /usr/bin/python -u
import sys
from gbp.scripts.create_remote_repo import main
sys.exit(main(sys.argv))
#! /usr/bin/python -u
import sys
from gbp.scripts.pq import main
sys.exit(main(sys.argv))
#! /usr/bin/python -u
import sys
from gbp.scripts.pull import main
sys.exit(main(sys.argv))
#! /usr/bin/python -u
import sys
from gbp.scripts.buildpackage import main
sys.exit(main(sys.argv))
#! /usr/bin/python -u
import sys
from gbp.scripts.dch import main
sys.exit(main(sys.argv))
#! /usr/bin/python -u
import sys
from gbp.scripts.import_dsc import main
sys.exit(main(sys.argv))
#! /usr/bin/python -u
import sys
from gbp.scripts.import_dscs import main
sys.exit(main(sys.argv))
#! /usr/bin/python -u
import sys
from gbp.scripts.import_orig import main
sys.exit(main(sys.argv))
......@@ -43,30 +43,24 @@ $(MANUAL): docs/manual.sgml docs/chapters/*.sgml docs/manpages/*.sgml
cp /usr/share/gtk-doc/data/*.png $(MANUAL)
docs/git-pbuilder.1: git-pbuilder
docs/git-pbuilder.1: bin/git-pbuilder
pod2man $< $@
links_stamp:
for c in $(COMMANDS); do \
ln -s $$c $$(echo $$c | sed -e 's,-,_,g').py; \
done
touch links_stamp
apidocs: links_stamp
apidocs:
epydoc -v -n git-buildpackage --no-sourcecode -o docs/apidocs/ \
--url=https://honk.sigxcpu.org/piki/projects/git-buildpackage/ \
--fail-on-docstring-warning \
gbp*.py git*.py gbp/ tests/test_Git*.py
--fail-on-docstring-warning gbp/ tests/test_Git*.py
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
pychecker:
PYTHONPATH=. pychecker $(PYCHECKER_ARGS) -q git*.py gbp*.py
PYTHONPATH=. pychecker $(PYCHECKER_ARGS) -q gbp
checks: links_stamp pychecker
checks: pychecker
export GIT_AUTHOR_NAME="Gbp Tests"; \
export GIT_AUTHOR_EMAIL=tests@example.com; \
export GIT_COMMITTER_NAME=$$GIT_AUTHOR_NAME; \
export GIT_COMMITTER_EMAIL=$$GIT_AUTHOR_EMAIL; \
export PYTHONPATH=$$(pwd); \
nosetests --exe --with-doctest --with-coverage --cover-package=gbp
endif
......
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2006-2011 Guido Guenther <agx@sigxcpu.org>
......
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2009,2010 Guido Guenther <agx@sigxcpu.org>
......
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2010 Guido Guenther <agx@sigxcpu.org>
......
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2007, 2008, 2009, 2010 Guido Guenther <agx@sigxcpu.org>
......
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2006,2007,2011 Guido Guenther <agx@sigxcpu.org>
......
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2008, 2009, 2010 Guido Guenther <agx@sigxcpu.org>
......
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2006, 2007, 2009, 2011 Guido Guenther <agx@sigxcpu.org>
......
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2011 Guido Günther <agx@sigxcpu.org>
......
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2009 Guido Guenther <agx@sigxcpu.org>
......
#!/usr/bin/python
# Copyright (C) 2006,2007 Guido Guenther <agx@sigxcpu.org>
# Copyright (C) 2006-2011 Guido Guenther <agx@sigxcpu.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,9 +21,16 @@ from distutils.core import setup
setup(name = "git_build_package",
author = 'Guido Guenther',
author_email = 'agx@sigxcpu.org',
scripts = [ 'git-buildpackage', 'git-import-dsc', 'git-import-orig', 'git-dch', 'git-import-dscs',
'gbp-pq', 'gbp-pull', 'gbp-clone', 'git-pbuilder', 'gbp-create-remote-repo'],
packages = [ 'gbp' ],
data_files = [("/etc/git-buildpackage/", ["gbp.conf" ]),],
scripts = [ 'bin/git-buildpackage',
'bin/git-import-dsc',
'bin/git-import-orig',
'bin/git-dch',
'bin/git-import-dscs',
'bin/gbp-pq',
'bin/gbp-pull',
'bin/gbp-clone',
'bin/gbp-create-remote-repo',
'bin/git-pbuilder'],
packages = [ 'gbp', 'gbp.scripts' ],
data_files = [("/etc/git-buildpackage/", ["gbp.conf"]),],
)
......@@ -9,12 +9,12 @@ class TestHelp(unittest.TestCase):
"""Test help output of gbp commands"""
def testHelp(self):
for prog in [ "buildpackage", "import-orig", "import-dsc", "dch" ]:
ret = os.system("./git-%s --help >/dev/null" % prog)
ret = os.system("bin/git-%s --help >/dev/null" % prog)
self.assertEqual(ret, 0)
def testHelpGbp(self):
for prog in [ "pull", "clone", "pq", "create-remote-repo" ]:
ret = os.system("./gbp-%s --help >/dev/null" % prog)
ret = os.system("bin/gbp-%s --help >/dev/null" % prog)
self.assertEqual(ret, 0)
# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·:
......@@ -22,8 +22,7 @@ class TestUnpack:
assert os.path.exists(target), "%s does not exist" % target
def _create_archive(self, comp):
filelist = [ os.path.basename(f) for f in
glob.glob(os.path.join(self.top, "g*-*")) ]
filelist = [ 'README', 'setup.py' ]
name = "%s_0.1.tar.%s" % (self.archive_prefix, comp)
t = tarfile.open(name= name, mode='w:%s' % comp)
......@@ -70,7 +69,7 @@ class TestUnpack:
self._check_files(archive[1], comp)
def test_upstream_source_unpack_filtered(self):
exclude = "git-buildpackage"
exclude = "README"
for (comp, archive) in self.archives.iteritems():
source = gbp.deb.UpstreamSource(archive[0])
......
......@@ -9,7 +9,7 @@ import gbp.log
import gbp.git
import gbp.command_wrappers
import git_buildpackage
from gbp.scripts import buildpackage
top = None
repo = None
......@@ -97,7 +97,7 @@ def test_dump_tree():
"""Dump the repository and check if files exist"""
dumpdir = os.path.join(tmpdir, "dump")
os.mkdir(dumpdir)
assert git_buildpackage.dump_tree(repo, dumpdir, "master", True)
assert buildpackage.dump_tree(repo, dumpdir, "master", True)
assert os.path.exists(os.path.join(dumpdir, testfile_name))
assert os.path.exists(os.path.join(dumpdir, submodules[0].name, testfile_name))
......@@ -105,7 +105,7 @@ def test_dump_tree():
def test_create_tarball():
"""Create an upstream tarball"""
cp = { "Source": "test", "Upstream-Version": "0.1" }
assert git_buildpackage.git_archive(repo,
assert buildpackage.git_archive(repo,
cp,
tmpdir,
"HEAD",
......
......@@ -3,7 +3,7 @@ import shutil
import tempfile
import unittest
import git_buildpackage
from gbp.scripts import buildpackage
from gbp.deb import has_orig
from gbp.errors import GbpError
......@@ -31,14 +31,14 @@ class TestDetection(unittest.TestCase):
def test_guess_comp_type_no_pristine_tar_no_orig(self):
repo = MockGitRepository(with_branch=False)
guessed = git_buildpackage.guess_comp_type(
guessed = buildpackage.guess_comp_type(
repo, 'auto', self.cp, self.tmpdir)
self.assertEqual('gzip', guessed)
def test_guess_comp_type_no_pristine_tar_with_orig(self):
open(os.path.join(self.tmpdir, 'source_1.2.orig.tar.bz2'), "w").close()
repo = MockGitRepository(with_branch=False)
guessed = git_buildpackage.guess_comp_type(
guessed = buildpackage.guess_comp_type(
repo, 'auto', self.cp, self.tmpdir)
self.assertEqual('bzip2', guessed)
......@@ -48,7 +48,7 @@ class TestDetection(unittest.TestCase):
repo = MockGitRepository(with_branch=False)
self.assertRaises(
GbpError,
git_buildpackage.guess_comp_type,
buildpackage.guess_comp_type,
repo,
'auto',
self.cp,
......@@ -57,7 +57,7 @@ class TestDetection(unittest.TestCase):
def test_guess_comp_type_auto_bzip2(self):
subject = 'pristine-tar data for source_1.2-3.orig.tar.bz2'
repo = MockGitRepository(with_branch=True, subject=subject)
guessed = git_buildpackage.guess_comp_type(
guessed = buildpackage.guess_comp_type(
repo, 'auto', self.cp, self.tmpdir)
self.assertEqual("bzip2", guessed)
......@@ -70,36 +70,36 @@ class TestDetection(unittest.TestCase):
def test_guess_comp_type_bzip2(self):
repo = MockGitRepository(with_branch=False)
guessed = git_buildpackage.guess_comp_type(
guessed = buildpackage.guess_comp_type(
repo, 'bzip2', self.cp, None)
self.assertEqual("bzip2", guessed)
def test_guess_comp_type_gzip(self):
repo = MockGitRepository(with_branch=False)
guessed = git_buildpackage.guess_comp_type(
guessed = buildpackage.guess_comp_type(
repo, 'gzip', self.cp, None)
self.assertEqual("gzip", guessed)
def test_guess_comp_type_bz(self):
repo = MockGitRepository(with_branch=False)
guessed = git_buildpackage.guess_comp_type(
guessed = buildpackage.guess_comp_type(
repo, 'xz', self.cp, None)
self.assertEqual("xz", guessed)
def test_guess_comp_type_lzma(self):
repo = MockGitRepository(with_branch=False)
guessed = git_buildpackage.guess_comp_type(
guessed = buildpackage.guess_comp_type(
repo, 'lzma', self.cp, None)
self.assertEqual("lzma", guessed)
def test_guess_comp_type_bz2(self):
repo = MockGitRepository(with_branch=False)
guessed = git_buildpackage.guess_comp_type(
guessed = buildpackage.guess_comp_type(
repo, 'bz2', self.cp, None)
self.assertEqual("bzip2", guessed)
def test_guess_comp_type_gz(self):
repo = MockGitRepository(with_branch=False)
guessed = git_buildpackage.guess_comp_type(
guessed = buildpackage.guess_comp_type(
repo, 'gz', self.cp, None)
self.assertEqual("gzip", guessed)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment