autogen.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
New commits: commit 0286cde8c568a5652daf0b74f76816f980d86aee Author: Stepas Toliautas <stepas.toliau...@gmail.com> AuthorDate: Tue Dec 17 00:18:11 2019 +0200 Commit: Thorsten Behrens <thorsten.behr...@cib.de> CommitDate: Wed Dec 18 18:23:58 2019 +0100 Remove "--clean" option from autogen.sh autogen.sh seems to be used as a preprocessor for configure script, so it has only a few options itself. However, "--clean" option, which is even documented in script's help message, now touches only two items in repository (on Windows): autom4te.cache folder, which is refreshed during autogen.sh run anyway, and install-sh script, which is NOT regenerated afterwards. So using --clean actually breaks configuration setup. Please check if anyone still uses --clean for its original purpose and remove this feature or automate install-sh regeneration. Change-Id: Ic3991ea4e53cea5ad07696f9b75acf9176eb7ce1 Reviewed-on: https://gerrit.libreoffice.org/85247 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> diff --git a/autogen.sh b/autogen.sh index 608e2b6ab82f..10bdffe610e2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -31,13 +31,6 @@ chdir ($build_path); # old path from the environment, not cwd. $ENV{PWD} = $build_path; -sub clean() -{ - system ("rm -Rf autom4te.cache"); - system ("rm -f missing install-sh mkinstalldirs libtool ltmain.sh"); - print "Cleaned the build tree\n"; -} - my $aclocal; my $autoconf; @@ -202,7 +195,6 @@ die "Failed to generate the configure script" if (! -f "configure"); for my $arg (@ARGV) { if ($arg =~ /^(--help|-h|-\?)$/) { print STDOUT "autogen.sh - libreoffice configuration helper\n"; - print STDOUT " --clean forcibly re-generate configuration\n"; print STDOUT " --with-distro use a config from distro-configs/\n"; print STDOUT " the name needs to be passed without extension\n"; print STDOUT " --best-effort don't fail on un-known configure with/enable options\n"; @@ -256,9 +248,7 @@ if (-f $default_config) { push @args, read_args ($default_config); } for my $arg (@cmdline_args) { - if ($arg eq '--clean') { - clean(); - } elsif ($arg =~ m/--with-distro=(.*)$/) { + if ($arg =~ m/--with-distro=(.*)$/) { my $config = "$src_path/distro-configs/$1.conf"; if (! -f $config) { invalid_distro ($config, $1); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits