[ooo-build-commit] .: 3 commits - configure.in distro-configs/CommonLinux.conf.in distro-configs/CommonMac.conf.in distro-configs/CommonWin32.conf.in distro-configs/LibreOfficeLinux.conf.in distro-configs/LibreOfficeMacOSX.conf.in distro-configs/LibreOfficeWin32.conf.in download.in patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Mon Sep 27 23:49:03 PDT 2010
configure.in | 6 ++-
distro-configs/CommonLinux.conf.in | 2 -
distro-configs/CommonMac.conf.in | 2 -
distro-configs/CommonWin32.conf.in | 2 -
distro-configs/LibreOfficeLinux.conf.in | 52 +++++++++++++++++++++++++++++++
distro-configs/LibreOfficeMacOSX.conf.in | 8 ++++
distro-configs/LibreOfficeWin32.conf.in | 6 +++
download.in | 18 +++++-----
patches/dev300/apply | 7 +++-
9 files changed, 89 insertions(+), 14 deletions(-)
New commits:
commit 54e10572ea419b4d48d6b8020a1e3e817556af9e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 28 08:48:45 2010 +0200
Change the defaut download url and libreoffice version
diff --git a/configure.in b/configure.in
index 4be9870..af9fc33 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(ooo-build, 3.2.99.0)
+AC_INIT(ooo-build, 3.2.99.1)
AC_PREREQ(2.51)
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
diff --git a/download.in b/download.in
index 265fb89..6ffa513 100755
--- a/download.in
+++ b/download.in
@@ -18,10 +18,10 @@ sub webget($$$$)
# helper tool to repack ooo piece sources from cgit
my $ooo_pack_sources = '@TOOLSDIR@' . "/bin/ooo-pack-sources";
- print "Get $src -> $dest/ooo-build-${ooo_sourceversion}-$name.tar.bz2\n";
+ print "Get $src -> $dest/libreoffice-${ooo_sourceversion}-$name.tar.bz2\n";
# first try to get the tarball into a temporary directory
- my $tempdir = tempdir( '/tmp/ooo-build-download-XXXXXX' );
+ my $tempdir = tempdir( '/tmp/libreoffice-download-XXXXXX' );
$result = system( "cd $tempdir ; $WGET \"$src\" -O temp.tar.bz2" );
@@ -94,8 +94,8 @@ sub download_tests_dependencies() {
'http:\/\/.*' => '',
'binutils-.*' => '@MIRROR@/support',
'gcc-.*' => '@MIRROR@/support',
- 'ooo-build-3.2.9.*' => '@MIRROR@/3.3',
- 'ooo-build-3.3.0.*' => '@MIRROR@/3.3',
+ 'libreoffice-3.2.9.*' => '@MIRROR@/3.3',
+ 'libreoffice-3.3.0.*' => '@MIRROR@/3.3',
'beb300-m.*' => '@MIRROR@/BEB300',
'dev300-m.*' => '@MIRROR@/DEV300',
'ooo300-m.*' => '@MIRROR@/OOO300',
@@ -301,11 +301,11 @@ sub source_file_ooo($)
$git_tag =~ s/-/_/g;
$git_tag =~ s/\./_/g;
- print "Trying to get http://cgit.freedesktop.org/ooo-build/$what/snapshot/$git_tag.tar.bz2\n";
- source_file( "http://cgit.freedesktop.org/ooo-build/$what/snapshot/$git_tag.tar.bz2", $what, 1);
+ print "Trying to get http://cgit.freedesktop.org/libreoffice/$what/snapshot/$git_tag.tar.bz2\n";
+ source_file( "http://cgit.freedesktop.org/libreoffice/$what/snapshot/$git_tag.tar.bz2", $what, 1);
}
else {
- source_file( "ooo-build-" . '@OOO_SOURCEVERSION@' . "-$what.tar.bz2" );
+ source_file( "libreoffice-" . '@OOO_SOURCEVERSION@' . "-$what.tar.bz2" );
}
}
@@ -327,8 +327,8 @@ sub download_files($$$)
my $to_check;
if ( $save_as ne '' ) {
if ($is_cgit) {
- # it must be ooo-build piece source; $save_as include just a file name
- $to_check = "$dest/ooo-build-" . '@OOO_SOURCEVERSION@' . "-$save_as.tar.bz2";
+ # it must be libreoffice piece source; $save_as include just a file name
+ $to_check = "$dest/libreoffice-" . '@OOO_SOURCEVERSION@' . "-$save_as.tar.bz2";
} else {
# $save_as provides full file name
$to_check = "$dest/$save_as";
commit bc6614d637bd79e471a70a1467c000279808da48
Author: Petr Mladek <pmladek at suse.cz>
Date: Sat Sep 25 00:49:10 2010 +0200
Update version string to "libreoffice-build 3.2.99.0" in about dialog
diff --git a/configure.in b/configure.in
index 85eade0..4be9870 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(ooo-build, 3.2.98.1)
+AC_INIT(ooo-build, 3.2.99.0)
AC_PREREQ(2.51)
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
diff --git a/distro-configs/CommonLinux.conf.in b/distro-configs/CommonLinux.conf.in
index bb703e8..286b742 100644
--- a/distro-configs/CommonLinux.conf.in
+++ b/distro-configs/CommonLinux.conf.in
@@ -1,6 +1,6 @@
--disable-epm
--with-openldap
---with-build-version=\"ooo-build @OOO_BUILDVERSION@\"
+--with-build-version=\"libreoffice-build @OOO_BUILDVERSION@\"
--without-fonts
--with-system-jpeg
--with-system-libxml
diff --git a/distro-configs/CommonMac.conf.in b/distro-configs/CommonMac.conf.in
index 8396246..a39e3e9 100644
--- a/distro-configs/CommonMac.conf.in
+++ b/distro-configs/CommonMac.conf.in
@@ -1,2 +1,2 @@
--disable-gtk
-
+--with-build-version=\"libreoffice-build @OOO_BUILDVERSION@\"
diff --git a/distro-configs/CommonWin32.conf.in b/distro-configs/CommonWin32.conf.in
index 546cb33..a641993 100644
--- a/distro-configs/CommonWin32.conf.in
+++ b/distro-configs/CommonWin32.conf.in
@@ -1,2 +1,2 @@
--with-ant-home=$BUILDDIR/$APACHE_ANT
---with-build-version=\"ooo-build `date +%Y-%m-%d`\"
+--with-build-version=\"libreoffice-build @OOO_BUILDVERSION@\"
commit b4634624921809d7b7c2157c964cc7a1cfaab8de
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Sep 24 20:44:57 2010 +0200
Creating LibreOffice distributions
diff --git a/configure.in b/configure.in
index 9d2df5a..85eade0 100644
--- a/configure.in
+++ b/configure.in
@@ -689,6 +689,7 @@ case $DISTRO in
OxygenOffice*) VENDORNAME="OxygenOffice" ;;
FSFhu*) VENDORNAME="FSFhu" ;;
OOo4Kids*) VENDORNAME="EducOOo" ;;
+ LibreOffice*) VENDORNAME="The Document Foundation" ;;
*) AC_MSG_WARN([Cannot guess vendor from distro - please add it to configure.in]) ;;
esac
AC_MSG_RESULT([$VENDORNAME])
@@ -1705,6 +1706,9 @@ distro-configs/Solaris.conf
distro-configs/GoOoLinux.conf
distro-configs/GoOoMacOSX.conf
distro-configs/Raw.conf
+distro-configs/LibreOfficeWin32.conf
+distro-configs/LibreOfficeLinux.conf
+distro-configs/LibreOfficeMacOSX.conf
etc/Makefile
extensions/Makefile
extensions/tweakconfig/Makefile
diff --git a/distro-configs/LibreOfficeLinux.conf.in b/distro-configs/LibreOfficeLinux.conf.in
new file mode 100644
index 0000000..d789207
--- /dev/null
+++ b/distro-configs/LibreOfficeLinux.conf.in
@@ -0,0 +1,52 @@
+--with-vendor=\"The Document Foundation\"
+--disable-dbus
+--disable-kde4
+--disable-access
+--enable-cairo
+--without-system-cairo
+--enable-gstreamer
+--enable-odk
+--enable-binfilter
+--enable-gnome-vfs
+--enable-hids
+--enable-lockdown
+--enable-opengl
+--enable-ogltrans
+--with-java-target-version=1.5
+--with-jdk-home=$JAVA_HOME
+--without-myspell-dicts
+--enable-epm
+--enable-kde
+--without-system-mozilla
+--without-system-freetype
+--without-system-jpeg
+--without-system-libxml
+--without-system-libxslt
+--without-system-python
+--without-system-zlib
+--without-system-jars
+--without-system-stdlibs
+--disable-crypt-link
+--disable-pam-link
+--disable-xrender-link
+--disable-randr-link
+--without-openldap
+--without-system-xrender-headers
+--without-system-mesa-headers
+--without-unix-wrapper
+--with-fonts
+--enable-minimizer
+--enable-presenter-console
+--enable-pdfimport
+--without-system-poppler
+--enable-wiki-publisher
+--enable-report-builder
+--with-extension-integration
+--with-linker-hash-style=both
+--with-ant-home=$BUILDDIR/$APACHE_ANT
+--with-system-dicts
+--with-external-dict-dir=/usr/share/hunspell
+--with-external-hyph-dir=/usr/share/hyphen
+--with-external-thes-dir=/usr/share/mythes
+--with-dict=ALL
+--without-system-openssl
diff --git a/distro-configs/LibreOfficeMacOSX.conf.in b/distro-configs/LibreOfficeMacOSX.conf.in
new file mode 100644
index 0000000..e0ef489
--- /dev/null
+++ b/distro-configs/LibreOfficeMacOSX.conf.in
@@ -0,0 +1,8 @@
+--with-vendor=\"The Document Foundation\"
+--enable-hids
+--enable-minimizer
+--enable-presenter-console
+--enable-pdfimport
+--enable-wiki-publisher
+--enable-report-builder
+--with-extension-integration
diff --git a/distro-configs/LibreOfficeWin32.conf.in b/distro-configs/LibreOfficeWin32.conf.in
new file mode 100644
index 0000000..d5b0240
--- /dev/null
+++ b/distro-configs/LibreOfficeWin32.conf.in
@@ -0,0 +1,6 @@
+--with-vendor=\"The Document Foundation\"
+--with-java-target-version=1.5
+--enable-hids
+--disable-activex-component
+--without-agfa-monotype-fonts
+--disable-xrender-link
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8d1e5bc..d1cd641 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -119,7 +119,6 @@ NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, Novel
NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
# go-oo.org Win32
GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, GoOoSplash
-Raw: RawCommon RawPatches
# Mac OS X
MacOSX : MacOSXCommon, MacOSXOnly
GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
@@ -149,6 +148,12 @@ PlainLinux: PlainBuildFixes
CrossWin32 : CrossWin32Patches
# OOo4Kids flavor
OOo4Kids: OOo4KidsPatches
+# Generic Patch-less builds
+Raw: RawCommon RawPatches
+# LibreOffice
+LibreOfficeWin32: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches
+LibreOfficeLinux: LibreOfficeCommon LibreOfficePatches LibreOfficeLinuxPatches
+LibreOfficeMacOSX: LibreOfficeCommon LibreOfficePatches LibreOfficeMacOSXPatches
# -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
More information about the ooo-build-commit
mailing list