[Libreoffice-commits] .: 3 commits - bin/piece bin/unpack patches/dev300 src/sofficerc-upstream
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Oct 15 06:50:26 PDT 2010
bin/piece/file-list-help | 12 -------
bin/piece/file-list-libs-core | 10 ++++++
bin/piece/file-list-postprocess | 19 -----------
bin/piece/file-list-sdk | 6 +--
bin/piece/install-bootstrap | 55 +++++++++++++++++++--------------
bin/piece/install-generic | 4 +-
bin/piece/post-inst-postprocess | 6 +--
bin/piece/sys-setup.in | 5 +--
bin/unpack | 4 ++
patches/dev300/apply | 3 +
patches/dev300/piece-helpcontent2.diff | 11 ++++++
src/sofficerc-upstream | 2 -
12 files changed, 72 insertions(+), 65 deletions(-)
New commits:
commit c7f5dfe89be6a53c49d7f055efd01731788dd672
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Oct 15 15:49:33 2010 +0200
put user configuration into ~/.libreoffice/3-suse for Novell builds
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a8dbc8d..0bb6fe3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -610,7 +610,8 @@ scp2-user-config-ooo3.diff, pmladek
# FIXME: there is not longer About/Support button in LibreOffice help-support.diff, michael
# change user config dir name from ~/.openoffice.org3 to ~/.ooo3
-scp2-user-config-ooo3.diff, pmladek
+# FIXME: do we want another config dir for the Novell buidls?
+scp2-user-config-suse.diff, pmladek
# link against the versioned libmysqlcppconn
# we do not want to require the devel package
commit f69ebea2d37a8161ff4e0de91877b29bfbf6452e
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Oct 15 15:43:08 2010 +0200
fix split build
* bin/piece/file-list-help
* bin/piece/file-list-libs-core
* bin/piece/file-list-postprocess: common help files are installed in libs-core
now
* bin/piece/file-list-sdk: bin hardcoded ooo3 path
* bin/piece/install-bootstrap: update for new path names; remove unused .in
files
* bin/piece/install-generic: new product name
* bin/piece/post-inst-postprocess: renamed some paths
* bin/piece/sys-setup.in: provide OO_INSTDIRNAME; set datarootdir correctly
* patches/dev300/piece-helpcontent2.diff: path to lucene when building
help stuff in extensions
* src/sofficerc-upstream: follow the changes in normal sources
diff --git a/bin/piece/file-list-help b/bin/piece/file-list-help
index 5b6da9d..d3222bd 100755
--- a/bin/piece/file-list-help
+++ b/bin/piece/file-list-help
@@ -10,18 +10,6 @@ $OO_TOOLSDIR/piece/sort-l10n $piece $ooo_build_tag $DESTDIR
# put the rest into the common file list
$OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
-# FIXME: remove files from the top dir; they are common for all localizations
-# and must be included in the main package (postprocess)
-for file in main_transform.xsl idxcaption.xsl idxcontent.xsl ; do
- if test `du --block-size=1 --apparent-size $DESTDIR$OO_INSTDIR/basis$VERSION/help/$file | cut -f1` -eq \
- `du --block-size=1 --apparent-size $OO_TOOLSDIR/../src/helpcontent2/$file | cut -f1` ; then
- remove_file "files-$piece.txt" $OO_INSTDIR/basis$VERSION/help/$file
- else
- echo "Error: The file \"$file\" has changed in the sources"
- echo " Please, update the prebuilt variant in $OO_TOOLSDIR/../src/helpcontent2"
- exit 1;
- fi
-done
# FIXME: hid.lst will be in testtool package (built in ?)
remove_file "files-$piece.txt" $OO_INSTDIR/basis$VERSION/program/hid.lst
# non-wanted mess
diff --git a/bin/piece/file-list-libs-core b/bin/piece/file-list-libs-core
index 0acd5e0..4333ac7 100755
--- a/bin/piece/file-list-libs-core
+++ b/bin/piece/file-list-libs-core
@@ -46,6 +46,16 @@ mv_file_between_flists files-mailmerge.txt files-$piece.txt $OO_INSTDIR/basis$VE
add_used_directories files-mailmerge.txt files-$piece.txt
chmod 755 $DESTDIR$OO_INSTDIR/basis$VERSION/program/mailmerge.py
+if test "$OOO_BUILD_NOARCH" = 'YES' ; then
+ # make compat symlinks for helpcontent common files
+ mkdir -p $DESTDIR$OO_INSTDIR_SHARE/basis$VERSION/help
+ echo "%dir $OO_INSTDIR_SHARE/basis$VERSION/help" >>files-$piece.txt
+ for file in main_transform.xsl idxcaption.xsl idxcontent.xsl ; do
+ ln -sf "$OO_INSTDIR/basis$VERSION/help/$file" $DESTDIR$OO_INSTDIR_SHARE/basis$VERSION/help/$file
+ echo "$OO_INSTDIR_SHARE/basis$VERSION/help/$file" >>files-$piece.txt
+ done
+fi
+
# mess
remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"
diff --git a/bin/piece/file-list-postprocess b/bin/piece/file-list-postprocess
index e0c1541..b199bf9 100755
--- a/bin/piece/file-list-postprocess
+++ b/bin/piece/file-list-postprocess
@@ -13,25 +13,6 @@ $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
$OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "fromtemplate"
$OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "ooffice"
-# install the common files for the helpcontent
-# make compat symlinks for if the primary files are in /usr/share
-target_instdir="$OO_INSTDIR"
-test "$OOO_BUILD_NOARCH" = 'YES' && target_instdir="$OO_INSTDIR_SHARE"
-mkdir -p $DESTDIR$target_instdir/basis$VERSION/help
-echo "%dir $target_instdir/basis$VERSION/help" >>files-$piece.txt
-if test "$OOO_BUILD_NOARCH" = 'YES' ; then
- mkdir -p $DESTDIR$OO_INSTDIR/basis$VERSION/help
- echo "%dir $OO_INSTDIR/basis$VERSION/help" >>files-$piece.txt
-fi
-for file in main_transform.xsl idxcaption.xsl idxcontent.xsl ; do
- cp -a $OO_TOOLSDIR/../src/helpcontent2/$file $DESTDIR$target_instdir/basis$VERSION/help/
- echo "$target_instdir/basis$VERSION/help/$file" >>files-$piece.txt
- if test "$OOO_BUILD_NOARCH" = 'YES' ; then
- ln -sf "$target_instdir/basis$VERSION/help/$file" $DESTDIR$OO_INSTDIR/basis$VERSION/help/$file
- echo "$OO_INSTDIR/basis$VERSION/help/$file" >>files-$piece.txt
- fi
-done
-
# extra shared MIME info
mkdir -p $DESTDIR/usr/share/mime/packages
cp $OO_TOOLSDIR/../desktop/openoffice.xml $DESTDIR/usr/share/mime/packages
diff --git a/bin/piece/file-list-sdk b/bin/piece/file-list-sdk
index 52c2150..fc3aaab 100755
--- a/bin/piece/file-list-sdk
+++ b/bin/piece/file-list-sdk
@@ -30,14 +30,14 @@ test -n "$DESTDIR" && rm -rf "$DESTDIR/$OO_INSTDIR/solver"
# save udkversion.mk
mkdir -p "$DESTDIR$OO_INSTDIR/solver/inc"
-cp $DESTDIR/usr/include/ooo3/udkversion.mk "$DESTDIR$OO_INSTDIR/solver/inc"
+cp $DESTDIR/usr/include/$OO_INSTDIRNAME/udkversion.mk "$DESTDIR$OO_INSTDIR/solver/inc"
echo "%dir $OO_INSTDIR/solver" >>"files-$piece.txt"
echo "%dir $OO_INSTDIR/solver/inc" >>"files-$piece.txt"
echo "$OO_INSTDIR/solver/inc/udkversion.mk" >>"files-$piece.txt"
# prune duplicated headers
-remove_dir "files-$piece.txt" /usr/include/ooo3
-remove_dir "files-$piece.txt" /usr/share/idl/ooo3
+remove_dir "files-$piece.txt" /usr/include/$OO_INSTDIRNAME
+remove_dir "files-$piece.txt" /usr/share/idl/$OO_INSTDIRNAME
# fix compat symlinks
ln -sf $OO_INSTDIR/solver/inc "$DESTDIR$OO_INSTDIR/basis$VERSION/sdk/include"
ln -sf $OO_INSTDIR/solver/idl "$DESTDIR$OO_INSTDIR/basis$VERSION/sdk/idl"
diff --git a/bin/piece/install-bootstrap b/bin/piece/install-bootstrap
index 05627ca..f1f2ada 100755
--- a/bin/piece/install-bootstrap
+++ b/bin/piece/install-bootstrap
@@ -16,21 +16,23 @@ cp $OOBUILDDIR/../setup_native/source/packinfo/*.txt $DEST/bin
cp $OOBUILDDIR/config.guess $DEST/bin
cp $OOBUILDDIR/config.sub $DEST/bin
-# ooo-build
-mkdir -p $OOINSTDIR/ooo-build/bin
-mkdir -p $OOINSTDIR/ooo-build/patches
-mkdir -p $OOINSTDIR/ooo-build/po
-mkdir -p $OOINSTDIR/ooo-build/desktop
-mkdir -p $OOINSTDIR/ooo-build/man
-cp -a $TOOLSDIR/bin/* $OOINSTDIR/ooo-build/bin || exit 1;
-cp -a $TOOLSDIR/patches/* $OOINSTDIR/ooo-build/patches || exit 1;
-cp -a $TOOLSDIR/po/ooo-build-*.sdf $OOINSTDIR/ooo-build/po || exit 1;
-cp -a $TOOLSDIR/desktop/* $OOINSTDIR/ooo-build/desktop || exit 1;
-cp -a $TOOLSDIR/man/* $OOINSTDIR/ooo-build/man || exit 1;
+LOINSTTOOLSDIR=$OOINSTDIR/build
+
+# build
+mkdir -p $LOINSTTOOLSDIR/bin
+mkdir -p $LOINSTTOOLSDIR/patches
+mkdir -p $LOINSTTOOLSDIR/po
+mkdir -p $LOINSTTOOLSDIR/desktop
+mkdir -p $LOINSTTOOLSDIR/man
+cp -a $TOOLSDIR/bin/* $LOINSTTOOLSDIR/bin || exit 1;
+cp -a $TOOLSDIR/patches/* $LOINSTTOOLSDIR/patches || exit 1;
+cp -a $TOOLSDIR/po/lo-build-*.sdf $LOINSTTOOLSDIR/po || exit 1;
+cp -a $TOOLSDIR/desktop/* $LOINSTTOOLSDIR/desktop || exit 1;
+cp -a $TOOLSDIR/man/* $LOINSTTOOLSDIR/man || exit 1;
# copy pieces of interest into src to be moved out later ...
echo "copy source pieces"
-mkdir -p $OOINSTDIR/ooo-build/src
+mkdir -p $LOINSTTOOLSDIR/src
cp -a \
$TOOLSDIR/src/*.dic \
$TOOLSDIR/src/*.bmp \
@@ -46,25 +48,34 @@ cp -a \
$TOOLSDIR/src/helpcontent2 \
$TOOLSDIR/src/icons \
$TOOLSDIR/src/layout \
- $OOINSTDIR/ooo-build/src || exit 1;
+ $LOINSTTOOLSDIR/src || exit 1;
# src/sdf
-mkdir -p $OOINSTDIR/ooo-build/src/sdf
+mkdir -p $LOINSTTOOLSDIR/src/sdf
cp -a \
$TOOLSDIR/src/sdf/*.sdf \
$TOOLSDIR/src/sdf/README \
- $OOINSTDIR/ooo-build/src/sdf || exit 1;
+ $LOINSTTOOLSDIR/src/sdf || exit 1;
# branding stuff should go into noarch path
if test "$OOO_BUILD_NOARCH" = 'YES' ; then
- OO_INSTDIR_SHARE=`echo $OOINSTDIR | sed -e "s|lib6\?4\?|share|"`
- mkdir -p $OO_INSTDIR_SHARE/ooo-build/src
+ OO_INSTDIR_SHARE=`echo $OOINSTDIR | sed -e "s|/lib6\?4\?/|/share/|"`
+ mkdir -p $OO_INSTDIR_SHARE/build/src
mv \
- $OOINSTDIR/ooo-build/src/sofficerc-upstream \
- $OO_INSTDIR_SHARE/ooo-build/src || exit 1;
+ $LOINSTTOOLSDIR/src/sofficerc-upstream \
+ $OO_INSTDIR_SHARE/build/src || exit 1;
fi
-find $OOINSTDIR/ooo-build -depth -name "CVS" -type d -exec rm -rf {} \;
-find $OOINSTDIR/ooo-build -name "*.orig" -exec rm -rf {} \;
-find $OOINSTDIR/ooo-build -type f -exec chmod go-w {} \;
+# bin mess and stuff that won't be needed
+find $LOINSTTOOLSDIR -depth -name "CVS" -type d -exec rm -rf {} \;
+find $LOINSTTOOLSDIR -name "*.orig" -exec rm -rf {} \;
+find $LOINSTTOOLSDIR -type f -exec chmod go-w {} \;
+find $LOINSTTOOLSDIR -name "Makefile*" -exec rm -rf {} \;
+# .in files does not make sense without configure
+# in addition, rpm/find-provides goes mad with incomplete script headers, e.g. #!@PERL@ -pi.bak -w
+rm -f \
+ $LOINSTTOOLSDIR/bin/setup.in \
+ $LOINSTTOOLSDIR/bin/font-munge.in \
+ $LOINSTTOOLSDIR/bin/help-font-munge.in \
+ $LOINSTTOOLSDIR/bin/piece/sys-setup.in
echo "done bootstrap specific install"
diff --git a/bin/piece/install-generic b/bin/piece/install-generic
index e883862..6211be5 100755
--- a/bin/piece/install-generic
+++ b/bin/piece/install-generic
@@ -36,9 +36,9 @@ for lang in $OO_LANGS ; do
done
if test "$piece" = "sdk" ; then
- PRODUCT=OpenOffice_SDK
+ PRODUCT=LibreOffice_SDK
else
- PRODUCT=OpenOffice
+ PRODUCT=LibreOffice
fi
perl -w $SOLARENV/bin/make_installer.pl \
diff --git a/bin/piece/post-inst-postprocess b/bin/piece/post-inst-postprocess
index b132d29..23c2e31 100755
--- a/bin/piece/post-inst-postprocess
+++ b/bin/piece/post-inst-postprocess
@@ -28,7 +28,7 @@ export JVMFWK_CONFIGFILE=file://`pwd`/jvmfwk3rc
# we use the prebuilt one in the upstream branding package
# FIXME: it would be possible to generate this file by the installer, e.g. in bootstrap
if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then
- if diff -q $DESTDIR$OO_INSTDIR/program/sofficerc $OO_INSTDIR_SHARE/ooo-build/src/sofficerc-upstream ; then
+ if diff -q $DESTDIR$OO_INSTDIR/program/sofficerc $OO_INSTDIR_SHARE/build/src/sofficerc-upstream ; then
rm -f $DESTDIR$OO_INSTDIR/program/sofficerc
ln -sf $OO_INSTDIR_SHARE/program/sofficerc $DESTDIR$OO_INSTDIR/program/sofficerc
else
@@ -43,9 +43,9 @@ export PYTHONPATH=$OO_INSTDIR/basis$VERSION/program
$OO_TOOLSDIR/piece/install-generic $piece $ooo_build_tag
# urgh - unbelievably nasty:
-cp -a OpenOffice/gid_Starregistry_Services_Rdb_rdb/*/services.rdb \
+cp -a LibreOffice/gid_Starregistry_Services_Rdb_rdb/*/services.rdb \
$DESTDIR$OO_INSTDIR/basis$VERSION/program/services.rdb
-cp -a OpenOffice/gid_Starregistry_Services_Rdb_Ure_servicesrdb/*/services.rdb \
+cp -a LibreOffice/gid_Starregistry_Services_Rdb_Ure_servicesrdb/*/services.rdb \
$DESTDIR$OO_INSTDIR/ure/share/misc/services.rdb
# udpate the file list
if test -f "files-$piece.txt" ; then
diff --git a/bin/piece/sys-setup.in b/bin/piece/sys-setup.in
index 35925ad..94e185a 100755
--- a/bin/piece/sys-setup.in
+++ b/bin/piece/sys-setup.in
@@ -4,10 +4,11 @@
export DISTRO='@DISTRO@'
export VENDORNAME='@VENDORNAME@'
export VERSION='@OOO_VERSION@'
-export OO_INSTDIR=@libdir@/@OOOINSTALLDIRNAME@
+export OO_INSTDIRNAME=@OOOINSTALLDIRNAME@
+export OO_INSTDIR=@libdir@/$OO_INSTDIRNAME
export OO_PREFIX=@prefix@
export OO_LIBDIR=@libdir@
-datarootdir = @datarootdir@
+datarootdir=@datarootdir@
export OO_MANDIR=@mandir@
export OO_DOCDIR=@docdir@
export OO_LANGS='@OOO_LANGS@'
diff --git a/patches/dev300/piece-helpcontent2.diff b/patches/dev300/piece-helpcontent2.diff
index c3bd611..24dd5e7 100644
--- a/patches/dev300/piece-helpcontent2.diff
+++ b/patches/dev300/piece-helpcontent2.diff
@@ -25,3 +25,14 @@
.ENDIF
.IF "$(SYSTEM_DB)" != "YES"
+--- solenv/inc/extension_helplink.mk.old 2010-10-13 16:28:44.000000000 +0200
++++ solenv/inc/extension_helplink.mk 2010-10-13 17:27:08.000000000 +0200
+@@ -30,7 +30,7 @@ my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SO
+ .IF "$(SYSTEM_LUCENE)" == "YES"
+ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
+ .ELSE
+-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
++my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SPLITINSTALLDIR)/classes/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)/classes/lucene-analyzers-2.3.jar
+ .ENDIF
+
+ .IF "$(SYSTEM_DB)" != "YES"
diff --git a/src/sofficerc-upstream b/src/sofficerc-upstream
index 62b04de..32acf5c 100644
--- a/src/sofficerc-upstream
+++ b/src/sofficerc-upstream
@@ -2,7 +2,7 @@
HideEula=1
Logo=1
NativeProgress=true
-ProgressBarColor=14,133,205
+ProgressBarColor=126,170,23
ProgressFrameColor=207,208,211
ProgressPosition=185,206
ProgressSize=320,7
commit 88d05274a1b9166c7be788d1e8b42f16ef693cd8
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Oct 15 15:40:50 2010 +0200
create boost.m4 also in split build
diff --git a/bin/unpack b/bin/unpack
index 5df96ae..1740ec3 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -296,6 +296,10 @@ if test "z$OOO_GIT" = "z" ; then
# ugly hack around odd positioning of this info
echo "Unpacking setup_native .txt pieces"
($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-ooo320-m17.tar.bz2 | $GNUTAR xf - ) || exit
+ # hack to patch new files in the root dir
+ if test "z$PIECE" = "zbootstrap" ; then
+ touch $OOBUILDDIR/boost.m4
+ fi
fi
fi
else
More information about the Libreoffice-commits
mailing list