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>

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index ac09dd289d50f6c7f79fcecc782a014197b5b3d6..d33b6f2cebb04ecf2ceb52054c6d30ba90f9db67 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -108,24 +108,15 @@ sub load_all_buildsystems {
 sub buildsystems_init {
        my %args=@_;
 
-       # TODO: Not documented in the manual pages yet.
-       # Initialize options from environment variables
-       if (exists $ENV{DH_AUTO_BUILDDIRECTORY}) {
-               $opt_builddir = $ENV{DH_AUTO_BUILDDIRECTORY};
-       }
-       if (exists $ENV{DH_AUTO_BUILDSYSTEM}) {
-               $opt_buildsys = $ENV{DH_AUTO_BUILDSYSTEM};
-       }
-
        # Available command line options
        my %options = (
-           "d=s" => \$opt_sourcedir,
+           "D=s" => \$opt_sourcedir,
            "sourcedirectory=s" => \$opt_sourcedir,
        
-           "b:s" => \$opt_builddir,
+           "B:s" => \$opt_builddir,
            "builddirectory:s" => \$opt_builddir,
 
-           "m=s" => \$opt_buildsys,
+           "S=s" => \$opt_buildsys,
            "buildsystem=s" => \$opt_buildsys,
 
            "l" => \$opt_list,

diff --git a/t/buildsystems/buildsystem_tests b/t/buildsystems/buildsystem_tests
index e1ca8bbede6581a220da9305161c01c6061c4989..031828b7bcc28f38a48d04b55d81da6eedad0cb8 100755 (executable)
--- a/t/buildsystems/buildsystem_tests
+++ b/t/buildsystems/buildsystem_tests
@@ -353,16 +353,16 @@ if (defined \$bs) {
 EOF
 }
 
-is_deeply( process_stdout("DH_AUTO_OPTIONS='--builddirectory=autoconf/bld\\ dir --sourcedirectory autoconf' $^X -- -",
+is_deeply( process_stdout("$^X -- - --builddirectory='autoconf/bld dir' --sourcedirectory autoconf",
                           get_load_bs_source(undef, "configure")),
     [ 'NAME=autoconf', 'builddir=autoconf/bld dir', 'makecmd=make', 'sourcedir=autoconf' ],
-    "dh_auto_options w/space, autoconf autoselection and sourcedir/builddir" );
+    "autoconf autoselection and sourcedir/builddir" );
 
-is_deeply( process_stdout("$^X -- - -cautoconf -d autoconf", get_load_bs_source("autoconf", "build")),
+is_deeply( process_stdout("$^X -- - -Sautoconf -D autoconf", get_load_bs_source("autoconf", "build")),
     [ 'NAME=autoconf', 'builddir=undef', 'makecmd=make', 'sourcedir=autoconf' ],
     "forced autoconf and sourcedir" );
 
-is_deeply( process_stdout("$^X -- - -b -cautoconf", get_load_bs_source("autoconf", "build")),
+is_deeply( process_stdout("$^X -- - -B -Sautoconf", get_load_bs_source("autoconf", "build")),
     [ 'NAME=autoconf', "builddir=$default_builddir", 'makecmd=make', 'sourcedir=.' ],
     "forced autoconf and default build directory" );
 
@@ -374,11 +374,11 @@ sub dh_auto_do_autoconf {
 
        my (@lines, @extra_args);
        my $buildpath = $sourcedir;
-       my @dh_auto_args = ("-d", $sourcedir);
-       my $dh_auto_str = "-d $sourcedir";
+       my @dh_auto_args = ("-D", $sourcedir);
+       my $dh_auto_str = "-D $sourcedir";
        if ($builddir) {
-               push @dh_auto_args, "-b", $builddir;
-               $dh_auto_str .= " -b $builddir";
+               push @dh_auto_args, "-B", $builddir;
+               $dh_auto_str .= " -B $builddir";
                $buildpath = $builddir;
        }