[ooo-build-commit] .: bin/Makefile.am bin/ooo-pack-sources bin/setup.in configure.in download_external_sources.sh download.in Makefile.shared patches/dev300 src/.gitignore
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Aug 31 11:26:45 PDT 2010
Makefile.shared | 2
bin/Makefile.am | 1
bin/ooo-pack-sources | 3
bin/setup.in | 10
configure.in | 646 ++++++++++++++++++++++---------------------
download.in | 245 +++++++++-------
download_external_sources.sh | 2
patches/dev300/apply | 2
src/.gitignore | 1
9 files changed, 497 insertions(+), 415 deletions(-)
New commits:
commit 970243c7ac75aa9c1330d91b416543760e06aa43
Author: Petr Mladek <pmladek at walk.suse.cz>
Date: Tue Aug 31 20:12:15 2010 +0200
Support for build with released ooo sources from git
* bin/ooo-pack-sources: do not copy src/ooo-build-* files;
use ooo-build-<piece>.tar.bz2 for the piece tarballs
* bin/setup.in: new OOO_TAG variable to get the right external sources
from http://hg.services.openoffice.org; new OOO_SOURCEVERSION
to use another OOo sources from git than the ooo-build version;
use the new source tarball names ooo-build-<piece>.tar.bz2
* configure.in: set version 3.2.98.0; set DEFAULT_TAG=ooo-build-3.2.98.0;
set DEFAULT_OOO_TAG=ooo330-m4; --with-tag newly defines the tag from
the build repo; new option --with-ooo-tag allows to redefine OOO_TAG;
new option --with-source-version allow to redefine OOO_SOURCEVERSION;
replace tabs with space to make the new git commit check happy
* download.in: download and repack the ooo sources as defined by the
CVSTAG and OOO_SOURCEVERSION variables and new naming scheme
* download_external_sources.sh: use OOO_TAG instead of CVSTAG
* Makefile.shared: allow to build without clone dir
* patches/dev300/apply: add ooo-build-3.2.98.0 to the supported tags
* bin/Makefile.am: pack the ooo-pack-sources script
* src/.gitignore: ignore fetch.log
diff --git a/Makefile.shared b/Makefile.shared
index 234c2d6..70d0b22 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -88,7 +88,7 @@ $(STAMP_DIR)/refresh : $(CLONEDIR)/repos_changed
touch $@
$(CLONEDIR)/repos_changed :
- if test ! -e $@ ; then touch $@ ; fi
+ if test "z$(OOO_GIT)" != "z" -a ! -e $@ ; then touch $@ ; fi
# Build bits:
diff --git a/bin/Makefile.am b/bin/Makefile.am
index d3be254..737f7f3 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -30,6 +30,7 @@ script_files = \
ootesttool.in \
ootool.in \
ootouch \
+ ooo-pack-sources \
openoffice-xlate-lang \
owner \
package-lang-win32 \
diff --git a/bin/ooo-pack-sources b/bin/ooo-pack-sources
index 34fbddd..9754286 100755
--- a/bin/ooo-pack-sources
+++ b/bin/ooo-pack-sources
@@ -122,6 +122,7 @@ sub generate_ooo_build_blacklist($)
print BLACKLIST "rawbuild/*\n";
print BLACKLIST "build/*\n";
print BLACKLIST "clone/*\n";
+ print BLACKLIST "src/ooo-build-*.tar.bz2\n";
print BLACKLIST "src/????????????????????????????????-*\n";
close BLACKLIST;
@@ -569,7 +570,7 @@ if ($is_ooo_build_dir) {
# define tarball names
$ooo_build_tarball = "ooo-build-$release_version.tar.gz";
foreach my $piece (@pieces) {
- $piece_tarball{$piece} = "ooo-$release_version-$piece.tar.bz2";
+ $piece_tarball{$piece} = "ooo-build-$release_version-$piece.tar.bz2";
}
print "Default version : $config_version\n" if ($verbose && defined $config_version);
diff --git a/bin/setup.in b/bin/setup.in
index 2af1692..d0d56f4 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -15,6 +15,7 @@ OOO_LANGS='@OOO_LANGS@'
if test "$OOO_LANGS" = ""; then OOO_LANGS="en-US"; fi
OOO_POOR_HELP_LOCALIZATIONS='@OOO_POOR_HELP_LOCALIZATIONS@'
CVSTAG='@CVSTAG@'
+OOO_TAG='@OOO_TAG@'
OOO_GIT='@OOO_GIT@'
CLONEDIR='@CLONEDIR@'
RAWBUILDDIR='@RAWBUILDDIR@'
@@ -49,6 +50,7 @@ LANGUAGETOOL_EXTENSION='@LANGUAGETOOL_EXTENSION@'
OOOBLOGGER_EXTENSION='@OOOBLOGGER_EXTENSION@'
SUNTEMPLATES_LANG='@SUNTEMPLATES_LANG@'
OOO_BUILDVERSION='@OOO_BUILDVERSION@'
+OOO_SOURCEVERSION='@OOO_SOURCEVERSION@'
OOO_STRIP='@OOO_STRIP@'
OOO_ADDITIONAL_SECTIONS='@OOO_ADDITIONAL_SECTIONS@'
SPLIT_APP_MODULES='@SPLIT_APP_MODULES@'
@@ -300,9 +302,9 @@ else
fi
OOO_SPLIT_PREFIX=""
if test "z at SPLIT@" = "zyes"; then
- OOO_SPLIT_PREFIX="$CVSTAG-"
- OOO_SDK_OO_TARBALL="$CVSTAG-sdk.tar.bz2"
- OOO_SYSTEM_TARBALL="$CVSTAG-libs-extern-sys.tar.bz2"
+ OOO_SPLIT_PREFIX="ooo-build-$OOO_SOURCEVERSION-"
+ OOO_SDK_OO_TARBALL="ooo-build-$OOO_SOURCEVERSION-sdk.tar.bz2"
+ OOO_SYSTEM_TARBALL="ooo-build-$OOO_SOURCEVERSION-libs-extern-sys.tar.bz2"
OOO_TARBALL=not-there-at-all
OOO_LANG_TARBALL=not-there-at-all
OOO_BINFILTER_TARBALL=not-there-at-all
@@ -324,7 +326,7 @@ OPENCLIPART_DIR=@OPENCLIPART_DIR@
MDBTOOLS_SRC=@MDBTOOLS_SRC@
SYSTEM_MDBTOOLS=@SYSTEM_MDBTOOLS@
-export LD_LIBRARY_PATH PATH CVSTAG APPLY_DIR
+export LD_LIBRARY_PATH PATH CVSTAG OOO_TAG APPLY_DIR
export CCACHE_DIR CCACHE_NOLINK CCACHE_UNIFY
export SRCDIR BUILDDIR OOBUILDDIR GITTAG
export BUILD_FLAGS VERSION TOOLSDIR VENDORNAME
diff --git a/configure.in b/configure.in
index e30ce36..4678dcb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,12 @@
-AC_INIT(ooo-build, 3.2.1.1)
+AC_INIT(ooo-build, 3.2.98.0)
AC_PREREQ(2.51)
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
-DEFAULT_TAG=ooo330-m4
+# ooo-build tag needed to get OOo sources from ooo-build git
+DEFAULT_TAG=ooo-build-3.2.98.0
+# ooo tag to get external sources from http://hg.services.openoffice.org
+DEFAULT_OOO_TAG=ooo330-m4
# For the upstream packages it is like:
# DEFAULT_TAG=OOO320_m1
@@ -24,36 +27,51 @@ AC_SUBST(PROPAGATED_ARGS)
AC_ARG_WITH(tag,
[
- --with-tag define the tag to use, defaults to the latest
- release
-
- Example: --with-tag=dev300-mXYZ],
+ --with-tag define the tag to use ooo sources from the
+ ooo-build git repos
+
+ Example: --with-tag=ooo-build-3.3.0.1],
+,)
+
+AC_ARG_WITH(ooo-tag,
+[
+ --with-ooo-tag define the tag to download external sources from
+ http://hg.services.openoffice.org
+
+ Example: --with-tag=dev300-mXYZ],
+,)
+
+AC_ARG_WITH(source-version,
+[
+ --with-source-version define another version for the ooo source tarballs
+
+ Example: --with-source-version=3.3.0.1.4],
,)
AC_ARG_WITH(split,
[
--with-split adapt to the new package split for the source
- code, rather than the older version.],
+ code, rather than the older version.],
,with_split=yes)
AC_ARG_WITH(piece,
[
--with-piece build only a piece of openoffice.
- bootstrapping goodness.
-
- Examples: --with-piece=bootstrap],
+ bootstrapping goodness.
+
+ Examples: --with-piece=bootstrap],
,)
AC_ARG_WITH(srcdir,
[
--with-srcdir define the directory where to download the source
- tarball and other extra sources.],
+ tarball and other extra sources.],
,)
AC_ARG_WITH(win32,
[
--with-win32 define the build to be on win32; this sets a number
- of defaults suitable for that platform.],
+ of defaults suitable for that platform.],
,)
AC_ARG_WITH(internal-gcc,
@@ -65,44 +83,44 @@ AC_ARG_WITH(internal-gcc,
AC_ARG_WITH(distro,
[
--with-distro build with a specific distributions patch-set. There
- is no default value, so you always have to select one.
-
- Examples: --with-distro=Ark
- --with-distro=Debian
- --with-distro=SUSE
-
- Hint: Run once without this option to get full list
- of available distributions ;-)],
+ is no default value, so you always have to select one.
+
+ Examples: --with-distro=Ark
+ --with-distro=Debian
+ --with-distro=SUSE
+
+ Hint: Run once without this option to get full list
+ of available distributions ;-)],
,)
AC_ARG_WITH(lang,
[
--with-lang define the localizations to build. The English one
- is built by default.
+ is built by default.
- Examples: --with-lang="en-US de fr it"
- --with-lang=ALL],
+ Examples: --with-lang="en-US de fr it"
+ --with-lang=ALL],
,)
AC_ARG_WITH(poor-help-localizations,
[
--with-poor-help-localizations
- define the localizations with so incomplete help
- that the English(US) one should be used instead.
+ define the localizations with so incomplete help
+ that the English(US) one should be used instead.
- Example: --with-poor-help-localizations="af ar ca"],
+ Example: --with-poor-help-localizations="af ar ca"],
,)
AC_ARG_WITH(additional-sections,
[
--with-additional-sections
- define list of additional sections that should be
- enabled in the apply file; It allows to easily
- enable experimental sets of patches that are not
- applied by default.
+ define list of additional sections that should be
+ enabled in the apply file; It allows to easily
+ enable experimental sets of patches that are not
+ applied by default.
- Example:
- --with-additional-sections="EMFPlus PostgreSQL"
+ Example:
+ --with-additional-sections="EMFPlus PostgreSQL"
],,)
AC_ARG_ENABLE(dbgutil,
@@ -143,7 +161,7 @@ AC_ARG_ENABLE(mono,
AC_ARG_ENABLE(graphite,
[ --enable-graphite Enables hyper-complex text rendering with
- graphite enabled fonts.
+ graphite enabled fonts.
],,)
AC_ARG_ENABLE(access,
@@ -183,67 +201,67 @@ AC_ARG_ENABLE(cairo,
AC_ARG_WITH(ooo-builddir,
[
--with-ooo-builddir define the directory where openoffice.org will be
- compiled, e.g. the root of an ooo cvs checkout.],
+ compiled, e.g. the root of an ooo cvs checkout.],
,)
AC_ARG_WITH(installed-ooo-dirname,
[
--with-installed-ooo-dirname
- specify the directory name of the core OOo network
- install dir, for example "openoffice" or "ooo-1.1",
- yielding a core install directory of
- /usr/lib/openoffice or /usr/lib/ooo-1.1.
+ specify the directory name of the core OOo network
+ install dir, for example "openoffice" or "ooo-1.1",
+ yielding a core install directory of
+ /usr/lib/openoffice or /usr/lib/ooo-1.1.
- Example: --with-installed-ooo-dirname=ooo-1.1],
+ Example: --with-installed-ooo-dirname=ooo-1.1],
,)
AC_ARG_WITH(binsuffix,
[
--with-binsuffix
- specify the suffix to be used on the end of script
- names, to allow parallel installation of two versions.
-
- Default: --with-binsuffix=2.0],
+ specify the suffix to be used on the end of script
+ names, to allow parallel installation of two versions.
+
+ Default: --with-binsuffix=2.0],
,)
AC_ARG_WITH(docdir,
[
--with-docdir define the directory name where the extra
- documentation will be installed.
+ documentation will be installed.
- Example: --with-docdir=/usr/share/doc/packages/OpenOffice.org],
+ Example: --with-docdir=/usr/share/doc/packages/OpenOffice.org],
,)
AC_ARG_WITH(num-cpus,
[
--with-num-cpus Number of build processes/cpus to use (number of
- projects that will build at the same time).
- Multi-process/multi-cpu builds can save a lot of time
- on multi-cpu machines.],
+ projects that will build at the same time).
+ Multi-process/multi-cpu builds can save a lot of time
+ on multi-cpu machines.],
,)
AC_ARG_WITH(gcc-speedup,
[
--with-gcc-speedup Tool to use to speedup the compilation. Currently
- ccache (caching results of previous compilation) and
- icecream (distributed compiling tool) are supported.
- Both can be used at the same time.
- You can also choose distcc instead of icecream.
+ ccache (caching results of previous compilation) and
+ icecream (distributed compiling tool) are supported.
+ Both can be used at the same time.
+ You can also choose distcc instead of icecream.
- Example: --with-gcc-speedup=ccache,icecream],
+ Example: --with-gcc-speedup=ccache,icecream],
,)
AC_ARG_WITH(icecream-bindir,
[
--with-icecream-bindir Location of icecream's gcc and g++.
- Defaults to /opt/icecream/bin.],
+ Defaults to /opt/icecream/bin.],
,)
AC_ARG_WITH(max-jobs,
[
--with-max-jobs
- Maximum number of jobs that make will issue at
- the same time. Defaults to 1.],
+ Maximum number of jobs that make will issue at
+ the same time. Defaults to 1.],
,)
AC_ARG_ENABLE(tests,
@@ -269,43 +287,43 @@ AC_ARG_ENABLE(kde4,
AC_ARG_ENABLE(strip,
[
--disable-strip
- Disables the stripping of installed binaries, so
- debugging symbols are not removed.],
+ Disables the stripping of installed binaries, so
+ debugging symbols are not removed.],
,)
AC_ARG_ENABLE(build-noarch,
[
--enable-build-noarch
- Allow to build some pieces in architecture
- independent RPMS (icon themes, help, l10n)],
+ Allow to build some pieces in architecture
+ independent RPMS (icon themes, help, l10n)],
,)
AC_ARG_ENABLE(split-app-modules,
[
--enable-split-app-modules
- Split file lists for app modules: base, calc, ...],
+ Split file lists for app modules: base, calc, ...],
,)
AC_ARG_ENABLE(split-opt-features,
[
--enable-split-opt-features
- Split file lists for some optional features:
- pyuno, testtool ...],
+ Split file lists for some optional features:
+ pyuno, testtool ...],
,)
AC_ARG_ENABLE(post-install-scripts,
[
--disable-post-install-scripts
- Disables post install scripts within make install.
- It is usefull when creating a package from the
- installed files. The scripts are then run by
- the package after it is installed.],
+ Disables post install scripts within make install.
+ It is usefull when creating a package from the
+ installed files. The scripts are then run by
+ the package after it is installed.],
,)
AC_ARG_ENABLE(defuzz-patches,
[
--enable-defuzz-patches
- Regenerate fuzzy patches.],
+ Regenerate fuzzy patches.],
,)
AC_ARG_WITH(arch,
@@ -318,7 +336,7 @@ AC_ARG_WITH(arch,
AC_ARG_WITH(arch-flags,
[
--with-arch-flags Define extra flags that will be passed to the
- C and C++ compiler during bild
+ C and C++ compiler during bild
Example: --with-arch-flags="-O2 -fmessage-length=0"],
,)
@@ -327,21 +345,21 @@ AC_ARG_WITH(mono-gac,
[
--with-mono-gac-root Define the root of the mono GAC. It is especially
needed if you are using $DESTDIR and want to
- preinstall the mono DLLs into the GAC.
-
- Example: --with-mono-gac=/usr/lib],
+ preinstall the mono DLLs into the GAC.
+
+ Example: --with-mono-gac=/usr/lib],
,)
AC_ARG_WITH(openclipart,
[
--with-openclipart Build and install OOo galleries from the Open Clip
- Art Library. The parameter is either a version of
- the library or an absolute path to the prebuilt and
- preinstalled .png files.
-
- Example: --with-openclipart=0.13
- --with-openclipart=/usr/share/openclipart],
+ Art Library. The parameter is either a version of
+ the library or an absolute path to the prebuilt and
+ preinstalled .png files.
+
+ Example: --with-openclipart=0.13
+ --with-openclipart=/usr/share/openclipart],
,)
@@ -387,26 +405,26 @@ AC_ARG_WITH(dejavu-fonts,
[
--with-dejavu-fonts Download and install updated DejaVu fonts. The parameter is
a version number.
-
- Example: --with-dejavu-fonts=2.32
- You should use this only if you want a newer version than
- that which upstream has.],
+ Example: --with-dejavu-fonts=2.32
+
+ You should use this only if you want a newer version than
+ that which upstream has.],
,)
AC_ARG_WITH(liberation-fonts,
[
--with-liberation-fonts
- Download and install updated Liberation Fonts. The parameter is
+ Download and install updated Liberation Fonts. The parameter is
a version number.
-
- Example: --with-liberation-fonts=1.1],
+
+ Example: --with-liberation-fonts=1.1],
,)
AC_ARG_WITH(lightproof,
[
--with-lightproof Download and integrate the Lightproof "grammar
- checker" extension.],
+ checker" extension.],
,)
AC_ARG_WITH(numbertext,
@@ -427,39 +445,39 @@ AC_ARG_WITH(typo,
AC_ARG_WITH(gnu-cp,
[
--with-gnu-cp The parameter is an absolute path to GNU cp.
-
- Example: --with-gnu-cp=/usr/local/bin/gcp],
+
+ Example: --with-gnu-cp=/usr/local/bin/gcp],
,)
AC_ARG_WITH(gnu-patch,
[
--with-gnu-patch The parameter is an absolute path to GNU patch.
-
- Example: --with-gnu-cp=/usr/local/bin/gpatch],
+
+ Example: --with-gnu-cp=/usr/local/bin/gpatch],
,)
AC_ARG_WITH(gnu-tar,
[
--with-gnu-tar The parameter is an absolute path to GNU tar.
-
- Example: --with-gnu-cp=/usr/local/bin/gtar],
+
+ Example: --with-gnu-cp=/usr/local/bin/gtar],
,)
AC_ARG_WITH(drink,
[
--with-drink The parameter is a favourite drink that unpack
- should advise you to take.
-
- Example: --with-drink=coffee],
+ should advise you to take.
+
+ Example: --with-drink=coffee],
,)
AC_ARG_WITH(git,
[
--with-git Use git to get the up-stream sources instead of
- downloading and unpacking the tarballs.
-
- Recommended for developers, but not for package
- maintainers.],
+ downloading and unpacking the tarballs.
+
+ Recommended for developers, but not for package
+ maintainers.],
,)
AC_ARG_WITH(git-managed,
[
@@ -468,7 +486,7 @@ AC_ARG_WITH(git-managed,
dnl
dnl Items here only to make --help work nicely:
-dnl
+dnl
AC_ARG_ENABLE(java,
[
--with-java build ooo with a Jdk & Java support],
@@ -479,15 +497,15 @@ dnl
AC_ARG_WITH(mirror,
[
--with-mirror Specify a mirror of the go-ooo.org packages
- directory.
-
- Example: --with-mirror=http://foo.bar.baz/mirror
+ directory.
+
+ Example: --with-mirror=http://foo.bar.baz/mirror
- If you want to setup your own mirror, just add
- something like the following to your cron:
+ If you want to setup your own mirror, just add
+ something like the following to your cron:
- rsync -azq --delete --partial go-oo.org::packages \\
- /some/directory/where/you/want/],
+ rsync -azq --delete --partial go-oo.org::packages \\
+ /some/directory/where/you/want/],
,)
AM_MAINTAINER_MODE
@@ -498,7 +516,7 @@ dnl
BASEDIR=$PWD
TOOLSDIR=$BASEDIR
-# it will be modified by the --with-additional-sections but it might
+# it will be modified by the --with-additional-sections but it might
# modified also by other options
OOO_ADDITIONAL_SECTIONS=
@@ -519,9 +537,9 @@ if test ! -x "$PKG_CONFIG" ; then
fi
AC_SUBST(PKG_CONFIG)
-PKG_CHECK_MODULES( FOO_COMMON,
- [ libxml-2.0 fontconfig >= 1.0.1 ],
- have_common=true, have_common=false )
+PKG_CHECK_MODULES( FOO_COMMON,
+ [ libxml-2.0 fontconfig >= 1.0.1 ],
+ have_common=true, have_common=false )
# NB. according to:
# http://sources.redhat.com/ml/bug-automake/2002/msg02066.html
@@ -535,12 +553,12 @@ if test "z`uname -s`" != "zSunOS" -a "z$with_win32" = "z" -a \( "z`uname -o 2>/d
fi
if test "z$with_win32" = "z"; then
if test ! $have_common; then
- AC_MSG_ERROR([Library requirements were not met])
+ AC_MSG_ERROR([Library requirements were not met])
fi
BUILD_WIN32=
else
if test "z$with_distro" = "z"; then
- with_distro="Win32"
+ with_distro="Win32"
fi
BUILD_WIN32=yes
@@ -560,7 +578,7 @@ else
GREP=grep
fi
-if echo "$with_tag" | $GREP -E ['^(dev300|ooo320|OOO320|ooo330|OOO330)'] >/dev/null 2>/dev/null ; then
+if echo "$with_tag" | $GREP -E ['^(ooo-build-3.|dev300|ooo320|OOO320|ooo330|OOO330)'] >/dev/null 2>/dev/null ; then
APPLY_DIR="$TOOLSDIR/patches/dev300"
else
APPLY_DIR="$TOOLSDIR/patches/$with_tag"
@@ -583,6 +601,23 @@ CVSTAG=$with_tag
AC_SUBST(CVSTAG)
AC_SUBST(APPLY_DIR)
+# tag for the external sources from http://hg.services.openoffice.org
+if test "z$with_ooo_tag" = "z"; then
+ OOO_TAG="$DEFAULT_OOO_TAG"
+else
+ OOO_TAG="$with_ooo_tag"
+fi
+AC_SUBST(OOO_TAG)
+
+# piece source version
+if test "z$with_source_version" = "z"; then
+ # FIXME: do we want to guess it from the tag, e.g. 3.3.0.1 from OOO_BUILD_3_3_0_1?
+ OOO_SOURCEVERSION="$OOO_BUILDVERSION"
+else
+ OOO_SOURCEVERSION="$with_source_version"
+fi
+AC_SUBST(OOO_SOURCEVERSION)
+
AC_MSG_CHECKING( for master workspace name )
MWS=`echo ${CVSTAG%[[-_]]*} | tr [[:lower:]] [[:upper:]]`
AC_MSG_RESULT([$MWS])
@@ -601,7 +636,7 @@ AC_SUBST(PIECE)
# FIXME: We currently do not support starting build with already unpackaged
# sources, so the following warning is always printed
-warn_use_download=" ./download
+warn_use_download=" ./download
"
AC_MSG_CHECKING( for directory where to download sources )
if test "z$with_srcdir" = "z"; then
@@ -623,10 +658,10 @@ fi
if test "z`uname -s`" != "zSunOS" -a "z$with_win32" != "z" -a "z`uname -o 2>/dev/null`" = "zCygwin" ; then
AC_MSG_CHECKING([that we use /cygdrive paths])
case "$OOBUILDDIR" in
- /cygdrive/*)
- ;;
- *) AC_MSG_ERROR([You must use /cygdrive/... style paths, not Cygwin mounts])
- ;;
+ /cygdrive/*)
+ ;;
+ *) AC_MSG_ERROR([You must use /cygdrive/... style paths, not Cygwin mounts])
+ ;;
esac
AC_MSG_RESULT([yes])
fi
@@ -634,10 +669,10 @@ fi
if test "z`uname -s`" = "zInterix" ; then
AC_MSG_CHECKING([that we can use /cygdrive paths])
case "$OOBUILDDIR" in
- /cygdrive/*)
- ;;
- *) AC_MSG_ERROR([You must set up symlinks in /cygdrive on Interix.])
- ;;
+ /cygdrive/*)
+ ;;
+ *) AC_MSG_ERROR([You must set up symlinks in /cygdrive on Interix.])
+ ;;
esac
AC_MSG_RESULT([yes])
fi
@@ -660,17 +695,17 @@ fi
AC_MSG_CHECKING([for distribution name])
case "$with_distro" in
""|"yes"|"no") distros_list=`ls distro-configs/*.conf.in | sort | sed -e "s|distro-configs/\(.*\).conf.in|\t\1|g"`
- AC_MSG_ERROR([A distribution must be selected by the option --with-distro. You can choose one from:
+ AC_MSG_ERROR([A distribution must be selected by the option --with-distro. You can choose one from:
$distros_list])
- ;;
+ ;;
NLD) DISTRO="SUSE"
- ;;
+ ;;
NLD*) distro_version="${with_distro#NLD}"
- distro_version="${distro_version#-}" # remove optional '-'
- DISTRO="SUSE-$distro_version.1"
- ;;
+ distro_version="${distro_version#-}" # remove optional '-'
+ DISTRO="SUSE-$distro_version.1"
+ ;;
*) DISTRO="$with_distro"
- ;;
+ ;;
esac
AC_MSG_RESULT([$DISTRO])
AC_SUBST(DISTRO)
@@ -694,7 +729,7 @@ case $DISTRO in
PLD*) VENDORNAME="PLD" ;;
OxygenOffice*) VENDORNAME="OxygenOffice" ;;
FSFhu*) VENDORNAME="FSFhu" ;;
- OOo4Kids*) VENDORNAME="EducOOo" ;;
+ OOo4Kids*) VENDORNAME="EducOOo" ;;
*) AC_MSG_WARN([Cannot guess vendor from distro - please add it to configure.in]) ;;
esac
AC_MSG_RESULT([$VENDORNAME])
@@ -713,14 +748,14 @@ AC_CHECK_HEADER(zlib.h, have_zlib=true, have_zlib=false)
if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
if test "z$enable_pam" != "zno" && ! $have_pam; then
- AC_MSG_ERROR(install pam-devel)
+ AC_MSG_ERROR(install pam-devel)
fi
if ! $have_png; then
- AC_MSG_ERROR(install png-devel)
+ AC_MSG_ERROR(install png-devel)
fi
if ! $have_zlib; then
- AC_MSG_ERROR(install zlib-devel)
+ AC_MSG_ERROR(install zlib-devel)
fi
fi
@@ -770,7 +805,7 @@ do
if test "$CCACHE" != "yes"; then
AC_MSG_ERROR([ccache not found, but set in --with-gcc-speedup])
else
- ENABLE_CCACHE="yes"
+ ENABLE_CCACHE="yes"
fi
elif test "$enable_speedup" = "icecream"; then
ENABLE_ICECREAM="yes"
@@ -778,7 +813,7 @@ do
if test "$DISTCC" != "yes"; then
AC_MSG_ERROR([distcc not found, but set in --with-gcc-speedup])
else
- ENABLE_DISTCC="yes"
+ ENABLE_DISTCC="yes"
fi
fi
done
@@ -879,7 +914,7 @@ if test "z$BUILD_WIN32" = "zyes" -a "z$enable_cairo" = "z" ; then
fi
if test "$enable_cairo" != "no"; then
if test "$with_system_cairo" = "yes"; then
- SYSTEM_CAIRO=TRUE
+ SYSTEM_CAIRO=TRUE
fi
CAIRO_ENABLED=TRUE
# Use the latest version
@@ -988,25 +1023,25 @@ OPENCLIPART_VER=
OPENCLIPART_DIR=
if test "z$with_openclipart" != "z" -a "z$with_openclipart" != "zno" ; then
if test "z$with_openclipart" = "zyes" ; then
- # the gallery from the source tarball by default
- OPENCLIPART_VER=0.12
+ # the gallery from the source tarball by default
+ OPENCLIPART_VER=0.12
elif (echo "$with_openclipart" | $GREP "^[[0-9\.]]*$") ; then
- # it's a version number
- OPENCLIPART_VER=$with_openclipart
+ # it's a version number
+ OPENCLIPART_VER=$with_openclipart
elif test "z${with_openclipart%%/*}" = "z" ; then
- # it's an absolute path
- if test -d $with_openclipart ; then
- OPENCLIPART_DIR=$with_openclipart
- else
- AC_MSG_ERROR([The directory \"$with_openclipart\" does not exist.])
- fi
+ # it's an absolute path
+ if test -d $with_openclipart ; then
+ OPENCLIPART_DIR=$with_openclipart
+ else
+ AC_MSG_ERROR([The directory \"$with_openclipart\" does not exist.])
+ fi
else
- AC_MSG_ERROR([--with-openclipart requires either a version number or an absolute path])
+ AC_MSG_ERROR([--with-openclipart requires either a version number or an absolute path])
fi
fi
if test "z$OPENCLIPART_VER" != "z" && ! which inkscape >/dev/null 2>&1 ; then
AC_MSG_ERROR([inkscape is necessary to process Open Clip Art library from sources])
-fi
+fi
AC_MSG_RESULT([${OPENCLIPART_VER:-${OPENCLIPART_DIR:-no}}])
AC_SUBST(OPENCLIPART_VER)
AC_SUBST(OPENCLIPART_DIR)
@@ -1017,18 +1052,18 @@ DEJAVU_FONTS_VER=
DEJAVU_FONTS_PACK_NAME=
if test "z$with_dejavu_fonts" != "z" -a "z$with_dejavu_fonts" != "zno" ; then
if (echo "$with_dejavu_fonts" | $GREP "^[[0-9]]*\.[[0-9]]*$" >/dev/null) ; then
- # it's a version number
- DEJAVU_FONTS_VER=$with_dejavu_fonts
- DEJAVU_FONTS_PACK_NAME=dejavu-fonts-ttf-$with_dejavu_fonts
- DEJAVU_FONTS_MAJOR_VER=${DEJAVU_FONTS_VER%.*}
- DEJAVU_FONTS_MINOR_VER=${DEJAVU_FONTS_VER#*.}
- if test $DEJAVU_FONTS_MAJOR_VER -lt $DEJAVU_FONTS_UPSTREAM_MAJOR_VER -o \
- \( $DEJAVU_FONTS_MAJOR_VER -eq $DEJAVU_FONTS_UPSTREAM_MAJOR_VER -a \
- $DEJAVU_FONTS_MINOR_VER -le $DEJAVU_FONTS_UPSTREAM_MINOR_VER \) ; then
- AC_MSG_ERROR([requested DejaVu font version should be newer than what upstream has])
- fi
+ # it's a version number
+ DEJAVU_FONTS_VER=$with_dejavu_fonts
+ DEJAVU_FONTS_PACK_NAME=dejavu-fonts-ttf-$with_dejavu_fonts
+ DEJAVU_FONTS_MAJOR_VER=${DEJAVU_FONTS_VER%.*}
+ DEJAVU_FONTS_MINOR_VER=${DEJAVU_FONTS_VER#*.}
+ if test $DEJAVU_FONTS_MAJOR_VER -lt $DEJAVU_FONTS_UPSTREAM_MAJOR_VER -o \
+ \( $DEJAVU_FONTS_MAJOR_VER -eq $DEJAVU_FONTS_UPSTREAM_MAJOR_VER -a \
+ $DEJAVU_FONTS_MINOR_VER -le $DEJAVU_FONTS_UPSTREAM_MINOR_VER \) ; then
+ AC_MSG_ERROR([requested DejaVu font version should be newer than what upstream has])
+ fi
else
- AC_MSG_ERROR([--with-dejavu-fonts requires a version number])
+ AC_MSG_ERROR([--with-dejavu-fonts requires a version number])
fi
fi
AC_MSG_RESULT([${DEJAVU_FONTS_VER:-no, use those in upstream}])
@@ -1040,13 +1075,13 @@ AC_MSG_CHECKING([for Liberation Fonts])
LIBERATION_FONTS_VER=
if test "z$with_liberation_fonts" != "z" -a "z$with_liberation_fonts" != "zno" ; then
if test "z$with_liberation_fonts" = "zyes" ; then
- # the fonts from the source zip by default
- LIBERATION_FONTS_VER=1.1
+ # the fonts from the source zip by default
+ LIBERATION_FONTS_VER=1.1
elif (echo "$with_liberation_fonts" | $GREP "^[[0-9\.]]*$") ; then
- # it's a version number
- LIBERATION_FONTS_VER=$with_liberation_fonts
+ # it's a version number
+ LIBERATION_FONTS_VER=$with_liberation_fonts
else
- AC_MSG_ERROR([--with-liberation-fonts requires either yes, no, or a version number])
+ AC_MSG_ERROR([--with-liberation-fonts requires either yes, no, or a version number])
fi
fi
AC_MSG_RESULT([${LIBERATION_FONTS_VER:-as upstream}])
@@ -1061,14 +1096,14 @@ else
fi
if test "z$with_gnu_cp" != "z"; then
if test "z${with_gnu_cp%%/*}" = "z" ; then
- # it's an absolute path
- if test -f $with_gnu_cp ; then
- GNUCP=$with_gnu_cp
- else
- AC_MSG_ERROR([The file \"$with_gnu_cp\" does not exist.])
- fi
+ # it's an absolute path
+ if test -f $with_gnu_cp ; then
+ GNUCP=$with_gnu_cp
+ else
+ AC_MSG_ERROR([The file \"$with_gnu_cp\" does not exist.])
+ fi
else
- AC_MSG_ERROR([--with-gnu-cp requires an absolute path])
+ AC_MSG_ERROR([--with-gnu-cp requires an absolute path])
fi
fi
AC_MSG_RESULT([$GNUCP])
@@ -1078,14 +1113,14 @@ AC_MSG_CHECKING([for GNU patch])
GNUPATCH=patch
if test "z$with_gnu_patch" != "z"; then
if test "z${with_gnu_patch%%/*}" = "z" ; then
- # it's an absolute path
- if test -f $with_gnu_patch ; then
- GNUPATCH=$with_gnu_patch
- else
- AC_MSG_ERROR([The file \"$with_gnu_patch\" does not exist.])
- fi
+ # it's an absolute path
+ if test -f $with_gnu_patch ; then
+ GNUPATCH=$with_gnu_patch
+ else
+ AC_MSG_ERROR([The file \"$with_gnu_patch\" does not exist.])
+ fi
else
- AC_MSG_ERROR([--with-gnu-patch requires an absolute path])
+ AC_MSG_ERROR([--with-gnu-patch requires an absolute path])
fi
fi
AC_MSG_RESULT([$GNUPATCH])
@@ -1097,15 +1132,15 @@ if test "z$with_gnu_tar" != "z"; then
if test "z${with_gnu_tar%%/*}" = "z" ; then
# it's an absolute path
if test -f $with_gnu_tar ; then
- GNUTAR=$with_gnu_tar
+ GNUTAR=$with_gnu_tar
else
- AC_MSG_ERROR([The file \"$with_gnu_tar\" does not exist.])
+ AC_MSG_ERROR([The file \"$with_gnu_tar\" does not exist.])
fi
else
AC_MSG_ERROR([--with-gnu-tar requires an absolute path])
fi
elif test -f /usr/sfw/bin/gtar; then
- GNUTAR="/usr/sfw/bin/gtar"
+ GNUTAR="/usr/sfw/bin/gtar"
fi
AC_MSG_RESULT([$GNUTAR])
AC_SUBST(GNUTAR)
@@ -1195,11 +1230,11 @@ AC_SUBST(OOO_POOR_HELP_LOCALIZATIONS)
AC_MSG_CHECKING([whether to enable Mono bindings])
if test -n "$enable_mono" ; then
if test "$enable_mono" != "no" ; then
- ENABLE_MONO=TRUE
- mono_enabled=yes
+ ENABLE_MONO=TRUE
+ mono_enabled=yes
else
- ENABLE_MONO=FALSE
- mono_enabled=no
+ ENABLE_MONO=FALSE
+ mono_enabled=no
fi
else
# mono is not explicitly requested. Though, ooo-build will install
@@ -1223,23 +1258,23 @@ AC_SUBST(ENABLE_EXTENSIONS)
# FIXME: ugly hack to apply a Linux and Win32 specific variants of a patch for swext sources
if test "$ENABLE_EXTENSIONS" = "YES" ; then
if test "$BUILD_WIN32" = "yes" -o "$with_distro" = "CrossWin32"; then
- ext_section=Win32OnlyExtensionFixes
+ ext_section=Win32OnlyExtensionFixes
else
- ext_section=Linux32OnlyExtensionFixes
+ ext_section=Linux32OnlyExtensionFixes
fi
if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
- OOO_ADDITIONAL_SECTIONS="$ext_section"
+ OOO_ADDITIONAL_SECTIONS="$ext_section"
else
- OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,$ext_section"
+ OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,$ext_section"
fi
fi
# FIXME: ugly hack to apply a Novell specific patch for swext sources
if test "$VENDORNAME" = "Novell" -a "$ENABLE_MEDIAWIKI" = "YES" ; then
if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
- OOO_ADDITIONAL_SECTIONS="NovellOnlyExtensionFixes"
+ OOO_ADDITIONAL_SECTIONS="NovellOnlyExtensionFixes"
else
- OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,NovellOnlyExtensionFixes"
+ OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,NovellOnlyExtensionFixes"
fi
fi
@@ -1327,9 +1362,9 @@ if test -n "$with_system_libwpd" && test "$with_system_libwpd" = "yes"; then
else
SYSTEM_LIBWPD=NO
if test "$UNSTABLE_WP" = "YES"; then
- LIBWPD_TARBALL=32c8599f6f4cbb420e485288f74b398a-libwpd-0.9.0~CVS20081118.tar.gz
+ LIBWPD_TARBALL=32c8599f6f4cbb420e485288f74b398a-libwpd-0.9.0~CVS20081118.tar.gz
else
- LIBWPD_TARBALL=64d66018897d759358f454010b6e75d2-libwpd-0.8.14.tar.gz
+ LIBWPD_TARBALL=64d66018897d759358f454010b6e75d2-libwpd-0.8.14.tar.gz
fi
fi
AC_SUBST(SYSTEM_LIBWPD)
@@ -1340,9 +1375,9 @@ if test -n "$with_system_libwps" && test "$with_system_libwps" = "yes"; then
else
SYSTEM_LIBWPS=NO
if test "$UNSTABLE_WP" = "YES"; then
- LIBWPS_TARBALL=3c77ef8cb348ab6f98ebf53961cc59ea-libwps-0.2.0~CVS20081118.tar.gz
+ LIBWPS_TARBALL=3c77ef8cb348ab6f98ebf53961cc59ea-libwps-0.2.0~CVS20081118.tar.gz
else
- LIBWPS_TARBALL=799fc3b835a79adce8c88a3fee0150c1-libwps-0.1.2.tar.gz
+ LIBWPS_TARBALL=799fc3b835a79adce8c88a3fee0150c1-libwps-0.1.2.tar.gz
fi
fi
AC_SUBST(SYSTEM_LIBWPS)
@@ -1353,9 +1388,9 @@ if test "$with_system_libwpg" = "yes"; then
else
SYSTEM_LIBWPG=NO
if test "$UNSTABLE_WP" = "YES"; then
- LIBWPG_TARBALL=6f0defec3c4342c0f3e1a1fe50f3f5f9-libwpg-0.2.0~CVS20081118.tar.gz
+ LIBWPG_TARBALL=6f0defec3c4342c0f3e1a1fe50f3f5f9-libwpg-0.2.0~CVS20081118.tar.gz
else
- LIBWPG_TARBALL=db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz
+ LIBWPG_TARBALL=db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz
fi
fi
AC_SUBST(SYSTEM_LIBWPG)
@@ -1366,7 +1401,7 @@ if test "$with_system_zlib" = "yes"; then
SYSTEM_ZLIB=YES
else
SYSTEM_ZLIB=NO
- ZLIB_TARBALL=debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
+ ZLIB_TARBALL=debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
fi
AC_SUBST(SYSTEM_ZLIB)
AC_SUBST(ZLIB_TARBALL)
@@ -1379,22 +1414,22 @@ if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
else
sun_supported_langs="en-US de it fr es hu"
if test "z$with_sun_templates" = "zyes" ; then
- wanted_sun_templates="$sun_supported_langs"
+ wanted_sun_templates="$sun_supported_langs"
else
- # check whether the langs are supported by Sun
- wanted_sun_templates=
- for lang in $with_sun_templates ; do
- if test -n "`echo $sun_supported_langs | grep "$lang"`" ; then
- wanted_sun_templates="$wanted_sun_templates $lang"
- fi
- done
+ # check whether the langs are supported by Sun
+ wanted_sun_templates=
+ for lang in $with_sun_templates ; do
+ if test -n "`echo $sun_supported_langs | grep "$lang"`" ; then
+ wanted_sun_templates="$wanted_sun_templates $lang"
+ fi
+ done
fi
SUNTEMPLATES_LANG=
# check whether the langs are requested at all
for lang in $wanted_sun_templates ; do
- if test -n "`echo $with_lang | grep "$lang"`" ; then
- SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
- fi
+ if test -n "`echo $with_lang | grep "$lang"`" ; then
+ SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+ fi
done
AC_MSG_RESULT([$SUNTEMPLATES_LANG])
fi
@@ -1403,8 +1438,8 @@ AC_SUBST(SUNTEMPLATES_LANG)
AC_MSG_CHECKING([whether to include ConvertTextToNumber extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_ct2n" = "zyes" ; then
- CT2N_EXTENSION="ConvertTextToNumber-1.3.2.oxt"
- WITH_CT2N=YES
+ CT2N_EXTENSION="ConvertTextToNumber-1.3.2.oxt"
+ WITH_CT2N=YES
AC_MSG_RESULT([yes])
else
WITH_CT2N=NO
@@ -1417,8 +1452,8 @@ AC_SUBST(CT2N_EXTENSION)
AC_MSG_CHECKING([whether to include Watch Window extension for Calc])
if test "$enable_extensions" != "no" ; then
if test "z$with_watch_window" = "zyes" ; then
- WATCH_WINDOW_EXTENSION="WatchWindow_1.1.2.1.oxt"
- WITH_WATCH_WINDOW=YES
+ WATCH_WINDOW_EXTENSION="WatchWindow_1.1.2.1.oxt"
+ WITH_WATCH_WINDOW=YES
AC_MSG_RESULT([yes])
else
WITH_WATCH_WINDOW=NO
@@ -1431,8 +1466,8 @@ AC_SUBST(WATCH_WINDOW_EXTENSION)
AC_MSG_CHECKING([whether to include Google Docs extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_google_docs" = "zyes" ; then
- GOOGLE_DOCS_EXTENSION="gdocs_2.1.0_modified.oxt"
- WITH_GOOGLE_DOCS=YES
+ GOOGLE_DOCS_EXTENSION="gdocs_2.1.0_modified.oxt"
+ WITH_GOOGLE_DOCS=YES
AC_MSG_RESULT([yes])
else
WITH_GOOGLE_DOCS=NO
@@ -1445,8 +1480,8 @@ AC_SUBST(GOOGLE_DOCS_EXTENSION)
AC_MSG_CHECKING([whether to include NLPSolver extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_nlpsolver" = "zyes" ; then
- NLPSOLVER_EXTENSION="90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
- WITH_NLPSOLVER=YES
+ NLPSOLVER_EXTENSION="90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
+ WITH_NLPSOLVER=YES
AC_MSG_RESULT([yes])
else
WITH_NLPSOLVER=NO
@@ -1459,8 +1494,8 @@ AC_SUBST(NLPSOLVER_EXTENSION)
AC_MSG_CHECKING([whether to include LanguageTool extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_languagetool" = "zyes" ; then
- LANGUAGETOOL_EXTENSION="47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
- WITH_LANGUAGETOOL=YES
+ LANGUAGETOOL_EXTENSION="47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
+ WITH_LANGUAGETOOL=YES
AC_MSG_RESULT([yes])
else
WITH_LANGUAGETOOL=NO
@@ -1473,8 +1508,8 @@ AC_SUBST(LANGUAGETOOL_EXTENSION)
AC_MSG_CHECKING([whether to include oooblogger extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_oooblogger" = "zyes" ; then
- OOOBLOGGER_EXTENSION="oooblogger-0.1.oxt"
- WITH_OOOBLOGGER=YES
+ OOOBLOGGER_EXTENSION="oooblogger-0.1.oxt"
+ WITH_OOOBLOGGER=YES
AC_MSG_RESULT([yes])
else
WITH_OOOBLOGGER=NO
@@ -1486,38 +1521,38 @@ AC_SUBST(OOOBLOGGER_EXTENSION)
AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)])
if test "$enable_extensions" != "no" ; then
- if test "z$with_lightproof" = "z" -o "z$with_lightproof" = "zno" ; then
- LIGHTPROOF_LANG=""
- LIGHTPRROF_FILENAMES=""
- AC_MSG_RESULT([no integration])
- else
- lightproof_supported_langs="en-US hu"
- if test "z$with_lightproof" = "zyes" ; then
- wanted_lightproof="$lightproof_supported_langs"
- else
- # check whether the langs are supported by Lightproof
- wanted_lightproof=
- for lang in $with_lightproof ; do
- if test -n "`echo $lightproof_supported_langs | grep "$lang"`" ; then
- wanted_lightproof="$wanted_lightproof $lang"
- fi
- done
- fi
- LIGHTPROOF_LANG=
- LIGHTPROOF_FILENAMES=
- # check whether the langs are requested at all
- for lang in $wanted_lightproof ; do
- if test -n "`echo $with_lang | grep "$lang"`" ; then
- LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
- case $lang in
- "hu") LIGHTPROOF_FILENAMES="$LIGHTPROOF_FILENAMES lightproof-hu-1.2.oxt";;
- "en-US") LIGHTPROOF_FILENAMES="$LIGHTPROOF_FILENAMES lightproof-en-US-0.1.oxt";;
- esac
- fi
- done
- AC_MSG_RESULT([$LIGHTPROOF_LANG])
- AC_MSG_RESULT([$LIGHTPROOF_FILENAMES])
- fi
+ if test "z$with_lightproof" = "z" -o "z$with_lightproof" = "zno" ; then
+ LIGHTPROOF_LANG=""
+ LIGHTPRROF_FILENAMES=""
+ AC_MSG_RESULT([no integration])
+ else
+ lightproof_supported_langs="en-US hu"
+ if test "z$with_lightproof" = "zyes" ; then
+ wanted_lightproof="$lightproof_supported_langs"
+ else
+ # check whether the langs are supported by Lightproof
+ wanted_lightproof=
+ for lang in $with_lightproof ; do
+ if test -n "`echo $lightproof_supported_langs | grep "$lang"`" ; then
+ wanted_lightproof="$wanted_lightproof $lang"
+ fi
+ done
+ fi
+ LIGHTPROOF_LANG=
+ LIGHTPROOF_FILENAMES=
+ # check whether the langs are requested at all
+ for lang in $wanted_lightproof ; do
+ if test -n "`echo $with_lang | grep "$lang"`" ; then
+ LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
+ case $lang in
+ "hu") LIGHTPROOF_FILENAMES="$LIGHTPROOF_FILENAMES lightproof-hu-1.2.oxt";;
+ "en-US") LIGHTPROOF_FILENAMES="$LIGHTPROOF_FILENAMES lightproof-en-US-0.1.oxt";;
+ esac
+ fi
+ done
+ AC_MSG_RESULT([$LIGHTPROOF_LANG])
+ AC_MSG_RESULT([$LIGHTPROOF_FILENAMES])
+ fi
fi
AC_SUBST(LIGHTPROOF_LANG)
AC_SUBST(LIGHTPROOF_FILENAMES)
@@ -1525,8 +1560,8 @@ AC_SUBST(LIGHTPROOF_FILENAMES)
AC_MSG_CHECKING([whether to include numbertext extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_numbertext" = "zyes" ; then
- NUMBERTEXT_EXTENSION="numbertext-0.9.2.oxt"
- WITH_NUMBERTEXT=YES
+ NUMBERTEXT_EXTENSION="numbertext-0.9.2.oxt"
+ WITH_NUMBERTEXT=YES
AC_MSG_RESULT([yes])
else
WITH_NUMBERTEXT=NO
@@ -1539,8 +1574,8 @@ AC_SUBST(NUMBERTEXT_EXTENSION)
AC_MSG_CHECKING([whether to include hunart extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_hunart" = "zyes" ; then
- HUNART_EXTENSION="hunart-0.3.oxt"
- WITH_HUNART=YES
+ HUNART_EXTENSION="hunart-0.3.oxt"
+ WITH_HUNART=YES
AC_MSG_RESULT([yes])
else
WITH_HUNART=NO
@@ -1553,8 +1588,8 @@ AC_SUBST(HUNART_EXTENSION)
AC_MSG_CHECKING([whether to include typo extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_typo" = "zyes" ; then
- TYPO_EXTENSION="typo-0.3.oxt"
- WITH_TYPO=YES
+ TYPO_EXTENSION="typo-0.3.oxt"
+ WITH_TYPO=YES
AC_MSG_RESULT([yes])
else
WITH_TYPO=NO
@@ -1617,6 +1652,7 @@ fi
AC_SUBST(OOO_GIT_MANAGED)
SOURCE_TYPE="CGIT"
+
UPSTREAM_NAME=
UPSTREAM_URI=
if test "$with_tag" = "OOG680_m5" ; then # more milestones to come...
@@ -1664,19 +1700,19 @@ if test "z$with_mirror" != "z" ; then
fi
AC_SUBST(MIRROR)
-# IMPORTANT: keep this on the end of configure because other configure options might
+# IMPORTANT: keep this on the end of configure because other configure options might
# add some own OOO_ADDITIONAL_SECTIONS
AC_MSG_CHECKING([for additional sections])
if test -n "$with_additional_sections" -a \
- "$with_additional_sections" != "no" -a \
- "$with_additional_sections" != "yes" ; then
+ "$with_additional_sections" != "no" -a \
+ "$with_additional_sections" != "yes" ; then
# change the delimiter from the space to the comma
for section in $with_additional_sections ; do
- if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
- OOO_ADDITIONAL_SECTIONS="$section"
- else
- OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,$section"
- fi
+ if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
+ OOO_ADDITIONAL_SECTIONS="$section"
+ else
+ OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,$section"
+ fi
done
fi
AC_MSG_RESULT([$OOO_ADDITIONAL_SECTIONS])
@@ -1686,7 +1722,7 @@ AC_SUBST(OOO_ADDITIONAL_SECTIONS)
AC_CONFIG_FILES([download], [chmod +x download])
AC_CONFIG_FILES([scratch/place], [chmod +x scratch/place])
AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update], [chmod +x intltool*])
-AC_OUTPUT([
+AC_OUTPUT([
Makefile
bin/setup
bin/Makefile
@@ -1821,13 +1857,13 @@ else
fi
if test "$OOO_GIT" = "" ; then
if test "$SOURCE_TYPE" = "UPSTREAM" ; then
- upstream_sources="download tarballs from '$UPSTREAM_URI'"
+ upstream_sources="download tarballs from '$UPSTREAM_URI'"
elif test "$SOURCE_TYPE" = "CGIT" ; then
- upstream_sources="download tarballs from 'http://cgit.freedesktop.org'"
+ upstream_sources="download tarballs from 'http://cgit.freedesktop.org'"
elif test "$SOURCE_TYPE" = "DOWNLOAD" ; then
- upstream_sources="download tarballs from go-oo.org"
+ upstream_sources="download tarballs from go-oo.org"
else
- upstream_sources="download tarballs from '$MIRROR'"
+ upstream_sources="download tarballs from '$MIRROR'"
fi
else
upstream_sources="use git, clone/fetch from '$OOO_GIT'"
@@ -1835,50 +1871,50 @@ fi
echo "
Building openoffice
- tag: $CVSTAG
- apply rules: $APPLY_DIR/apply
- build dir: $OOBUILDDIR
- tools dir: $TOOLSDIR
- src package dir: $SRCDIR
- distro: $DISTRO
- add sections: ${OOO_ADDITIONAL_SECTIONS:-no}
- widget sets: ${widget_sets:-disabled}
- gcc to use: $gcc_to_use
- openclipart: ${OPENCLIPART_VER:-${OPENCLIPART_DIR:-no}}
- mono bindings: $mono_enabled
- mdbtools/access: $access_enabled
- java: ${with_java:-yes}
- ooo-install-dir: $OOOINSTALLDIRNAME
- ccache: $ccache_message
- icecream: $icecream_message
- distcc: $distcc_message
- max jobs: $max_job_message
- cairo: $cairo_enabled
- build type: $build_product build
- up-stream sources: $upstream_sources
+ tag: $CVSTAG
+ apply rules: $APPLY_DIR/apply
+ build dir: $OOBUILDDIR
+ tools dir: $TOOLSDIR
+ src package dir: $SRCDIR
+ distro: $DISTRO
+ add sections: ${OOO_ADDITIONAL_SECTIONS:-no}
+ widget sets: ${widget_sets:-disabled}
+ gcc to use: $gcc_to_use
+ openclipart: ${OPENCLIPART_VER:-${OPENCLIPART_DIR:-no}}
+ mono bindings: $mono_enabled
+ mdbtools/access: $access_enabled
+ java: ${with_java:-yes}
+ ooo-install-dir: $OOOINSTALLDIRNAME
+ ccache: $ccache_message
+ icecream: $icecream_message
+ distcc: $distcc_message
+ max jobs: $max_job_message
+ cairo: $cairo_enabled
+ build type: $build_product build
+ up-stream sources: $upstream_sources
To build run:
-$warn_use_download make
- bin/ooinstall <path-to-install>
+$warn_use_download make
+ bin/ooinstall <path-to-install>
- This is 'master' - the main, but unstable branch.
+ This is 'master' - the main, but unstable branch.
- If you want to build the stable OOo, use:
- ooo-build-2-4 branch for 2.4
- ooo-build-3-1-1 branch for 3.1.1
- ooo-build-3-2 branch for 3.2
- ooo-build-3-2-1 branch for 3.2.1
+ If you want to build the stable OOo, use:
+ ooo-build-2-4 branch for 2.4
+ ooo-build-3-1-1 branch for 3.1.1
+ ooo-build-3-2 branch for 3.2
+ ooo-build-3-2-1 branch for 3.2.1
"
if test "$BUILD_WIN32" != "yes" -a "$ENABLE_ICECREAM" != "yes"; then
echo "You are not using icecream
- Consider reading http://www.gnome.org/~michael/blog/icecream.html
- and configuring with --with-gcc-speedup=icecream
+ Consider reading http://www.gnome.org/~michael/blog/icecream.html
+ and configuring with --with-gcc-speedup=icecream
"
fi
if test "$OOO_GIT" = "" ; then
echo "You are not using git for the upstream sources.
- Consider configuring via --with-git
+ Consider configuring via --with-git
"
fi
diff --git a/download.in b/download.in
index cadcd50..3d21a3a 100755
--- a/download.in
+++ b/download.in
@@ -1,40 +1,68 @@
#!/usr/bin/perl -w
use Switch;
-
+use File::Temp qw/ tempfile tempdir /;
sub webget($$$$)
{
my ($src, $dest, $name, $is_cgit) = @_;
+ my $result;
$save_as = '';
if ( $name ne '' ) {
$save_as = "-O \"$name\"";
}
- print "Get $src -> $dest/$name\n";
+ if ( $is_cgit && $name ne '' ) {
+ # it must be piece source and must be repacked
+ my $ooo_sourceversion = '@OOO_SOURCEVERSION@';
+ # helper tool to repack ooo piece sources from cgit
+ my $ooo_pack_sources = '@TOOLSDIR@' . "/bin/ooo-pack-sources";
- my $result = system( "cd $dest ; $WGET \"$src\" $save_as" );
-
- if ( !$is_cgit || $name eq '' ) {
- return ( $result == 0 );
- } else {
- # cgit is known to be broken, we need some additional checks, and
- # a plan B if they fail
- if ( $result != 0 || system( "bunzip2 --test \"$dest/$name\" > /dev/null 2>&1" ) != 0 ) {
- ( my $gzip_src = $src ) =~ s/\.bz2$/.gz/;
- return 0 if ( $gzip_src eq $src );
-
- print "Bad archive, go for plan B: get $gzip_src -> repack -> $dest/$name\n";
-
- # it seems that downloading the gzip version is more reliable
- $result = system( "cd $dest ; $WGET \"$gzip_src\" -O - | gunzip | bzip2 > $name" );
- if ( $result == 0 ) {
- # double-check
- $result = system( "bunzip2 --test \"$dest/$name\" > /dev/null 2>&1" );
+ print "Get $src -> $dest/ooo-build-${ooo_sourceversion}-$name.tar.bz2\n";
+
+ # first try to get the tarball into a temporary directory
+ my $tempdir = tempdir( '/tmp/ooo-build-download-XXXXXX' );
+
+ $result = system( "cd $tempdir ; $WGET \"$src\" -O temp.tar.bz2" );
+
+ if ( $result == 0 ) {
+ # try to unpack the tarball in the temp dir
+ $result = system( "cd $tempdir ; tar -xjf temp.tar.bz2 > /dev/null 2>&1" );
}
- }
- return ( $result == 0 );
+
+ # cgit is known to be broken, try plan B (download gzip variant) if bzip2 download failed
+ if ( $result != 0 ) {
+ my $gzip_src = $src;
+ $gzip_src =~ s/\.bz2$/.gz/;
+
+ if ( $gzip_src ne $src ) {
+ print "Bad archive, go for plan B: get $gzip_src and repack\n";
+ $result = system( "cd $tempdir ; $WGET \"$gzip_src\" -O temp.tar.gz" );
+ if ( $result == 0 ) {
+ # try to unpack the tarball in the temp dir
+ $result = system( "cd $tempdir ; tar -xzf temp.tar.gz > /dev/null 2>&1" );
+ }
+ }
+ }
+
+ # pack the files to the final archive, use the ooo-pack-source helper tool
+ if ( $result == 0 ) {
+ # first, remove temp tarballs
+ unlink "$tempdir/temp.tar.bz2", "$tempdir/temp.tar.gz";
+ # pack the files
+ # FIXME: it would be more safe to use $temp_dir/$git_tag instead of $tempdir/*
+ $result = system( "cd $dest; $ooo_pack_sources --set-version=$ooo_sourceversion --piece=$name $tempdir/*" );
+ }
+
+ # remove temp files
+ system( "rm -rf $tempdir" );
+ } else {
+ # normal file, easy go
+ print "Get $src -> $dest/$name\n";
+ my $result = system( "cd $dest ; $WGET \"$src\" $save_as" );
}
+
+ return ( $result == 0 );
}
sub usage {
@@ -55,7 +83,7 @@ sub trim($)
}
sub download_external_sources() {
- system("./download_external_sources.sh")
+ system("./download_external_sources.sh")
}
sub download_tests_dependencies() {
@@ -64,61 +92,61 @@ sub download_tests_dependencies() {
%SRC_URLS = (
'http:\/\/.*' => '',
- 'binutils-.*' => '@MIRROR@/support',
- 'gcc-.*' => '@MIRROR@/support',
- 'beb300-m.*' => '@MIRROR@/BEB300',
- 'dev300-m.*' => '@MIRROR@/DEV300',
- 'ooo300-m.*' => '@MIRROR@/OOO300',
- 'swext-dev300-m.*' => '@MIRROR@/DEV300',
- 'src680-m.*' => '@MIRROR@/SRC680',
- 'ooa680-m.*' => '@MIRROR@/OOA680',
- 'oob680-m.*' => '@MIRROR@/OOB680',
- 'ooc680-m.*' => '@MIRROR@/OOC680',
- 'ood680-m.*' => '@MIRROR@/OOD680',
- 'ooe680-m.*' => '@MIRROR@/OOE680',
- 'oof680-m.*' => '@MIRROR@/OOF680',
- 'oog680-m.*' => '@MIRROR@/OOG680',
- 'ooh680-m.*' => '@MIRROR@/OOH680',
- 'ooo300-m.*' => '@MIRROR@/OOO300',
- 'ooo310-m.*' => '@MIRROR@/OOO310',
- 'ooo680-m.*' => '@MIRROR@/OOO680',
- 'OOO_2_0_2.*' => '@MIRROR@/OOB680',
+ 'binutils-.*' => '@MIRROR@/support',
+ 'gcc-.*' => '@MIRROR@/support',
+ 'beb300-m.*' => '@MIRROR@/BEB300',
+ 'dev300-m.*' => '@MIRROR@/DEV300',
+ 'ooo300-m.*' => '@MIRROR@/OOO300',
+ 'swext-dev300-m.*' => '@MIRROR@/DEV300',
+ 'src680-m.*' => '@MIRROR@/SRC680',
+ 'ooa680-m.*' => '@MIRROR@/OOA680',
+ 'oob680-m.*' => '@MIRROR@/OOB680',
+ 'ooc680-m.*' => '@MIRROR@/OOC680',
+ 'ood680-m.*' => '@MIRROR@/OOD680',
+ 'ooe680-m.*' => '@MIRROR@/OOE680',
+ 'oof680-m.*' => '@MIRROR@/OOF680',
+ 'oog680-m.*' => '@MIRROR@/OOG680',
+ 'ooh680-m.*' => '@MIRROR@/OOH680',
+ 'ooo300-m.*' => '@MIRROR@/OOO300',
+ 'ooo310-m.*' => '@MIRROR@/OOO310',
+ 'ooo680-m.*' => '@MIRROR@/OOO680',
+ 'OOO_2_0_2.*' => '@MIRROR@/OOB680',
'OOO_2_0_3.*' => '@MIRROR@/OOC680',
'OOO_2_0_4.*' => '@MIRROR@/OOD680',
'images_gnome-.*' => '@MIRROR@/SRC680',
'images_kde-.*' => '@MIRROR@/SRC680',
- 'extras-.*' => '@MIRROR@/SRC680',
+ 'extras-.*' => '@MIRROR@/SRC680',
'ooo_custom_images.*' => '@MIRROR@/SRC680',
'ooo_crystal_images.*' => '@MIRROR@/SRC680',
'ooo_oxygen_images-*' => '@MIRROR@/DEV300',
'ooo-cli-prebuilt-*' => '@MIRROR@/DEV300',
'mdbtools.*' => '@MIRROR@/SRC680',
- 'libpixman-.*' => '@MIRROR@/SRC680',
- 'glitz-.*' => '@MIRROR@/SRC680',
- 'biblio.*' => '@MIRROR@/SRC680',
+ 'libpixman-.*' => '@MIRROR@/SRC680',
+ 'glitz-.*' => '@MIRROR@/SRC680',
+ 'biblio.*' => '@MIRROR@/SRC680',
# Prebuilt dictionaries for Novell Windows builds
'writingaids.*\.zip' => '@MIRROR@/SRC680',
# Prebuilt extension dictionaries for OxygenOffice and FSFhu builds
- 'extensionaids.*\.zip' => 'http://ftp.devall.hu/kami/go-oo/',
+ 'extensionaids.*\.zip' => 'http://ftp.devall.hu/kami/go-oo/',
# FIXME: Hacky packinfo from setup_native; is needed in bootstrap for the split build
'setup_native_packinfo-.*' => '@MIRROR@/DEV300',
# Win32 bits:
- 'unicows\.exe' => 'http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642',
+ 'unicows\.exe' => 'http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642',
# from http://www.microsoft.com/downloads/release.asp?releaseid=30682'
- 'dbghinst\.EXE' => 'http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US',
- 'instmsia.exe' => 'http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US',
- 'instmsiw.exe' => 'http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US',
- '5_11_98Odma20\.zip' => '@MIRROR@/support',
- 'openclipart-.*' => 'http://www.openclipart.org/downloads/@OPENCLIPART_VER@',
+ 'dbghinst\.EXE' => 'http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US',
+ 'instmsia.exe' => 'http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US',
+ 'instmsiw.exe' => 'http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US',
+ '5_11_98Odma20\.zip' => '@MIRROR@/support',
+ 'openclipart-.*' => 'http://www.openclipart.org/downloads/@OPENCLIPART_VER@',
#Update fonts:
- 'dejavu-fonts-ttf-.*' => '@MIRROR@/DEV300',
- 'liberation-fonts-ttf-.*' => '@MIRROR@/DEV300',
+ 'dejavu-fonts-ttf-.*' => '@MIRROR@/DEV300',
+ 'liberation-fonts-ttf-.*' => '@MIRROR@/DEV300',
# Win32 ant binaries ...
'apache-ant-.*' => 'http://archive.apache.org/dist/ant/binaries',
# Mozilla source and libraries
- 'mozilla-source-1\.7\.5.*' => 'http://download.go-oo.org/src/',
+ 'mozilla-source-1\.7\.5.*' => 'http://download.go-oo.org/src/',
'seamonkey-.*' => 'http://download.go-oo.org/src/',
'glib-1\.2\..*' => 'http://ftp.gtk.org/pub/gtk/v1.2/',
'libIDL-.*' => 'http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/source/',
@@ -128,70 +156,70 @@ sub download_tests_dependencies() {
# SDK bits
'unowinreg\.dll' => 'http://tools.openoffice.org/unowinreg_prebuild/680/',
# Windows .ico icons
- 'ooo-windows-icons-0.2.tar.bz2' => '@MIRROR@/OOO300',
+ 'ooo-windows-icons-0.2.tar.bz2' => '@MIRROR@/OOO300',
# Updated libwpd
- '*libwpd-*' => '@MIRROR@/libwpd',
+ '*libwpd-*' => '@MIRROR@/libwpd',
# MS Works importer bits
- '*libwps-*' => '@MIRROR@/SRC680',
+ '*libwps-*' => '@MIRROR@/SRC680',
# WPG importer bits
- '*libwpg-*' => '@MIRROR@/SRC680',
+ '*libwpg-*' => '@MIRROR@/SRC680',
# cairo sources
- 'cairo-.*' => 'http://cairographics.org/releases/',
+ 'cairo-.*' => 'http://cairographics.org/releases/',
# OxygenOffice extras
-# 'OOOP-.*\.zip' => 'http://kent.dl.sf.net/sourceforge/ooop/'
- 'OOOP-.*\.zip' => 'http://ftp.devall.hu/kami/go-oo/',
+# 'OOOP-.*\.zip' => 'http://kent.dl.sf.net/sourceforge/ooop/'
+ 'OOOP-.*\.zip' => 'http://ftp.devall.hu/kami/go-oo/',
# Sun Professional Template Pack
-# 'Sun_ODF_Template_Pack_en-US.oxt' => 'http://extensions.services.openoffice.org/files/273/0/',
-# 'Sun_ODF_Template_Pack_de.oxt' => 'http://extensions.services.openoffice.org/files/295/1/',
-# 'Sun_ODF_Template_Pack_it.oxt' => 'http://extensions.services.openoffice.org/files/299/0/',
-# 'Sun_ODF_Template_Pack_fr.oxt' => 'http://extensions.services.openoffice.org/files/297/0/',
-# 'Sun_ODF_Template_Pack_es.oxt' => 'http://extensions.services.openoffice.org/files/301/1/'
-# 'Sun_ODF_Template_Pack_*' => 'http://kent.dl.sf.net/sourceforge/ooop/',
+# 'Sun_ODF_Template_Pack_en-US.oxt' => 'http://extensions.services.openoffice.org/files/273/0/',
+# 'Sun_ODF_Template_Pack_de.oxt' => 'http://extensions.services.openoffice.org/files/295/1/',
+# 'Sun_ODF_Template_Pack_it.oxt' => 'http://extensions.services.openoffice.org/files/299/0/',
+# 'Sun_ODF_Template_Pack_fr.oxt' => 'http://extensions.services.openoffice.org/files/297/0/',
+# 'Sun_ODF_Template_Pack_es.oxt' => 'http://extensions.services.openoffice.org/files/301/1/'
+# 'Sun_ODF_Template_Pack_*' => 'http://kent.dl.sf.net/sourceforge/ooop/',
- 'Sun_ODF_Template_Pack_*' => 'ftp://ftp.devall.hu/kami/go-oo/',
+ 'Sun_ODF_Template_Pack_*' => 'ftp://ftp.devall.hu/kami/go-oo/',
# Lightproof extension
- 'lightproof-*' => 'http://ftp.devall.hu/kami/go-oo/',
+ 'lightproof-*' => 'http://ftp.devall.hu/kami/go-oo/',
# Numbertext extension
- 'numbertext-*' => 'http://ftp.fsf.hu/OpenOffice.org_hu/numbertext/',
+ 'numbertext-*' => 'http://ftp.fsf.hu/OpenOffice.org_hu/numbertext/',
# Hungarian Cross-reference toolbar extension
- 'hunart-*' => 'http://ftp.fsf.hu/OpenOffice.org_hu/hunart/',
+ 'hunart-*' => 'http://ftp.fsf.hu/OpenOffice.org_hu/hunart/',
# Typography toolbar extension
- 'typo-*' => 'http://ftp.fsf.hu/OpenOffice.org_hu/typo/',
+ 'typo-*' => 'http://ftp.fsf.hu/OpenOffice.org_hu/typo/',
# ConvertTextToNumber extension
- 'ConvertTextToNumber-*' => 'http://download.go-oo.org/src/',
+ 'ConvertTextToNumber-*' => 'http://download.go-oo.org/src/',
# Watch Window extension
- 'WatchWindow*' => 'http://ftp.devall.hu/kami/go-oo/',
+ 'WatchWindow*' => 'http://ftp.devall.hu/kami/go-oo/',
# Google Docs Extension
- 'gdocs*' => 'http://download.go-oo.org/src/',
+ 'gdocs*' => 'http://download.go-oo.org/src/',
# NLPSolver Extension
- 'NLPSolver*' => 'http://download.go-oo.org/src/',
- '*nlpsolver*' => 'http://download.go-oo.org/src/',
+ 'NLPSolver*' => 'http://download.go-oo.org/src/',
+ '*nlpsolver*' => 'http://download.go-oo.org/src/',
# LanguageTool Extension
- '*JLanguageTool*' => 'http://download.go-oo.org/src/',
+ '*JLanguageTool*' => 'http://download.go-oo.org/src/',
# oooblogger Extension
- 'oooblogger*' => 'http://download.go-oo.org/src/',
+ 'oooblogger*' => 'http://download.go-oo.org/src/',
# MySQL Connector/C++
'mysql-connector-cpp.zip' => 'http://svn.services.openoffice.org/ooo/cws/mysqlnative/mysqlcppconn/download/mysql-connector-cpp.zip',
# Magyar Linux Libertine fonts
- 'MagyarLinLibertine.*\.zip' => 'http://numbertext.org/linux/',
+ 'MagyarLinLibertine.*\.zip' => 'http://numbertext.org/linux/',
# Multi-dimensional data structure
'cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2' => 'http://hg.services.openoffice.org/binaries/',
# Updated zlib
- '*-zlib-*' => 'http://download.go-oo.org/src/',
+ '*-zlib-*' => 'http://download.go-oo.org/src/',
);
@@ -228,13 +256,13 @@ sub source_file_ooo($)
my $what = $upstream_what;
if (!$SPLIT) {
- if ( "$upstream_what" eq "l10n" ) {
- $what = "lang";
- } elsif ( "$upstream_what" eq "sdk" ) {
- $what = "sdk_oo";
- } elsif ( "$upstream_what" eq "libs_extern_sys" ) {
- $what = "system";
- }
+ if ( "$upstream_what" eq "l10n" ) {
+ $what = "lang";
+ } elsif ( "$upstream_what" eq "sdk" ) {
+ $what = "sdk_oo";
+ } elsif ( "$upstream_what" eq "libs_extern_sys" ) {
+ $what = "system";
+ }
}
my $tag = '@CVSTAG@';
@@ -247,7 +275,7 @@ sub source_file_ooo($)
system( "cd @CLONEDIR@/$what ; git status | grep '^# Your branch is'" );
system( "for file in `cd git-hooks ; echo *`
do
- cd @CLONEDIR@/$what
+ cd @CLONEDIR@/$what
hook=\".git/hooks/\$file\"
if [ ! -x \"\$hook\" -a ! -L \"\$hook\" ] ; then
rm -f \"\$hook\"
@@ -263,12 +291,13 @@ sub source_file_ooo($)
source_file( '@UPSTREAM_NAME@' . "_$upstream_what.tar.bz2" );
}
elsif ( '@SOURCE_TYPE@' eq "CGIT" ) {
- my $upstream_tag = $tag;
- $upstream_tag =~ tr/a-z/A-Z/;
- $upstream_tag =~ s/-M/_m/;
+ my $git_tag = $tag;
+ $git_tag =~ tr/a-z/A-Z/;
+ $git_tag =~ s/-/_/g;
+ $git_tag =~ s/\./_/g;
- source_file( "http://cgit.freedesktop.org/ooo-build/$what/snapshot/ooo/$upstream_tag.tar.bz2",
- '@CVSTAG@' . "-$what.tar.bz2", 1 );
+ 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);
}
else {
source_file( '@CVSTAG@' . "-$what.tar.bz2" );
@@ -290,7 +319,19 @@ sub download_files($$$)
my $is_cgit = $record->{'is_cgit'};
if ( $file ne '' ) {
- my $to_check = ( $save_as ne '' )? "$dest/$save_as": "$dest/$file";
+ 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";
+ } else {
+ # $save_as provides full file name
+ $to_check = "$dest/$save_as";
+ }
+ } else {
+ $to_check = "$dest/$file";
+ }
+
if ( -f "$to_check" ) {
print "Skipping $file\n";
} elsif ( defined $ENV{'DOWNLOADCACHE'} &&
@@ -367,7 +408,7 @@ if ($download_all && '@BUILD_WIN32@' eq '')
}
# Misc. bits for Win32
-if ('@BUILD_WIN32@' ne '')
+if ('@BUILD_WIN32@' ne '')
{
source_file( 'unicows.exe' ) unless '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
source_file( 'dbghinst.EXE' );
@@ -517,7 +558,7 @@ if ('@OOOP_TEMPLATES_PACK@' ne '') {
$lightprooffilenames = trim('@LIGHTPROOF_FILENAMES@');
@lightprooffile = split (/ /, $lightprooffilenames);
foreach (@lightprooffile) {
- source_file( $_ );
+ source_file( $_ );
}
@@ -577,8 +618,8 @@ if ($distro eq 'ArchLinux' ||
$distro eq 'SUSE-9.1' || $distro eq 'SUSE-9.2' || $distro eq 'SUSE-9.3' ||
$distro eq 'Slackware' ||
$distro eq 'NovellWin32' || $distro eq 'GoOoWin32' ||
- $distro eq 'OxygenOfficeLinux' || $distro eq 'OxygenOfficeWindows' ||
- $distro eq 'FSFhuLinux' || $distro eq 'FSFhuWindows' ||
+ $distro eq 'OxygenOfficeLinux' || $distro eq 'OxygenOfficeWindows' ||
+ $distro eq 'FSFhuLinux' || $distro eq 'FSFhuWindows' ||
$distro eq 'translate-org-za-linux' || $distro eq 'translate-org-za-win32' || $distro eq 'Pardus') {
source_file_ooo( "libs_extern_sys" ) if !$SPLIT;
}
@@ -587,7 +628,7 @@ if ($download_all ||
$distro =~ m/Debian/ ||
$distro =~ m/Ubuntu/ ||
$distro =~ m/Frugalware/ ||
- $distro eq 'OxygenOfficeLinux' || $distro eq 'OxygenOfficeWindows' ||
+ $distro eq 'OxygenOfficeLinux' || $distro eq 'OxygenOfficeWindows' ||
'@BUILD_WIN32@' ne '') {
source_file_ooo( "sdk" );
}
diff --git a/download_external_sources.sh b/download_external_sources.sh
index c3fdadd..f32bc53 100755
--- a/download_external_sources.sh
+++ b/download_external_sources.sh
@@ -3,7 +3,7 @@
. ./bin/setup
export TARFILE_LOCATION
-TAG=`echo $CVSTAG | tr a-z A-Z | sed -e s/-M/_m/`
+TAG=`echo $OOO_TAG | tr a-z A-Z | sed -e s/-M/_m/`
MWS=`echo $TAG | cut -d_ -f1`
tmp=`mktemp -q -d`
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0fcafef..c74fb01 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -7,7 +7,7 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../lwp
# might be space separated list to support more MWS
-OLDEST_SUPPORTED=ooo330-m2
+OLDEST_SUPPORTED=ooo330-m2,ooo-build-3.2.98.0
# -------- Functional sub-sets --------
Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
diff --git a/src/.gitignore b/src/.gitignore
index 37e8ae2..c531de5 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -11,3 +11,4 @@
*.zip
????????????????????????????????-*
/clone
+fetch.log
More information about the ooo-build-commit
mailing list