[Libreoffice-commits] .: 2 commits - solenv/bin
solenv/bin/build.pl |9 +
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 4c40593e3e936e6a966410ab807df4b775fc2464
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 21 12:40:42 2012 +0200
$retry_counter and the RETRY label are now unused
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index f59d675..e5e009f 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1814,7 +1814,6 @@ sub run_job {
my ($job, $path, $registered_name) = @_;
my $job_to_do = $job;
my $error_code = 0;
-my $retry_counter = 10;
print $registered_name\n;
return 0 if ( $show );
@@ -1838,7 +1837,7 @@ sub run_job {
system($perl $mkout);
};
}
-RETRY:
+
open (MAKE, $job_to_do 21 |) or return 8;
open (LOGFILE, $log_file) or return 8;
while (MAKE) { print LOGFILE $_; print $_ }
commit 5e553b1ee5d8266b14c1f553d310dd634ae3fb84
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 21 12:27:08 2012 +0200
GUI=WIN used to mean 16-bit Windows, I think, so kill that crack
Also the running of grep inside the test for GUI = WIN was a bit weird,
what was it supposed to grep? Standard input?
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 1b8ed64..f59d675 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1076,7 +1076,6 @@ sub pick_prj_to_build {
sub check_platform {
my $platform = shift;
return 1 if ($platform eq 'all');
-return 1 if (($ENV{GUI} eq 'WIN') ($platform eq 'w'));
return 1 if (($ENV{GUI} eq 'UNX') ($platform eq 'u'));
return 1 if (($ENV{GUI} eq 'WNT')
(($platform eq 'w') || ($platform eq 'n')));
@@ -1848,11 +1847,6 @@ RETRY:
close LOGFILE;
if ( $error_code != 0)
{
-if ($ENV{GUI} eq 'WIN' $retry_counter 0)
-{
-$retry_counter -= 1;
-system('grep Error 126\$') goto RETRY;
-}
system(echo \log for $path\ $build_error_log);
system(cat $log_file $build_error_log);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/bin
solenv/bin/modules/installer/helppack.pm |5 +-
solenv/bin/modules/installer/packagelist.pm |2
solenv/bin/modules/t/installer-packagelist.t | 57 +++
3 files changed, 62 insertions(+), 2 deletions(-)
New commits:
commit d3374e77c3df1f928fe90c4c3803938f08a250b2
Author: Tim Retout tim.ret...@smoothwall.net
Date: Wed Mar 14 22:17:27 2012 +
Turn on strictures and warnings in installer::helppack.
diff --git a/solenv/bin/modules/installer/helppack.pm
b/solenv/bin/modules/installer/helppack.pm
index 977b0ba..a6a9627 100644
--- a/solenv/bin/modules/installer/helppack.pm
+++ b/solenv/bin/modules/installer/helppack.pm
@@ -27,6 +27,9 @@
package installer::helppack;
+use strict;
+use warnings;
+
use installer::converter;
use installer::files;
use installer::globals;
@@ -136,7 +139,7 @@ sub create_tar_gz_file
$packagename =~ s/\.rpm\s*$//;
my $targzname = $packagename . .tar.gz;
-$systemcall = cd $installdir; tar -cf - $packagestring | gzip
$targzname;
+my $systemcall = cd $installdir; tar -cf - $packagestring | gzip
$targzname;
installer::logger::print_message( ... $systemcall ...\n );
my $returnvalue = system($systemcall);
commit 712e7b813825ec9fb1d0c1fcdbfcea2f44274e69
Author: Tim Retout t...@retout.co.uk
Date: Thu Feb 23 20:11:50 2012 +
Unit test and correction for remove_multiple_modules_packages
diff --git a/solenv/bin/modules/installer/packagelist.pm
b/solenv/bin/modules/installer/packagelist.pm
index d6b2f02..e39917c 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -214,7 +214,7 @@ sub remove_multiple_modules_packages
# modules will only be removed from packages, that have more
modules
# than the compare package
-if ( $packagecount = $comparepackagecount ) { next; } #
nothing to do, take next package
+if ( $packagecount $comparepackagecount ) { next; } #
nothing to do, take next package
# iterating over all modules of this package
diff --git a/solenv/bin/modules/t/installer-packagelist.t
b/solenv/bin/modules/t/installer-packagelist.t
new file mode 100644
index 000..b4ef6ce
--- /dev/null
+++ b/solenv/bin/modules/t/installer-packagelist.t
@@ -0,0 +1,57 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2012 Tim Retout t...@retout.co.uk (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+use strict;
+use warnings;
+
+use lib '.';
+
+use Test::More;
+
+BEGIN {
+use_ok('installer::packagelist');
+}
+
+my @packagemodules = (
+{ allmodules = [qw(a b c d)] },
+{ allmodules = [qw(a b c)] },
+{ allmodules = [qw(e f g)] },
+{ allmodules = [qw(h)] },
+{ allmodules = [qw(a b g)] },
+);
+
+my @expected_packagemodules = (
+{ allmodules = [qw(d)] },
+{ allmodules = [qw(c)] },
+{ allmodules = [qw(e f)] },
+{ allmodules = [qw(h)] },
+{ allmodules = [qw(a b g)] },
+);
+
+installer::packagelist::remove_multiple_modules_packages(\@packagemodules);
+
+is_deeply(\@packagemodules, \@expected_packagemodules);
+
+done_testing();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/bin
solenv/bin/ooinstall |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f00b387faeca2902909ce181f2f772a51ec4527f
Author: Noel Power noel.po...@novell.com
Date: Tue Jan 24 11:14:38 2012 +
fix ( hopefully ) viewing artifacts in input line fdo#44391
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index f6404a7..1ae727c 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1125,7 +1125,8 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen,
ScTabViewShell* pViewSh
ScTextWnd( pParen, pViewSh ),
mrGroupBar(* pParen ),
mnLines( 1 ),
-mnLastExpandedLines( INPUTWIN_MULTILINES )
+mnLastExpandedLines( INPUTWIN_MULTILINES ),
+mbInvalidate( false )
{
nTextStartPos = TEXT_MULTI_STARTPOS;
}
@@ -1138,7 +1139,14 @@ void ScMultiTextWnd::Paint( const Rectangle rRec )
{
EditView* pView = GetEditView();
if ( pView )
-pView-Paint( rRec );
+{
+if ( mbInvalidate )
+{
+pView-Invalidate();
+mbInvalidate = false;
+}
+pEditView-Paint( rRec );
+}
}
EditView* ScMultiTextWnd::GetEditView()
@@ -1403,8 +1411,7 @@ void ScMultiTextWnd::SetTextString( const String
rNewString )
// inputbar window scrolled to the bottom if we do that here ( because the
tableview and topview
// are synced I guess ).
// should fix that I suppose :-/ need to look a bit further into that
-if ( pEditView )
-pEditView-Invalidate();
+mbInvalidate = true; // ensure next Paint ( that uses editengine ) call
will call Invalidate first
ScTextWnd::SetTextString( rNewString );
SetScrollBarRange();
DoScroll();
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 7b5bc28..eec7fed 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -204,6 +204,7 @@ private:
ScInputBarGroup mrGroupBar;
long mnLines;
long mnLastExpandedLines;
+bool mbInvalidate;
};
class ScInputBarGroup : public ScTextWndBase
commit e8681bede97a64d03eaa01556d19f5822f898c26
Author: Noel Power noel.po...@novell.com
Date: Tue Jan 24 11:13:04 2012 +
Revert fix ( hopefully ) viewing artifacts in input line fdo#44391
This reverts commit 1f0ba007489e77e4145fc840cc3a878772494fd7.
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1ae727c..f6404a7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1125,8 +1125,7 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen,
ScTabViewShell* pViewSh
ScTextWnd( pParen, pViewSh ),
mrGroupBar(* pParen ),
mnLines( 1 ),
-mnLastExpandedLines( INPUTWIN_MULTILINES ),
-mbInvalidate( false )
+mnLastExpandedLines( INPUTWIN_MULTILINES )
{
nTextStartPos = TEXT_MULTI_STARTPOS;
}
@@ -1139,14 +1138,7 @@ void ScMultiTextWnd::Paint( const Rectangle rRec )
{
EditView* pView = GetEditView();
if ( pView )
-{
-if ( mbInvalidate )
-{
-pView-Invalidate();
-mbInvalidate = false;
-}
-pEditView-Paint( rRec );
-}
+pView-Paint( rRec );
}
EditView* ScMultiTextWnd::GetEditView()
@@ -1411,7 +1403,8 @@ void ScMultiTextWnd::SetTextString( const String
rNewString )
// inputbar window scrolled to the bottom if we do that here ( because the
tableview and topview
// are synced I guess ).
// should fix that I suppose :-/ need to look a bit further into that
-mbInvalidate = true; // ensure next Paint ( that uses editengine ) call
will call Invalidate first
+if ( pEditView )
+pEditView-Invalidate();
ScTextWnd::SetTextString( rNewString );
SetScrollBarRange();
DoScroll();
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index eec7fed..7b5bc28 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -204,7 +204,6 @@ private:
ScInputBarGroup mrGroupBar;
long mnLines;
long mnLastExpandedLines;
-bool mbInvalidate;
};
class ScInputBarGroup : public ScTextWndBase
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 3b60909..794e81b 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -50,7 +50,7 @@ for $arg (@ARGV) {
$path = Cwd::realpath( $ENV{DESTDIR} . $arg );
if (!$do_link) {
my $destdir = Cwd::realpath( $ENV{DESTDIR} );
-# $path =~ s|$destdir||;
+ $path =~ s|$destdir||;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
