Kaydet (Commit) 06ec1c08 authored tarafından Andras Timar's avatar Andras Timar

Merge branch 'master' into feature/killsdf

Conflicts:
	Repository.mk
	RepositoryFixes.mk
	connectivity/prj/build.lst
	extensions/prj/build.lst
	filter/prj/build.lst
	fpicker/prj/build.lst
	l10ntools/StaticLibrary_transex.mk
	saxon/build.xml
	shell/prj/build.lst
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/Configuration.mk
	solenv/gbuild/UI.mk
	ucb/source/ucp/webdav/webdavcontent.cxx

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

#!/usr/bin/env perl
# A hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message
# if it wants to stop the commit.
use strict;
#use File::Copy;
#use Cwd;
$ENV{LC_ALL} = "C";
sub check_whitespaces($)
{
my ($h) = @_;
my $src_limited = "c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pmk|pl|pm|sdi|sh|src|tab|ui|xcu|xml";
my $src_full = "c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|mk|MK|pmk|pl|pm|sdi|sh|src|tab|ui|xcu|xml";
my $found_bad = 0;
my $filename;
my $reported_filename = "";
my $lineno;
sub bad_line
{
my ($why, $line, $file_filter) = @_;
if (!defined $file_filter || $filename =~ /\.($file_filter)$/)
{
if (!$found_bad)
{
print STDERR "*\n";
print STDERR "* You have some suspicious patch lines:\n";
print STDERR "*\n";
$found_bad = 1;
}
if ($reported_filename ne $filename)
{
print STDERR "* In $filename\n";
$reported_filename = $filename;
}
print STDERR "* $why (line $lineno)\n";
print STDERR "$filename:$lineno:$line\n";
}
}
open( FILES, "git-diff-index -p -M --cached $h |" ) || die "Cannot run git diff-index.";
while (<FILES>)
{
if (m|^diff --git a/(.*) b/\1$|)
{
$filename = $1;
next;
}
if (/^@@ -\S+ \+(\d+)/)
{
$lineno = $1 - 1;
next;
}
if (/^ /)
{
$lineno++;
next;
}
if (s/^\+//)
{
$lineno++;
chomp;
if (/\s$/)
{
bad_line("trailing whitespace", $_ , $src_limited);
}
if (/\s* /)
{
bad_line("indent with Tab", $_, $src_limited);
}
if (/^(?:[<>=]){7}$/)
{
bad_line("unresolved merge conflict", $src_full);
}
if (/SAL_DEBUG/)
{
bad_line("temporary debug in commit", $_, $src_limited);
}
if (/<property name="use_markup">True<\/property>/)
{
bad_line("use font attributes instead of use-markup", $_, $src_limited);
}
}
}
if ( $found_bad)
{
exit($found_bad);
}
}
# Do the work :-)
# Initial commit: diff against an empty tree object
my $against="4b825dc642cb6eb9a060e54bf8d69288fbee4904";
if ( system( "git rev-parse --verify HEAD >/dev/null 2>&1" ) == 0 )
{
$against="HEAD"
}
# If you want to allow non-ascii filenames set this variable to true.
my $allownonascii=`git config hooks.allownonascii`;
# Cross platform projects tend to avoid non-ascii filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if ( $allownonascii ne "true" &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
`git diff --cached --name-only --diff-filter=A -z $against | \
LC_ALL=C tr -d '[ -~]\\0'` ne "" )
{
print <<EOM;
Error: Attempt to add a non-ascii file name.
This can cause problems if you want to work
with people on other platforms.
To be portable it is advisable to rename the file ...
If you know what you are doing you can disable this
check using:
git config hooks.allownonascii true
EOM
exit( 1 );
}
# fix whitespace in code
check_whitespaces( $against);
# all OK
exit( 0 );
# vi:set shiftwidth=4 expandtab:
......@@ -10,8 +10,7 @@
# python generated file
*.pyc
# where the 'subrepos' and downloads are located
/clone
# where the downloads are located
/src
# the build directories
......@@ -41,7 +40,6 @@
/*/wnt*.obsolete
/*/callcatcher
/workdir
/solver
/instsetoo_native/util/LibreOffice
/instsetoo_native/util/LibreOffice_SDK
......@@ -58,11 +56,11 @@
/config.parms
/config_host.mk
/config_host.mk.last
/config_host.mk.stamp
/config_build.mk
/configure
/desktop/scripts/soffice.sh
/makefile.mk
/post_download
/bin/repo-list
/src.downloaded
/ooo.lst
......@@ -78,11 +76,9 @@
# misc
/file-lists
/cross-build-toolset.built
/set_soenv.stamp
/warn
/build.log
/build_error.log
/post_download.log
/install
/downloaded
/ID
......@@ -101,20 +97,10 @@ TAGS
/external/*/*.msm
/moz/zipped/*.zip
# links to the other repositories
/binfilter
/dictionaries
/helpcontent2
/translations
# compiled python objects for gdb pretty printers
/solenv/gdb/libreoffice/*.py[co]
/solenv/gdb/libreoffice/util/*.py[co]
# botstrap generated tool
/solenv/bin/concat-deps
/solenv/bin/concat-deps.exe
# test output files
test/user-template/user/psprint/pspfontcache
......
[submodule "dictionaries"]
path = dictionaries
url = git://gerrit.libreoffice.org/dictionaries
branch = .
[submodule "helpcontent2"]
path = helpcontent2
url = git://gerrit.libreoffice.org/help
branch = .
[submodule "translations"]
path = translations
url = git://gerrit.libreoffice.org/translations
branch = .
......@@ -201,7 +201,6 @@ endif
ifeq ($(ENABLE_LIBLANGTAG),YES)
$(eval $(call gb_Library_use_externals,merged,\
glib \
liblangtag \
))
endif
......
......@@ -24,9 +24,8 @@ $(filter-out help,$(firstword $(MAKECMDGOALS))) : $(SRCDIR)/config_host.mk
# run configure in an environment not polluted by config_host.mk
$(SRCDIR)/config_host.mk : \
$(SRCDIR)/config_host.mk.in \
$(SRCDIR)/bin/repo-list.in \
$(SRCDIR)/ooo.lst.in \
$(SRCDIR)/configure.in \
$(SRCDIR)/configure.ac \
$(SRCDIR)/autogen.lastrun
./autogen.sh
......
......@@ -62,7 +62,9 @@ cppcanvas\
cppu\
cppuhelper\
cpputools\
ct2n\
cui\
curl\
dbaccess\
desktop\
dictionaries \
......@@ -71,18 +73,25 @@ dtrans\
editeng\
embeddedobj\
embedserv\
epm\
eventattacher\
expat\
extensions\
extras\
fileaccess\
filter\
fontconfig\
forms\
formula\
fpicker\
framework\
freetype\
graphite\
helpcompiler\
hsqldb\
hunspell\
hwpfilter\
hyphen\