[Libreoffice-commits] .: Branch 'gr2' - 10 commits - g git-hooks/pre-commit ooo.lst scp2/source solenv/bin solenv/inc
Martin Hosken
mhosken at kemper.freedesktop.org
Thu Mar 10 00:03:38 PST 2011
g | 15 +++++++++++----
git-hooks/pre-commit | 16 ++++++++++++++++
ooo.lst | 3 +--
scp2/source/ooo/file_library_ooo.scp | 15 ---------------
scp2/source/ooo/shortcut_ooo.scp | 22 ----------------------
solenv/bin/build.pl | 4 ----
solenv/inc/libs.mk | 12 ++++++------
7 files changed, 34 insertions(+), 53 deletions(-)
New commits:
commit 2f9d4b26a44d2da04858ef087b82b03ed483a0a8
Author: Martin Hosken <martin_hosken at sil.org>
Date: Thu Mar 10 14:39:50 2011 +0700
graphite statically linked if non system, move ICU to go-oo
diff --git a/ooo.lst b/ooo.lst
index 83934eb..f66c3a4 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -13,7 +13,6 @@ http://hg.services.openoffice.org/binaries
2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-43e56b71c407be5154de681eaa646a4a-icu4c-4_6-src.tgz
ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
@@ -66,6 +65,7 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
http://download.go-oo.org/src
+43e56b71c407be5154de681eaa646a4a-icu4c-4_6-src.tgz
47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 47bce4a..54836a8 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -808,21 +808,6 @@ End
#endif
-#ifndef SYSTEM_GRAPHITE
-
-File gid_File_Lib_Graphite
- TXT_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT8(libgraphite2,UNXSUFFIX,.,2,.,0,.,0));
- #else
- Name = graphite2.dll;
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-#endif
-
#ifdef SOLAR_JAVA
STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index edaabed..cec7ed1 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -76,28 +76,6 @@ End
#endif
-#ifndef SYSTEM_GRAPHITE
-Shortcut gid_Shortcut_Lib_Graphite_0
- FileID = gid_File_Lib_Graphite;
- Dir = gid_Dir_Program;
- Name = STRING(CONCAT2(libgraphite2,UNXSUFFIX));
- Styles = (NETWORK,RELATIVE);
-End
-
-Shortcut gid_Shortcut_Lib_Graphite_1
- FileID = gid_File_Lib_Graphite;
- Dir = gid_Dir_Program;
- Name = STRING(CONCAT4(libgraphite2,UNXSUFFIX,.,2));
- Styles = (NETWORK,RELATIVE);
-End
-
-Shortcut gid_Shortcut_Lib_Graphite_2
- FileID = gid_File_Lib_Graphite;
- Dir = gid_Dir_Program;
- Name = STRING(CONCAT4(libgraphite2,UNXSUFFIX,.,2.0));
- Styles = (NETWORK,RELATIVE);
-End
-#endif
#endif
#ifdef MACOSX
commit 1be9eab189b3c62f6a1d935a2d5579ee42a573f1
Author: Martin Hosken <martin_hosken at sil.org>
Date: Thu Mar 10 07:17:19 2011 +0700
only one icu
diff --git a/ooo.lst b/ooo.lst
index 48809ee..83934eb 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -69,7 +69,6 @@ http://download.go-oo.org/src
47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
-e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
commit eeb9a7cfd7e09f3a40092bced0799be8c359c451
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 7 14:55:10 2011 +0100
solenv/bin/subsequenttests is intended to be executable
diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
old mode 100644
new mode 100755
commit 40b49e42dcdfb025b2e5d201f8f8c61e1be2513c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 7 14:53:08 2011 +0100
teach ./g at least some basic manners when using commit -F
* still needs fixes for message files with relative paths
diff --git a/g b/g
index a440d65..a37943a 100755
--- a/g
+++ b/g
@@ -105,10 +105,16 @@ while shift ; do
FILES[$FILESNUM]="$1"
FILESNUM=$(($FILESNUM+1))
else
- [ "$COMMAND" = "commit" -a "$PARAM" = "--allow-empty" ] && ALLOW_EMPTY=1
-
- FILES[$FILESNUM]="$PARAM"
- FILESNUM=$(($FILESNUM+1))
+ if [ "$COMMAND" = "commit" -a "$PARAM" = "-F" ]
+ then
+ shift
+ # this still needs some magic to handle relative paths
+ EXTRA="${EXTRA} -F ${1}"
+ else
+ [ "$COMMAND" = "commit" -a "$PARAM" = "--allow-empty" ] && ALLOW_EMPTY=1
+ FILES[$FILESNUM]="$PARAM"
+ FILESNUM=$(($FILESNUM+1))
+ fi
fi
else
if [ "$COMMAND" = "apply" ] ; then
@@ -225,6 +231,7 @@ for REPO in $DIRS ; do
# do it!
if [ "$COMMAND" != "clone" -o ! -d $DIR ] ; then
[ "$REPORT_REPOS" = "1" ] && echo "===== $NAME ====="
+ echo git $PAGER "$COMMAND" $EXTRA "${FILES[@]}"
git $PAGER "$COMMAND" $EXTRA "${FILES[@]}"
RETURN=$?
fi
commit d4129abe41d8a41db6c14b5e9e82198dbef201a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 6 20:26:55 2011 +0000
always include these on all platforms to keep things simple
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index d0b95c3..f8ed465 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -26,6 +26,12 @@
#*************************************************************************
LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
+.INCLUDE .IGNORE : icuversion.mk
+.INCLUDE .IGNORE : i18npool/version.mk
+.INCLUDE .IGNORE : comphelper/version.mk
+.INCLUDE .IGNORE : ucbhelper/version.mk
+.INCLUDE .IGNORE : connectivity/version.mk
+
.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
# No ODMA on UNX
@@ -41,7 +47,6 @@ AWTLIB*=-ljawt
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
AVMEDIALIB=-lavmedia$(DLLPOSTFIX)
.IF "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : icuversion.mk
ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR)
ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR)
@@ -53,7 +58,6 @@ ICUUCLIB=-licuuc
ICUDATALIB=-licudata
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
I18NUTILLIB=-li18nutil$(COMID)
-.INCLUDE .IGNORE : i18npool/version.mk
I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
.IF "$(GUI)$(COM)"=="WNTGCC"
@@ -62,7 +66,6 @@ SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX)
-.INCLUDE .IGNORE : comphelper/version.mk
COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID)
CONNECTIVITYLIB=-lconnectivity
LDAPBERLIB=-lldapber
@@ -76,7 +79,6 @@ CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : ucbhelper/version.mk
UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
.IF "$(SYSTEM_OPENSSL)" == "YES"
OPENSSLLIB=$(OPENSSL_LIBS)
@@ -103,7 +105,6 @@ SALLIB=-lsal$(UDK_MAJOR)
STORELIB=-lstore
SALLIB=-luno_sal
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : connectivity/version.mk
ODBCLIB=-lodbc$(DLLPOSTFIX)
ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
DBFILELIB=-lfile$(DLLPOSTFIX)
commit f62db1095ac04aa15bf54eeae5877139f78a134c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 6 15:30:22 2011 +0000
vos is gone
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 6ff3e24..d0b95c3 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -94,7 +94,6 @@ REGLIB=-lreg$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
REGLIB=-lreg
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : vos/version.mk
XMLOFFLIB=-lxo$(DLLPOSTFIX)
XMLOFFLLIB=-lxol
.IF "$(GUI)$(COM)"=="WNTGCC"
commit 9503b254f7d882d51cac799b1a0c1ab5b3799588
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Thu Mar 3 01:30:27 2011 +0100
git-hooks: don't stage unstaged hunks before commit
We call 'git add' for files where we fixed whitespaces in. This is a
problem in case the user staged only part of a file - as a result we do
not just fix up whitespace in the patch but also stage other hunks of
the file.
Fix the problem by removing/restoring not staged changes before/after
whitespace fixing. The operation is cheap enough, as it's a noop in case
there are no unstaged changes.
diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit
index cee3a7f..8192e58 100755
--- a/git-hooks/pre-commit
+++ b/git-hooks/pre-commit
@@ -58,6 +58,18 @@ sub check_and_fix_whitespace($)
my $line_no = 0;
my $line_max = -1;
+ my $stash = "";
+
+ # any not staged changes to stash away?
+ system( "git update-index -q --refresh" );
+ if ( `git diff --name-only --` ) {
+ my $fd;
+ ( $fd, $stash ) = mkstemp( "/tmp/unstaged-changes-XXXXXX" );
+ close( $fd );
+ # this will keep the staged changes
+ system( "git diff > $stash" );
+ system( "git checkout ." );
+ }
open( IN, "git diff-index -p --no-prefix --cached $head -- |" ) || die "Cannot get git diff-index";
while ( my $line = <IN> ) {
if ( $line =~ /^\+\+\+ (.*)/ ) {
@@ -80,6 +92,10 @@ sub check_and_fix_whitespace($)
}
fix_whitespace( $file, \%lines );
close( IN );
+ if ($stash) {
+ system( "git apply < $stash" );
+ unlink( $stash );
+ }
}
# Do the work :-)
commit 1e68be112948949d7b9acbb9d73a51a531e2fa26
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Mar 2 16:39:25 2011 +0100
Don't regenerate dependencies, just try second time
Since the dependencies generation is broken strategy with external libraries
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index ad6626f..0270503 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -786,11 +786,7 @@ sub dmake_dir {
#and try again. dmakes normal failure is 255, while death on signal is 254
my $real_exit_code = $error_code >> 8;
if (($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
- print "Forcing regeneration of dependency info\n";
- $ENV{depend} = 't';
- run_job($dmake, $job_name);
print "Retrying $job_name\n";
- $ENV{depend} = '';
$error_code = run_job($dmake, $job_name);
}
commit aa676d9159afa0086c43774cdc3ff7f41b0fc1e8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Mar 2 15:57:26 2011 +0100
Revert "A lame fix for the rebuilding of external libraries"
This reverts commit 42dd24db865ec0112fac4781e63ed11959f02472.
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index d358a4e..ad6626f 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -787,8 +787,10 @@ sub dmake_dir {
my $real_exit_code = $error_code >> 8;
if (($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
print "Forcing regeneration of dependency info\n";
- run_job($dmake, 'depend=t', $job_name);
+ $ENV{depend} = 't';
+ run_job($dmake, $job_name);
print "Retrying $job_name\n";
+ $ENV{depend} = '';
$error_code = run_job($dmake, $job_name);
}
commit 2462d4b031d4ae00b2a62f10ea826828dffe853e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Mar 2 15:40:19 2011 +0100
A lame fix for the rebuilding of external libraries
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index ad6626f..d358a4e 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -787,10 +787,8 @@ sub dmake_dir {
my $real_exit_code = $error_code >> 8;
if (($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
print "Forcing regeneration of dependency info\n";
- $ENV{depend} = 't';
- run_job($dmake, $job_name);
+ run_job($dmake, 'depend=t', $job_name);
print "Retrying $job_name\n";
- $ENV{depend} = '';
$error_code = run_job($dmake, $job_name);
}
More information about the Libreoffice-commits
mailing list