* 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>
sub buildsystems_init {
my %args=@_;
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 = (
# Available command line options
my %options = (
- "d=s" => \$opt_sourcedir,
+ "D=s" => \$opt_sourcedir,
"sourcedirectory=s" => \$opt_sourcedir,
"sourcedirectory=s" => \$opt_sourcedir,
- "b:s" => \$opt_builddir,
+ "B:s" => \$opt_builddir,
"builddirectory:s" => \$opt_builddir,
"builddirectory:s" => \$opt_builddir,
- "m=s" => \$opt_buildsys,
+ "S=s" => \$opt_buildsys,
"buildsystem=s" => \$opt_buildsys,
"l" => \$opt_list,
"buildsystem=s" => \$opt_buildsys,
"l" => \$opt_list,
-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' ],
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" );
[ '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" );
[ 'NAME=autoconf', "builddir=$default_builddir", 'makecmd=make', 'sourcedir=.' ],
"forced autoconf and default build directory" );
my (@lines, @extra_args);
my $buildpath = $sourcedir;
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";
- push @dh_auto_args, "-b", $builddir;
- $dh_auto_str .= " -b $builddir";
+ push @dh_auto_args, "-B", $builddir;
+ $dh_auto_str .= " -B $builddir";
$buildpath = $builddir;
}
$buildpath = $builddir;
}