Bernd Zeimetz [Sun, 19 Jul 2009 13:50:19 +0000 (15:50 +0200)]
Merge commit 'origin/buildsystems' into python-build
Conflicts:
Debian/Debhelper/Buildsystem/python_distutils.pm
Joey Hess [Sun, 19 Jul 2009 13:45:36 +0000 (15:45 +0200)]
fix get_sourcepath use and misc style fixes
Bernd Zeimetz [Sun, 19 Jul 2009 13:44:57 +0000 (15:44 +0200)]
Ensure that we find the right default dbg Python.
Joey Hess [Sun, 19 Jul 2009 13:34:22 +0000 (15:34 +0200)]
Merge commit 'bzed/python-build' into buildsystems
Conflicts:
debian/changelog
Joey Hess [Sun, 19 Jul 2009 13:33:40 +0000 (15:33 +0200)]
update
Bernd Zeimetz [Sun, 19 Jul 2009 13:24:40 +0000 (15:24 +0200)]
Check the various build-deps for python-dbg.
The default dbg interpreter can be installed by
various build-deps, check them all.
Bernd Zeimetz [Sun, 19 Jul 2009 13:16:21 +0000 (15:16 +0200)]
Merge commit 'origin/buildsystems' into python-build
Conflicts:
Debian/Debhelper/Buildsystem/python_distutils.pm
Bernd Zeimetz [Sun, 19 Jul 2009 11:51:50 +0000 (13:51 +0200)]
Build Python dbg extensions automatically.
Python dbg interpreters are only called if the
package build-depends on them.
Joey Hess [Sun, 19 Jul 2009 07:37:21 +0000 (09:37 +0200)]
improve comment
Joey Hess [Sun, 19 Jul 2009 07:34:07 +0000 (09:34 +0200)]
minor improvement
Joey Hess [Sun, 19 Jul 2009 07:32:31 +0000 (09:32 +0200)]
Merge commit 'remotes/bzed/python-build' into buildsystems
Bernd Zeimetz [Sun, 19 Jul 2009 00:21:06 +0000 (02:21 +0200)]
Build for all supported Pythons if installed.
python_distutils buildsystem: Build for all supported Python
versions in case they're installed. Ensure that correct
shebangs are created by using `python' first during build
and install. Closes: #520834
Joey Hess [Sat, 18 Jul 2009 11:30:32 +0000 (13:30 +0200)]
relocate comment inside if
Joey Hess [Wed, 15 Jul 2009 13:50:47 +0000 (09:50 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Joey Hess [Wed, 15 Jul 2009 13:42:08 +0000 (09:42 -0400)]
dh_install: Add test suite covering the last 5 bugs.
Joey Hess [Wed, 15 Jul 2009 13:29:07 +0000 (09:29 -0400)]
releasing version 7.2.23
Joey Hess [Wed, 15 Jul 2009 13:24:15 +0000 (09:24 -0400)]
dh_install: Fix support for the case where debian/tmp is explicitly specified in filename paths despite being searched by default. Closes: #537140
Joey Hess [Tue, 14 Jul 2009 21:39:31 +0000 (17:39 -0400)]
forgot to add ant.pm
Joey Hess [Tue, 14 Jul 2009 21:26:19 +0000 (17:26 -0400)]
test suite should not need modification to add a new build system
Joey Hess [Tue, 14 Jul 2009 21:24:46 +0000 (17:24 -0400)]
fix indent
Joey Hess [Tue, 14 Jul 2009 21:15:18 +0000 (17:15 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Joey Hess [Tue, 14 Jul 2009 21:14:10 +0000 (17:14 -0400)]
releasing version 7.2.22
Joey Hess [Tue, 14 Jul 2009 21:08:23 +0000 (17:08 -0400)]
dh_install: Fix support for the case where --sourcedir=debian/tmp/foo is used. Perl was not being greedy enough and the 'foo' was not stripped from the destination directory in this unusual case. Closes: #537017
Joey Hess [Tue, 14 Jul 2009 20:36:13 +0000 (16:36 -0400)]
Add ant buildsystem support. Closes: #537021
Joey Hess [Thu, 9 Jul 2009 01:26:57 +0000 (21:26 -0400)]
releasing version 7.3.2
Joey Hess [Thu, 9 Jul 2009 01:23:43 +0000 (21:23 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Joey Hess [Thu, 9 Jul 2009 01:08:48 +0000 (21:08 -0400)]
Add a versioned dep on perl-base, to get a version that supports GetOptionsFromArray. Closes: #536310
Joey Hess [Thu, 2 Jul 2009 16:46:55 +0000 (12:46 -0400)]
Merge branch 'master' into buildsystems
Joey Hess [Thu, 2 Jul 2009 16:46:13 +0000 (12:46 -0400)]
avoid installing empty translated debhelper.7 man pages
When empty due to not being fully enough translated, as is the case now.
Joey Hess [Thu, 2 Jul 2009 16:29:31 +0000 (12:29 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Joey Hess [Thu, 2 Jul 2009 16:23:23 +0000 (12:23 -0400)]
releasing version 7.2.20
Joey Hess [Thu, 2 Jul 2009 16:17:39 +0000 (12:17 -0400)]
dh_install: Fix installation of entire top-level directory from debian/tmp. Closes: #535367
This was broken by the slash removal fix in
e45749314e98a3304b1f845884ac50327c29cc10. Of course those
unnecessary slashes were actually necessary for dirname to
DTRT.
Joey Hess [Wed, 1 Jul 2009 23:51:51 +0000 (19:51 -0400)]
mention configure
Joey Hess [Wed, 1 Jul 2009 19:49:13 +0000 (15:49 -0400)]
releasing version 7.3.0
Joey Hess [Wed, 1 Jul 2009 19:38:54 +0000 (15:38 -0400)]
improve list formatting
Joey Hess [Tue, 30 Jun 2009 17:04:34 +0000 (13:04 -0400)]
Merge commit 'remotes/modestas/buildsystems' into buildsystems
Joey Hess [Tue, 30 Jun 2009 17:04:11 +0000 (13:04 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Joey Hess [Tue, 30 Jun 2009 17:03:47 +0000 (13:03 -0400)]
releasing version 7.2.19
Joey Hess [Tue, 30 Jun 2009 16:56:42 +0000 (12:56 -0400)]
dh_install: Fix use of debian/tmp in v7 mode; a bug caused it to put files inside a debian/tmp directory in the package build directory, now that prefix is stripped. (See #534565)
(This also includes a fix to avoid doubled slashes in paths passed to
commands.)
Joey Hess [Tue, 30 Jun 2009 16:48:28 +0000 (12:48 -0400)]
dh_install: Handle correctly the case where a glob expands to a dangling symlink, installing the dangling link as requested. Closes: #534565
Joey Hess [Tue, 30 Jun 2009 16:35:29 +0000 (12:35 -0400)]
typo
Modestas Vainius [Tue, 30 Jun 2009 13:04:50 +0000 (16:04 +0300)]
rmdir_builddir(): use shell commands rather than perl equivalent.
Pass --ignore-fail-on-non-empty option to shell rmddir and later
check with -d if the exists to get the same effect. Also drop
no act check from rmdir_builddir(), doit() does it for us now.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Joey Hess [Tue, 30 Jun 2009 02:22:21 +0000 (22:22 -0400)]
remove enforce_out_of_source_building
It was only used by the test suite, and while symetrical I don't
feel that justifies keeping dead code.
Joey Hess [Tue, 30 Jun 2009 02:16:56 +0000 (22:16 -0400)]
layout
Modestas Vainius [Mon, 29 Jun 2009 23:55:41 +0000 (02:55 +0300)]
Use ASCII RS for separating options in DH_INTERNAL_OPTIONS.
Since now extra options via dh command line arguments are encouraged, dh will
break when a bit more complex option gets added to DH_INTERNAL_OPTIONS and it
gets misparsed by the debhelper command called from the override. E.g.
debian/rules:
| %:
| dh --builddirectory="build dir"
|
| override_dh_install:
| dh_install
Will fail with something like:
| ....
| make[1]: Entering directory `............'
| dh_install
| cp: cannot stat `debian/tmp/dir': No such file or directory
| dh_install: cp returned exit code 1
| make[1]: *** [override_dh_install] Error 1
So since DH_INTERNAL_OPTIONS is exclusively for internal use, why not to use an
old good ASCII unrepresentable control character as a separator? So I chose
ASCII 1E - RS Record Separator.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 29 Jun 2009 22:32:54 +0000 (01:32 +0300)]
Bug fix: pass extra command line arguments to cmake.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 29 Jun 2009 22:15:45 +0000 (01:15 +0300)]
Add URLs to python_distutils --build-base bugs.
Modestas Vainius [Mon, 29 Jun 2009 22:07:58 +0000 (01:07 +0300)]
Call SUPER in python_distutils::pre_building_step.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 29 Jun 2009 21:06:29 +0000 (00:06 +0300)]
More verbose rmdir_builddir() and more its tests
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 29 Jun 2009 19:00:26 +0000 (22:00 +0300)]
Support absolute paths for builddir.
If build directory is absolute or ../ path, _rel2rel falls back to
absolute paths. Try even harder to convert supplied builddir to
relative in _set_builddir().
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 29 Jun 2009 16:36:28 +0000 (19:36 +0300)]
Add absolute path test for canonpath.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 29 Jun 2009 16:34:05 +0000 (19:34 +0300)]
Rename _canonpath to canonpath.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 29 Jun 2009 16:11:42 +0000 (19:11 +0300)]
Rename enforce_out_of_source_building() to prefer_
Also add enforce_out_of_source_building() for clarity which does not
take any parameters. Now both have a clear name and no confusing
parameter combinations.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Joey Hess [Mon, 29 Jun 2009 20:10:48 +0000 (16:10 -0400)]
Make dh not complain about unknown, command-specific options passed to it
and further suppress warnings about such options it passes on to debhelper
commands. This was attempted incompletely before in version 7.2.17.
Joey Hess [Mon, 29 Jun 2009 19:46:12 +0000 (15:46 -0400)]
fix pod oops
Joey Hess [Mon, 29 Jun 2009 19:40:40 +0000 (15:40 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Joey Hess [Mon, 29 Jun 2009 19:37:50 +0000 (15:37 -0400)]
releasing version 7.2.18
Joey Hess [Mon, 29 Jun 2009 19:35:18 +0000 (15:35 -0400)]
misc minor changes
Joey Hess [Mon, 29 Jun 2009 02:01:34 +0000 (22:01 -0400)]
updates
Joey Hess [Mon, 29 Jun 2009 01:59:23 +0000 (21:59 -0400)]
typo
Joey Hess [Mon, 29 Jun 2009 01:47:52 +0000 (21:47 -0400)]
clean up --sourcedir/--sourcedirectory conflict
* Move two move command-specific options to only be accepted by the commands
that use them. The options are:
--sourcedir, --destdir
* If any third-party debhelper commands use either of the above options,
they will be broken, and need to be changed to pass options to init().
This was done because of a conflict with the --sourcedirectory options
used by dh_auto_*. I originally wanted to make dh_auto_* and dh_install
both use --sourcedir, but that didn't work out.
Joey Hess [Mon, 29 Jun 2009 01:31:21 +0000 (21:31 -0400)]
Merge branch 'master' into buildsystems
Joey Hess [Mon, 29 Jun 2009 01:31:02 +0000 (21:31 -0400)]
remove some dh_install stuff
Joey Hess [Mon, 29 Jun 2009 00:04:32 +0000 (20:04 -0400)]
add example
Joey Hess [Sun, 28 Jun 2009 20:27:53 +0000 (16:27 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
dh_auto_install
Joey Hess [Sun, 28 Jun 2009 20:26:33 +0000 (16:26 -0400)]
dh_auto_install: Pass --install-layout=deb to setup.py to support python 2.6. Closes: #534620
Joey Hess [Sun, 28 Jun 2009 20:17:20 +0000 (16:17 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Joey Hess [Sun, 28 Jun 2009 20:09:55 +0000 (16:09 -0400)]
close another bug
Joey Hess [Sun, 28 Jun 2009 20:00:36 +0000 (16:00 -0400)]
dh_shlibdeps: Ensure DEBIAN directory exists, as dpkg-shlibdeps prints a confusing warning if it does not. Closes: #534226
Joey Hess [Sun, 28 Jun 2009 19:41:40 +0000 (15:41 -0400)]
Revert "Add --help-buildsystem option to dh_auto."
I'm unsure why we need this complication. Perl modules are allowed to
install man pages documenting the module, if it really needs documentation.
This reverts commit
49b64c7852744f54250121b1c60544e1f5de70b6.
Joey Hess [Sun, 28 Jun 2009 19:40:15 +0000 (15:40 -0400)]
minimal build system option documentation
Joey Hess [Sun, 28 Jun 2009 19:01:04 +0000 (15:01 -0400)]
Revert "Update dh_auto documentation."
I'm reverting the documentation addition to try doing it
myself, more simply and less verbosely.
This reverts commit
962a2e10c930e3504ea1c0327be2fdf70d53023e.
Conflicts:
dh_auto.pod
Joey Hess [Sun, 28 Jun 2009 19:00:00 +0000 (15:00 -0400)]
Revert "Generate and install dh_auto docs when building debhelper."
I'm reverting the documentation addition to try doing it
myself, more simply and less verbosely.
This reverts commit
6ac4644330cb02384cf6c12a540cdc6b8e347170.
Joey Hess [Sun, 28 Jun 2009 18:38:47 +0000 (14:38 -0400)]
typo
Joey Hess [Fri, 26 Jun 2009 13:10:52 +0000 (09:10 -0400)]
Merge commit 'remotes/modestas/buildsystems' into buildsystems
Joey Hess [Fri, 26 Jun 2009 13:10:12 +0000 (09:10 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Joey Hess [Fri, 26 Jun 2009 13:06:59 +0000 (09:06 -0400)]
releasing version 7.2.17
Joey Hess [Fri, 26 Jun 2009 13:01:20 +0000 (09:01 -0400)]
dh_installinfo: No longer inserts install-info calls into maintainer scripts
as that is now triggerized. Adds a dependency via misc:Depends to handle
partial upgrades. Note that while dh_installinfo already required that info
files had a INFO-DIR-SECTION, the new system also requires they have
START-INFO-DIR-ENTRY and END-INFO-DIR-ENTRY for proper registration. I
assume there will be some mass bug filing for any packages that do not have
that. Closes: #528864
Modestas Vainius [Sun, 21 Jun 2009 19:35:30 +0000 (22:35 +0300)]
Terminology change.
I previously used "built-in debhelper build system" or "default debhelper build
system" for those shipped with debhelper. Now it is "standard debhelper build
system".
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Sun, 21 Jun 2009 19:12:24 +0000 (22:12 +0300)]
Fix leftover from the old code.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Wed, 17 Jun 2009 23:19:40 +0000 (02:19 +0300)]
Generate and install dh_auto docs when building debhelper.
Since dh_auto_* PODs and dh_auto.pod contain placeholders and final versions
are generated with the use of podselect, they are not directly translatable.
However, the final postprocessed PODs (with man/dh_auto_pod) are translatable.
So these temporary PODs are written to the man/ subdir and they could be added
to po4a as needed. However, I do not add those PODs for translation in this
commit (neither previous versions of dh_auto_* were there).
Modestas Vainius [Wed, 17 Jun 2009 23:11:45 +0000 (02:11 +0300)]
Update dh_auto documentation.
* dh_auto.pod -> dh_auto.7 - contains general information about dh_auto,
its features, build systems supported by default (the latter is injected by
man/dh_auto_pod script from Debian/Debhelper/Buildsystem/*.pm PODs via
placeholders (#PLACEHOLDER#))
* POD in Debian/Debhelper/Buildsystem/*.pm -> dh_auto_<buildsystem>.7 - build
system specific information.
* dh_auto_* -> dh_auto_*.1 - relatively shorty description of the specific
dh_auto_* program and build system specific info for that step injected from
Debian/Debhelper/Buildsystem/*.pm with man/dh_auto_pod script.
* man/dh_auto_pod $step - generates full dh_auto_$step POD (replaces
placeholders).
* man/dh_auto_pod - generates full dh_auto.pod (replaces placeholders).
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Wed, 17 Jun 2009 22:16:33 +0000 (01:16 +0300)]
Do not explicitly repass env. variables {C,CXX,LD}FLAGS to cmake.
Apparently, cmake itself reads values of those environment variables and uses
them accordingly. There is no need to repass them via -DCMAKE_{C,CXX,LD}_FLAGS.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Wed, 17 Jun 2009 22:02:28 +0000 (01:02 +0300)]
Rewording in the comment.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Wed, 17 Jun 2009 21:56:57 +0000 (00:56 +0300)]
Less code in the build system classes to call enforce_out_of_source_building().
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 15 Jun 2009 13:20:11 +0000 (16:20 +0300)]
Some cosmetic changes in the comments and strings.
* buildsystem -> build system
* dh_auto build system -> debhelper build system
* plugin -> class
* a few rewording changes in the comments.
* Enhance python_distutils::DESCRIPTION().
Modestas Vainius [Tue, 16 Jun 2009 00:44:43 +0000 (03:44 +0300)]
Add --help-buildsystem option to dh_auto.
Displays POD of the (auto)selected build system. It should be useful to get
more information about third party build systems. Implementation uses
perldoc whenever possible.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Tue, 16 Jun 2009 00:42:56 +0000 (03:42 +0300)]
Fix typo in the --list option specification.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 15 Jun 2009 13:11:45 +0000 (16:11 +0300)]
First letter case fixes (should be lowercase) in error/warning messages.
Modestas Vainius [Mon, 15 Jun 2009 12:58:31 +0000 (15:58 +0300)]
Fix build directory handling in python_distutils build system.
* Apparently, Distutils does out of source tree building by default.
* Default build directory is "$srcdir/build".
* --build-base command line option is ineffective (some even fail)
unless it is passed to the "build" command. However, if build-base is set in
the config file, all setup.py commands use it (build, install and clean).
That's a big flaw in Distutils design but it has been like this for a long
time. Therefore write a custom distutils cfg file in the build directory
to make build-base work. The best choice for config file path is
$HOME/.pydistutils.cfg (one of the paths Distutils reads) and setting $HOME
to the build directory.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 15 Jun 2009 12:55:34 +0000 (15:55 +0300)]
Add "only if empty" flag to rmdir_builddir().
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Mon, 15 Jun 2009 12:53:03 +0000 (15:53 +0300)]
Fix typo: missing $this.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Sat, 13 Jun 2009 14:31:23 +0000 (17:31 +0300)]
New short switches for buildsystem stuff, drop envvars
* New short switches:
-D = --sourcedirectory
-B = --builddirectory
-S = --buildsystem
* Drop DH_AUTO_BUILD* environment variables (reintroduced due to revert).
* Adjust test suite.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Sat, 13 Jun 2009 14:25:31 +0000 (17:25 +0300)]
Revert "Improvements in DH_OPTIONS handling and DH_AUTO_OPTIONS envvar support."
This mostly reverts commit
f897611a77726655aea258af0c4d52a8ce759ebc.
Remaining cosmetic changes (all functional changes have been reverted):
* Refactoring of option string into split_options_string() sub (no semantic
changes though).
* Cosmetic change in Dh_Buildsystems.pm.
Breaks testsuite.
Modestas Vainius [Fri, 12 Jun 2009 17:18:45 +0000 (20:18 +0300)]
Use another root directory in _rel2rel.
Previous one caused test "_rel2rel no4" to fail. Also add a new test
for _canonpath and two new tests for _rel2rel (related to "." handling).
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Fri, 12 Jun 2009 17:05:20 +0000 (20:05 +0300)]
Enforce out of source building in soft mode for cmake.
Technically, cmake supports in source builds, they are simply not
recommended. However, if the user insists and explicitly specifies
the build directory that is equal to the source directory, allow
this (aka soft mode).
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Modestas Vainius [Fri, 12 Jun 2009 16:57:35 +0000 (19:57 +0300)]
Drop special handling for build directory ./path.
Now build directory is always relative to the top directory
(including default build directory) regardless what source
directory is. However, if the build directory is not specified,
it defaults to the source directory (aka in source building).
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Joey Hess [Sat, 13 Jun 2009 00:33:34 +0000 (20:33 -0400)]
Merge branch 'master' into buildsystems
Joey Hess [Sat, 13 Jun 2009 00:33:18 +0000 (20:33 -0400)]
clarify wording re source files
Joey Hess [Fri, 12 Jun 2009 04:29:04 +0000 (00:29 -0400)]
Merge branch 'master' into buildsystems
Conflicts:
Debian/Debhelper/Dh_Getopt.pm
debian/changelog