diff options
| -rw-r--r--[-rwxr-xr-x] | Repository.mk | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | RepositoryFixes.mk | 3 | ||||
| -rwxr-xr-x | autogen.sh | 83 | ||||
| -rwxr-xr-x | bin/lo-commit-stat | 15 | ||||
| -rwxr-xr-x | configure.in | 52 | ||||
| -rwxr-xr-x | set_soenv.in | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 3 |
7 files changed, 98 insertions, 63 deletions
diff --git a/Repository.mk b/Repository.mk index 0afca0dca6ae..7e935f80f9fa 100755..100644 --- a/Repository.mk +++ b/Repository.mk @@ -138,7 +138,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icule \ icuuc \ icule \ - graphite_dll \ + graphite2_off \ cppunit \ rdf \ ssl \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 2e7be72f73ca..74aecdf01f41 100755..100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -110,7 +110,7 @@ gb_Library_NOILIBFILENAMES:=\ advapi32 \ gdi32 \ gdiplus \ - graphite_dll \ + graphite2_off \ gnu_getopt \ icuuc \ icule \ @@ -130,6 +130,7 @@ gb_Library_NOILIBFILENAMES:=\ user32 \ uuid \ uwinapi \ + version \ winspool \ gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) diff --git a/autogen.sh b/autogen.sh index bf5b2670430d..4d5037062c36 100755 --- a/autogen.sh +++ b/autogen.sh @@ -11,6 +11,34 @@ sub clean() print "cleaned the build tree\n"; } +# check we have various vital tools +sub sanity_checks($) +{ + my $system = shift; + my @path = split (':', $ENV{'PATH'}); + my %required = + ( + 'pkg-config' => "pkg-config is required to be installed", + 'autoconf' => "autoconf is required", + 'aclocal' => "aclocal is required", + ); + + for my $elem (@path) { + for my $app (keys %required) { + if (-f "$elem/$app") { + delete $required{$app}; + } + } + } + if ((keys %required) > 0) { + print ("Various low-level dependencies are missing, please install them:\n"); + for my $app (keys %required) { + print "\t $app: " . $required{$app} . "\n"; + } + exit (1); + } +} + # one argument per line sub read_args($) { @@ -19,25 +47,24 @@ sub read_args($) my @lst; open ($fh, $file) || die "can't open file: $file"; while (<$fh>) { - chomp(); - # migrate from the old system - if ( substr($_, 0, 1) eq "'" ) { - print "Migrating options from the old autogen.lastrun format, using:\n"; - my @opts; - @opts = split(/'/); - foreach my $opt (@opts) { - if ( substr($opt, 0, 1) eq "-" ) { - push @lst, $opt; - print " $opt\n"; - } + chomp(); + # migrate from the old system + if ( substr($_, 0, 1) eq "'" ) { + print "Migrating options from the old autogen.lastrun format, using:\n"; + my @opts; + @opts = split(/'/); + foreach my $opt (@opts) { + if ( substr($opt, 0, 1) eq "-" ) { + push @lst, $opt; + print " $opt\n"; + } + } + } else { + push @lst, $_; } } - else { - push @lst, $_; - } - } close ($fh); -# print "read args from file '$file': @lst\n"; + # print "read args from file '$file': @lst\n"; return @lst; } @@ -49,8 +76,8 @@ sub invalid_distro($$) my $dirh; opendir ($dirh, "distro-configs"); while (($_ = readdir ($dirh))) { - /(.*)\.conf$/ || next; - print STDERR "\t$1\n"; + /(.*)\.conf$/ || next; + print STDERR "\t$1\n"; } closedir ($dirh); } @@ -66,16 +93,16 @@ if (!@ARGV) { my @args; for my $arg (@cmdline_args) { if ($arg eq '--clean') { - clean(); + clean(); } elsif ($arg =~ m/--with-distro=(.*)$/) { - my $config = "distro-configs/$1.conf"; - if (! -f $config) { - invalid_distro ($config, $1); + my $config = "distro-configs/$1.conf"; + if (! -f $config) { + invalid_distro ($config, $1); + } else { + push @args, read_args ($config); + } } else { - push @args, read_args ($config); - } - } else { - push @args, $arg; + push @args, $arg; } } @@ -84,6 +111,8 @@ system ("touch ChangeLog"); my $system = `uname -s`; chomp $system; +sanity_checks ($system) unless($system eq 'Darwin'); + my $aclocal_flags = $ENV{ACLOCAL_FLAGS}; $aclocal_flags = "-I ./m4/mac" if (($aclocal_flags eq "") && ($system eq 'Darwin')); @@ -115,6 +144,8 @@ if (defined $ENV{NOCONFIGURE}) { } # Local Variables: +# mode: perl +# cperl-indent-level: 4 # tab-width: 4 # indent-tabs-mode: nil # End: diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat index 8de4d3109642..24bcb891bc22 100755 --- a/bin/lo-commit-stat +++ b/bin/lo-commit-stat @@ -195,11 +195,12 @@ sub get_branch_name($) return $branch; } -sub open_log_file($$$$) +sub open_log_file($$$$$) { - my ($log_prefix, $log_suffix, $top_dir, $branch_name) = @_; + my ($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name) = @_; my $logfilename = "$log_prefix-$branch_name-$log_suffix.log"; + $logfilename = "$log_dir/$logfilename" if (defined $log_dir); if (-f $logfilename) { print "WARNING: The log file already exists: $logfilename\n"; @@ -308,12 +309,13 @@ sub usage() { print "This script generates LO git commit summary\n\n" . - "Usage: lo-commit-stat [--help] [--no-pieces] [--piece=<piece>] --log-suffix=<string> topdir [git_arg...]\n\n" . + "Usage: lo-commit-stat [--help] [--no-pieces] [--piece=<piece>] --log-dir=<dir> --log-suffix=<string> topdir [git_arg...]\n\n" . "Options:\n" . " --help print this help\n" . " --no-pieces read changes just from the main repository, ignore other cloned repos\n" . " --piece=<piece> summarize just changes from the given piece\n" . + " --log-dir=<dir> directory where to put the generated log\n" . " --log-suffix=<string> suffix of the log file name; the result will be\n" . " commit-log-<branch>-<log-name-suffix>.log; the branch name\n" . " is detected automatically\n" . @@ -341,6 +343,7 @@ sub usage() my $piece; my $top_dir; my $log_prefix = "commit-log"; +my $log_dir; my $log_suffix; my $log; my $branch_name; @@ -361,6 +364,8 @@ foreach my $arg (@ARGV) { $piece = $1; } elsif ($arg =~ m/--log-suffix=(.*)/) { $log_suffix = "$1"; + } elsif ($arg =~ m/--log-dir=(.*)/) { + $log_dir = "$1"; } elsif ($arg eq '--bugs') { $print_filters{'bug'} = 1; $log_prefix = "bugfixes" @@ -385,12 +390,14 @@ $git_command .= " " . join ' ', @git_args if (@git_args); (-d "$top_dir") || die "Error: not a directory: $top_dir\n"; (-f "$top_dir/.git/config") || die "Error: can't find $top_dir/.git/config\n"; +(!defined $log_dir) || (-d $log_dir) || die "Error: directory does no exist: $log_dir\n"; + (defined $log_suffix) || die "Error: define log suffix using --log-suffix=<string>\n"; $branch_name = get_branch_name($top_dir); load_data(\%data, $top_dir, $piece, $branch_name, $git_command); -$log = open_log_file($log_prefix, $log_suffix, $top_dir, $branch_name); +$log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name); print_stat(\%data, \%print_filters, $print_mode, $log); close $log; diff --git a/configure.in b/configure.in index f50c90f62e50..7e631350468a 100755 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil -*- -dnl configure.in serves as input for the GNU autoconf package +dnl configure.in serves as input for the GNU autoconf package dnl in order to create a configure script. AC_INIT([LibreOffice], [3.5],,, [http://documentfoundation.org/]) @@ -246,7 +246,7 @@ AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Include debugging symbols from --enable-symbols plus extra debugging code. Extra large build! (enables -g compiler flag and dmake debug=true) - If you need even more verbose output, build a module with + If you need even more verbose output, build a module with "build -- debug=true dbglevel=2".])) AC_ARG_ENABLE(dbgutil, @@ -513,7 +513,7 @@ AC_ARG_WITH(external-tar, AC_ARG_WITH(linked-git, AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>], - [Specify another checkout's clonedir to re-use. This makes use of + [Specify another checkout's clonedir to re-use. This makes use of git-new-workdir, and saves a lot of diskspace when having multiple trees side-by-side.]), GIT_LINK_SRC=$withval , @@ -1293,7 +1293,7 @@ AC_ARG_WITH(icu-native-build-root, When cross-compiling and not using a "system" ICU, specify the path to the "source" directory of the ICU build in a native LibreOffice build tree. For example - --with-icu-native-build-root=/Users/tml/lo-macosx/icu/unxmacxi.pro/misc/build/icu/source + --with-icu-native-build-root=/Users/tml/lo-macosx/icu/unxmacxi.pro/misc/build/icu/source ], ,) @@ -2180,14 +2180,14 @@ if test "$GCC" = "yes" ; then ],[ printf (""); ])], - [ if ./conftest$EXEEXT; then + [ if ./conftest$EXEEXT; then HAVE_LD_HASH_STYLE=TRUE WITH_LINKER_HASH_STYLE=$hash_style - fi], + fi], [HAVE_LD_HASH_STYLE=FALSE]) LDFLAGS=$hash_style_ldflags_save done - + if test "$HAVE_LD_HASH_STYLE" = "TRUE"; then AC_MSG_RESULT( $WITH_LINKER_HASH_STYLE ) else @@ -2373,7 +2373,7 @@ if test "$_os" = "WINNT"; then else AC_MSG_RESULT(["$SHOWINCLUDES_PREFIX"]) fi - + # Check for 64-bit (cross-)compiler to use to build the 64-bit # version of the Explorer extension (and maybe other small # bits, too) needed when installing a 32-bit LibreOffice on a @@ -2414,7 +2414,7 @@ if test "$_os" = "WINNT"; then fi AC_SUBST(BUILD_X64) - # These are passed to the environment through set_soenv.in as usual, and then + # These are passed to the environment through set_soenv.in as usual, and then # used in set_wntx64.mk AC_SUBST(CC_X64_BINARY) AC_SUBST(CXX_X64_BINARY) @@ -2608,7 +2608,7 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then m4_pattern_allow([AC_CHECK_ALIGNOF]) m4_ifdef([AC_CHECK_ALIGNOF], , - [ + [ dnl We know that the ALIGNOF_ variables are used only when cross-compiling dnl in sal/typesconfig/makefile.mk... if test "$cross_compiling" = "yes"; then @@ -2675,7 +2675,7 @@ AC_SUBST(ALIGNOF_LONG) AC_SUBST(ALIGNOF_DOUBLE) dnl =================================================================== -dnl Check if valgrind.h is available +dnl Check if valgrind.h is available dnl =================================================================== if test "$cross_compiling" != "yes" -a "$enable_dbgutil" != "no"; then dnl Test $prefix (currently only testing for /usr and /usr/local) @@ -4092,7 +4092,7 @@ if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then if test -z "$with_mingw_cross_compiler"; then dnl Guess... AC_CHECK_PROGS(MINGWCXX,i386-mingw32msvc-g++ i586-pc-mingw32-g++ i686-pc-mingw32-g++ i686-w64-mingw32-g++,false) - elif test -x "$with_mingw_cross_compiler"; then + elif test -x "$with_mingw_cross_compiler"; then MINGWCXX="$with_mingw_cross_compiler" else AC_CHECK_TOOL(MINGWCXX, "$with_mingw_cross_compiler", false) @@ -4478,8 +4478,6 @@ fi AC_SUBST(SYSTEM_PYTHON) AC_SUBST(PYTHON_CFLAGS) AC_SUBST(PYTHON_LIBS) -HOME=`echo $HOME | $SED 's:\\\\:/:g'` -AC_SUBST(HOME) dnl =================================================================== dnl Check for system translate-toolkit @@ -4550,20 +4548,20 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \ DB_LIB= for dbver in 5.1 5.0 5 4.8 4.7 4 ''; do for dash in - ''; do - AC_CHECK_LIB(db$dash$dbver, dbopen, + AC_CHECK_LIB(db$dash$dbver, dbopen, [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ]) - AC_CHECK_LIB(db$dash$dbver, __db185_open, + AC_CHECK_LIB(db$dash$dbver, __db185_open, [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ]) done test -n "$DB_LIB" && break done if test -z "$DB_LIB"; then - AC_CHECK_LIB(db, dbopen, + AC_CHECK_LIB(db, dbopen, [ DB_LIB="db"; DB_CPPLIB="db_cxx" ]) fi - if test -z "$DB_LIB" ; then + if test -z "$DB_LIB" ; then AC_MSG_ERROR([db library not found. Use the correct -L flag, or install the Berkeley db development package.]) fi @@ -6476,7 +6474,7 @@ dnl =================================================================== dnl Now with librsvg we always need cairo (?), so hardcode ENABLE_CAIRO to TRUE dnl Eventually should bin conditionals on ENABLE_CAIRO. -ENABLE_CAIRO="TRUE" +ENABLE_CAIRO="TRUE" BUILD_PIXMAN="" SYSTEM_CAIRO="" @@ -6506,7 +6504,7 @@ int main(int argc, char **argv) { #endif } ], - [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, X headers too old.])] ) fi @@ -7747,7 +7745,7 @@ else WITH_EXTRA_GALLERY=YES BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY" SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY" - OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip" + OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip" fi AC_SUBST(WITH_EXTRA_GALLERY) AC_SUBST(OOOP_GALLERY_PACK) @@ -7952,7 +7950,7 @@ dnl As long as the only thing we need gdk-pxbuf for is below dnl librsvg, use the same --with-system-librsvg (possibly implied dnl by --with-system-libs) to override this. -if test $SYSTEM_LIBRSVG = YES; then +if test "$SYSTEM_LIBRSVG" = YES; then SYSTEM_GDKPIXBUF=YES AC_MSG_RESULT([yes]) else @@ -7979,7 +7977,7 @@ dnl As long as the only thing we need GLib for is below dnl librsvg, use the same --with-system-librsvg (possibly implied dnl by --with-system-libs) to override this. -if test $SYSTEM_LIBRSVG = YES; then +if test "$SYSTEM_LIBRSVG" = YES; then SYSTEM_GLIB=YES AC_MSG_RESULT([yes]) else @@ -8030,7 +8028,7 @@ dnl As long as the only thing we need libcroco for is below dnl librsvg, use the same --with-system-librsvg (possibly implied dnl by --with-system-libs) to override this. -if test $SYSTEM_LIBRSVG = YES; then +if test "$SYSTEM_LIBRSVG" = YES; then SYSTEM_LIBCROCO=YES AC_MSG_RESULT([yes]) else @@ -8057,7 +8055,7 @@ dnl As long as the only thing we need Pango for is below dnl librsvg, use the same --with-system-librsvg (possibly implied dnl by --with-system-libs) to override this. -if test $SYSTEM_LIBRSVG = YES; then +if test "$SYSTEM_LIBRSVG" = YES; then SYSTEM_PANGO=YES AC_MSG_RESULT([yes]) else @@ -8084,7 +8082,7 @@ dnl As long as the only thing we need libgsf for is below librsvg (is dnl it?), use the same --with-system-librsvg (possibly implied by dnl --with-system-libs) to override this. -if test $SYSTEM_LIBRSVG = YES; then +if test "$SYSTEM_LIBRSVG" = YES; then SYSTEM_LIBGSF=YES AC_MSG_RESULT([yes]) else @@ -8280,7 +8278,7 @@ if test "$ANT_HOME" != "NO_ANT_HOME"; then else AC_MSG_ERROR([Ant libraries not found!]) fi - fi + fi fi fi fi diff --git a/set_soenv.in b/set_soenv.in index 73c94e3cd0bf..d234676c5de3 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1901,9 +1901,6 @@ ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" ); ToFile( "PYTHON", "@PYTHON@", "e" ); ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" ); ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" ); -if ($SYSTEM_PYTHON eq "NO") { -ToFile( "HOME", "@HOME@", "e" ); -} ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" ); ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" ); ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" ); diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 60e18ad5a914..c1846444b6d8 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -395,6 +395,7 @@ gb_Library_PLAINLIBS_NONE += \ user32 \ uuid \ uwinapi \ + version \ winspool \ z \ @@ -512,7 +513,7 @@ endef # Executable class gb_Executable_EXT := .exe -gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG +gb_Executable_TARGETTYPEFLAGS := -RELEASE -OPT:NOREF -INCREMENTAL:NO -DEBUG gb_Executable_get_rpath := define gb_Executable_Executable_platform |