| Commit message (Collapse) | Author | Age |
|
|
|
|
|
|
|
|
| |
dh used DH_OVERRIDE_UNKNOWN_OPTIONS, which was too broad as it affected
commands run via override targets and caused there to be no warning about
unknown options.
Now unknown options are only ignored when parsing DH_INTERNAL_OPTIONS and
dh's own options.
|
| |
|
|
|
|
|
| |
exit cannot be caught with eval.. I used exit before because I thought it
was cute for erorr() to call warning(). Silly.
|
|
|
|
| |
already said it was deprecated.) Closes: #555899
|
|
|
|
|
|
|
|
|
|
|
| |
Now clean_jobserver_makeflags will only remove --jobserver settings
from MAKEFLAGS. This is simpler and easier to understand than
the old behavior, which, if there was no --jobserver, removed
all -j and --jobs, while leaving those when removing --jobserver.
This relies on -j options passed to make overriding
-j settings in MAKEFLAGS. So we don't need to clean those out,
we can just override them.
|
|
|
|
|
|
|
|
|
|
|
| |
I disliked the complexity of the return values, and the boilerplate
code that followed the two calls to the function, to clean/unset
MAKEFLAGS. To solve both, I refactored it into two functions, one simply
tests to see if a jobserver is specified but unavailable, while the other
cleans/unsets MAKEFLAGS.
This loses the ability to pull the jobs-N count out of MAKEFLAGS,
but that was not currently used.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
1) Add routine to Dh_Lib (used by dh and makefile.pm) which is capable of
detecting make jobserver and job control options from the MAKEFLAGS environment
variable. It also generates and returns a clean up MAKEFLAGS from these
options.
2) Add --parallel option to build system framework which allows source packages
to specify that they support parallel building. Optional value for this option is
the number of maximum parallel process to allow. However, the actual number of
parallel process (if any) for the specific build is determined from
DEB_BUILD_OPTIONS env variable as specified by Debian Policy.
By default (no --parallel option) parallel is neither enabled nor disabled
(depends on the external environment). However, dh may pass --parallel to
dh_auto_* implicitly in case 4) described below.
3) Add parallel support for makefile buildsystem. This implementation
forcefully starts a new make job server (or disables parallel) for the number
of process requested. If --parallel was not passed to the build system at all,
the build system will only clean up MAKEFLAGS from stale jobserver options to
avoid pointless make warnings.
4) If dh detects that it is being run by dpkg-buildpackage -jX and it is NOT
run with "+" prefix from debian/rules (i.e. jobserver is not reachable), it
enables --parallel implicitly. This closes: #532805.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
|
| |
|
| |
|
|
|
|
|
|
|
| |
The -a flag now does the same thing as the -s flag, so debhelper users do
not need to worry about using the -s flag when building a package that only
builds for some architectures, and dh will also work in that situation.
Closes: #540794
|
|
|
|
| |
arch all.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* DH_AUTO_OPTIONS is like existing DH_OPTIONS, just only for dh_auto
stuff. This also avoids "explosion" of separate DH_AUTO_* environment
variables (i.e. exports in debian/rules) and encourages usage of dh_auto
command line option names. DH_AUTO_OPTIONS is passed via "extra_args" to
Dh_Lib::init() (API addition).
* When splitting options from DH_OPTIONS and its flavours, allow arguments
to include whitespaces if they are escaped with backslash (\) (see
split_options_string()). Document this in debhelper.pod.
* Short option for --buildsystem is -c (aka class).
* Provide API to cancel option specs from default debhelper options.
It will be used in the feature.
|
|\
| |
| |
| |
| |
| | |
Conflicts:
debian/changelog
dh_auto_configure
|
| |
| |
| |
| | |
support. Closes: #494914 (Thanks, Aurelien Jarno)
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
debian/changelog
dh_auto_configure
|
| | |
|
|/
|
|
|
|
|
|
|
| |
Both these function are taken from dh_auto_configure. I believe they
are useful enough to be in Dh_Lib (esp. dpkg_architecture_value()).
The patch removes these funtions from dh_auto_configure too.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
|
|
|
|
| |
Avoids the ugly thunk in dh
|
| |
|
|
|
|
|
|
|
|
| |
Add a global --remaining-packages option which allows to skip the command on
the packages which it has already been run on (i.e. if the command helper is
already present in the package debhelper log).
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
|
|
|
|
|
| |
This case can never happen, because code in Dh_Getopt makes the same
check earlier.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* dh: debian/rules override targets can change what is run
for a specific debhelper command in a sequence.
* dh: Redid all the examples to use override targets, since these
eliminate all annoying boilerplate and are much easier to understand
than the old method.
* Remove rules.simple example, there's no need to use explcit targets
with dh anymore.
|
|
|
|
| |
options, even when unknown command-line options are converted back to an error. This allows (ab)using DH_OPTIONS to pass command-specific options. (Note that getopt will warn about such unknown options. Eliminating this warning without reimplementing much of Getopt::Long wasn't practical.)
|
|
|
|
| |
passing a hash to init(), which is later passed on the Getopt::Long. Closes: #370823
|
| |
|
| |
|
| |
|
|
|
|
| |
later).
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
default.
* New v7 mode, which only has one change from v6, and is the new
recommended default.
* dh_install: if --sourcedir is not specified, first look for files in
debian/tmp, and then will look in the current directory. This allows
dh_install to interoperate with dh_auto_install without needing any
special parameters.
|
| |
|
|
|
|
| |
(hash key order), so sort it. Closes: #468959
|
|
|
|
|
|
|
|
| |
tarballs that contain debian directories, by allowing debhelper config
files in those directories to be ignored, since there's generally no
good way to delete them out of the upstream tarball, and they can easily
get in the way if upstream is using debian/ differently than the Debian
maintainer.
|
|
|
|
|
|
| |
control
file.
|
|
|
|
| |
third party programs such as dh_installtex. Closes: #419060
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
preinst and postinst scripts. For example, if a package uses
dh_pysupport before dh_installinit, the prerm will first stop the init
script and then remove the python files.
* Introducing beginning of v6 mode.
* dh_installwm: In v6 mode, install a slave manpage link for
x-window-manager.1.gz. Done in v6 mode because some window managers
probably work around this longstanding debhelper bug by registering the
slave on their own. This bug was only fixable once programs moved out of
/usr/X11R6. Closes: #85963
* dh_builddeb: In v6 mode, fix bug in DH_ALWAYS_EXCLUDE handling, to work
the same as all the other code in debhelper. This could only be fixed in
v6 mode because packages may potentially legitimately rely on the old
buggy behavior. Closes: #242834
* dh_installman: In v6 mode, overwrite exsiting man pages. Closes: #288250
|
|
|
|
| |
too.
|
| |
|
|
|
|
|
|
|
| |
the new form of architecture wildcarding which allows use of things
like "linux-any" and "any-i386" in the Architecture field. Note that
you'll need to build-depend on a new enough dpkg-dev if using this
support. Closes: #371082
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
"\\.", which turns into "\." after being run through the shell, and
prevents find from treating -X.svn as a regexp that matches files such
as foo/svn.vim. (It's safe to do this now that all uses of EXCLUDE_FIND are
via complex_doit(), which was not the case of dh_clean when this change
was originally made.) Closes: #349070
|
| |
|