[Libreoffice-commits] .: 140 commits - autogen.sh bin/lo-pack-sources configure.in download .gitignore instsetoo_native/inc_openoffice instsetoo_native/util Makefile.in ooo.lst.in RepositoryFixes.mk Repository.mk scp2/source set_soenv.in solenv/bin solenv/gbuild solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri May 27 12:14:12 PDT 2011
.gitignore | 9
Makefile.in | 11
Repository.mk | 13
RepositoryFixes.mk | 6
autogen.sh | 18
bin/lo-pack-sources | 651 ++++++++++
configure.in | 354 ++++-
download | 23
instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 1
instsetoo_native/util/openoffice.lst | 16
ooo.lst.in | 12
scp2/source/accessories/module_samples_accessories.ulf | 14
scp2/source/accessories/module_templates_accessories.ulf | 14
scp2/source/extensions/module_extensions_lightproof.ulf | 14
scp2/source/extensions/module_extensions_sun_templates.ulf | 14
scp2/source/ooo/file_library_ooo.scp | 158 ++
scp2/source/ooo/file_ooo.scp | 1
scp2/source/ooo/makefile.mk | 32
scp2/source/ooo/module_helppack.ulf | 8
scp2/source/ooo/module_hidden_ooo.scp | 28
scp2/source/ooo/module_langpack.ulf | 14
scp2/source/ooo/shortcut_ooo.scp | 7
scp2/source/ooo/windowscustomaction_ooo.scp | 32
set_soenv.in | 27
solenv/bin/checkdll.sh | 2
solenv/bin/macosx-change-install-names.pl | 20
solenv/bin/modules/installer/globals.pm | 7
solenv/bin/modules/installer/parameter.pm | 1
solenv/bin/modules/installer/systemactions.pm | 2
solenv/bin/modules/installer/windows/file.pm | 12
solenv/bin/modules/installer/windows/idtglobal.pm | 3
solenv/bin/modules/installer/windows/msp.pm | 197 +++
solenv/bin/modules/installer/windows/property.pm | 6
solenv/bin/modules/installer/windows/registry.pm | 76 +
solenv/bin/modules/installer/worker.pm | 6
solenv/bin/ooinstall | 26
solenv/gbuild/ComponentTarget.mk | 10
solenv/gbuild/Library.mk | 7
solenv/gbuild/LinkTarget.mk | 3
solenv/gbuild/TargetLocations.mk | 2
solenv/gbuild/WinResTarget.mk | 70 +
solenv/gbuild/filter-showIncludes.pl | 62
solenv/gbuild/gbuild.mk | 1
solenv/gbuild/platform/macosx.mk | 4
solenv/gbuild/platform/solaris.mk | 13
solenv/gbuild/platform/unxgcc.mk | 4
solenv/gbuild/platform/windows.mk | 190 +-
solenv/gbuild/platform/winmingw.mk | 69 +
solenv/inc/langlist.mk | 1
solenv/inc/minor.mk | 6
solenv/inc/settings.mk | 4
53 files changed, 2017 insertions(+), 266 deletions(-)
New commits:
commit 1259e9eb9ca7c3354a4a893b2d82e653c1cabecf
Merge: fca10ac... fd6a804...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 27 20:49:08 2011 +0200
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap
commit fca10ac82315fde9e14e61ae08cd4ed996213a46
Merge: 727609c... d4e0d17...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 27 20:39:04 2011 +0200
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
Makefile.in
Repository.mk
autogen.sh
bin/lo-commit-stat
configure.in
distro-configs/LibreOfficeOpenBSD.conf
distro-configs/LibreOfficeWin32.conf
instsetoo_native/util/openoffice.lst
ooo.lst.in
scp2/source/ooo/module_langpack.ulf
set_soenv.in
solenv/bin/ooinstall
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/unxgcc.mk
solenv/gbuild/platform/windows.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
tail_build/prj/makefile.mk
diff --cc .gitignore
index bdc4858,990b37a..d82ad75
--- a/.gitignore
+++ b/.gitignore
@@@ -49,8 -42,6 +49,7 @@@
/post_download
/bin/repo-list
/src.downloaded
+/ooo.lst
- /instsetoo_native/*
# misc
/set_soenv.last
@@@ -154,9 -148,12 +156,13 @@@
/l10n
/l10ntools
/languagetool
+ /libcroco
/libegg
+ /libgsf
+ /libpng
+ /librsvg
/libtextcat
+/libvisio
/libwpd
/libwpg
/libwps
diff --cc Makefile.in
index 7c9477f,37c1389..c1d911d
--- a/Makefile.in
+++ b/Makefile.in
@@@ -8,34 -8,37 +8,37 @@@ els
GBUILD_OPT:=--gmake
endif
- all: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ src.downloaded
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
-all: Makefile dmake/dmake at EXEEXT@ src.downloaded
-
- @. ./*[Ee]nv.[Ss]et.sh && \
++all: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ src.downloaded
+ @. ./*Env.Set.sh && \
cd instsetoo_native && \
build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
install:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*Env.Set.sh && \
- echo "Installing in $${prefix:- at prefix@}..." && \
- ooinstall "$${prefix:- at prefix@}" && \
+ echo "Installing in $${libdir:- at libdir@}/@INSTALL_DIRNAME at ..." && \
+ ooinstall "$${libdir:- at libdir@}/@INSTALL_DIRNAME@" && \
echo "" && \
echo "Installation finished, you can now execute:" && \
- echo "$${prefix:- at prefix@}/program/soffice"
+ echo "$${libdir:- at libdir@}/@INSTALL_DIRNAME@/program/soffice"
dev-install:
- @. ./*[Ee]nv.[Ss]et.sh && \
- ooinstall -l @abs_builddir@/install && \
- echo "" && \
+ @. ./*Env.Set.sh && \
+ cd smoketestoo_native && \
+ build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@ && \
+ echo "" && \
echo "Developer installation finished, you can now execute:" && \
- echo "@abs_builddir@/install/program/soffice"
+ echo "@abs_builddir@/installation/opt/program/soffice"
-distclean: dmake/dmake at EXEEXT@
- @. ./*[Ee]nv.[Ss]et.sh && \
+distclean: dmake/dmake at EXEEXT_FOR_BUILD@
+ @. ./*Env.Set.sh && \
dmake distclean
-clean: dmake/dmake at EXEEXT@
- @. ./*[Ee]nv.[Ss]et.sh && \
+clean: dmake/dmake at EXEEXT_FOR_BUILD@
+ @. ./*Env.Set.sh && \
dmake clean && \
if [ -n "$$USE_GMAKE" ] ; then make -f GNUmakefile.mk -sr clean ; fi
diff --cc Repository.mk
index 3609e71,279250c..0afca0d
mode 100644,100755..100755
--- a/Repository.mk
+++ b/Repository.mk
@@@ -42,22 -43,12 +42,25 @@@ $(eval $(call gb_Helper_register_execut
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ adabasui \
+ AppleRemote \
avmedia \
basegfx \
+ basebmp \
+ canvastools \
+ chartcontroller \
+ chartmodel \
+ charttools \
+ chartview \
+ cppcanvas \
cui \
+ dba \
+ dbaxml \
+ dbmm \
+ dbtools \
+ dbu \
+ desktop_detector \
+ doctok \
drawinglayer \
editeng \
for \
@@@ -106,12 -85,16 +109,17 @@@
textconversiondlgs \
tk \
tl \
- utl \
unordf \
unoxml \
+ utl \
vbahelper \
vcl \
+ vclplug_gen \
+ vclplug_gtk \
+ vclplug_kde \
+ vclplug_kde4 \
+ vclplug_svp \
+ writerfilter \
xcr \
xo \
xof \
@@@ -124,13 -107,11 +132,16 @@@ $(eval $(call gb_Helper_register_librar
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
test \
cppunit \
+ crypto \
+ fileacc \
+ icui18n \
+ icule \
icuuc \
+ icule \
+ graphite_dll \
+ cppunit \
rdf \
+ ssl \
xslt \
))
@@@ -169,9 -148,7 +181,10 @@@ $(eval $(call gb_Helper_register_librar
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ crypto \
+ graphite2_off \
+ libeay32 \
+ ssleay32 \
jpeglib \
ooopathutils \
salcpprt \
diff --cc RepositoryFixes.mk
index f563138,f7aff97..2e7be72
mode 100644,100755..100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
diff --cc configure.in
index 6ed7ea1,537c848..31f8a4d
--- a/configure.in
+++ b/configure.in
@@@ -1386,6 -1423,7 +1409,7 @@@ case "$host_os" i
solaris*)
test_gtk=yes
build_gstreamer=yes
- test_librsvg=yes
++ test_librsvg=yes
test_kde=yes
test_freetype=yes
test_gstreamer=yes
@@@ -1418,6 -1456,7 +1442,7 @@@
linux-gnu*|k*bsd*-gnu*)
test_gtk=yes
build_gstreamer=yes
- test_librsvg=yes
++ test_librsvg=yes
test_kde=yes
test_kde4=yes
test_freetype=yes
@@@ -1430,41 -1469,18 +1455,43 @@@
test_cups=no
_os=GNU
;;
- cygwin*|interix*) # Windows
+ cygwin*|interix*|mingw32*) # Windows
+
+ # When building on Windows normally with MSVC under Cygwin,
+ # configure thinks that the host platform (the platform the
+ # built code will run on) is Cygwin, even if it obviously is
+ # Windows, which in Autoconf terminology is called
+ # "mingw32". (Which is misleading as MinGW is the name of the
+ # tool-chain, not an operating system.)
+
+ # Somewhat confusing, yes. But this configure script doesn't
+ # look at $host etc that much, it mostly uses its own $_os
+ # variable, set here in this case statement.
+
+ # When cross-compiling to Windows from Unix, the host platform
+ # is "mingw32" (because in that case it is the MinGW
+ # tool-chain that is used).
+
test_cups=no
test_randr=no
- test_librsvg=no
++ test_librsvg=no
test_freetype=no
test_cairo=no
test_fontconfig=no
_os=WINNT
+ # Confusingly, if the host OS matches "mingw32*", that means
+ # we are using the MinGW compiler, either natively (unlikely)
+ # or cross-compiling. We use WITH_MINGW to indicate
+ # use of MinGW in both cases.
+ case "$host_os" in
+ mingw32*)
+ WITH_MINGW=yes
+ ;;
+ esac
;;
- darwin*) # Mac OS X
+ darwin*) # Mac OS X or iOS
test_gtk=yes
- test_librsvg=no
++ test_librsvg=no
test_randr=no
test_freetype=no
test_fontconfig=no
@@@ -2229,9 -2166,7 +2259,9 @@@ if test "$_os" = "WINNT"; the
else
with_cl_home=`cygpath -u "$with_cl_home"`
fi
+ with_cl_home=`cygpath -d "$with_cl_home"`
+ with_cl_home=`cygpath -u "$with_cl_home"`
- AC_MSG_RESULT([done])
+ AC_MSG_RESULT([$with_cl_home])
dnl ===========================================================
dnl Check for mspdb80.dll/mspdb100.dll
@@@ -2324,58 -2261,22 +2356,71 @@@
AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
fi
+ dnl We need to guess the prefix of the -showIncludes output, it can be
+ dnl localized
+ AC_MSG_CHECKING([the dependency generation prefix (cl.exe -showIncludes)])
+ echo "#include <stdlib.h>" > conftest.c
+ SHOWINCLUDES_PREFIX=`$CC -c -showIncludes conftest.c 2>/dev/null | \
+ grep 'stdlib\.h' | head -n1 | sed 's/ [[[:alpha:]]]:.*//'`
+ rm -f conftest.c conftest.obj
+ if test -z "$SHOWINCLUDES_PREFIX" ; then
+ AC_MSG_ERROR([cannot determine the -showIncludes prefix])
+ else
+ AC_MSG_RESULT(["$SHOWINCLUDES_PREFIX"])
+ fi
++
+ # Check for 64-bit (cross-)compiler to use to build the 64-bit
+ # version of the Explorer extension (and maybe other small
+ # bits, too) needed when installing a 32-bit LibreOffice on a
+ # 64-bit OS. The 64-bit Explorer extension is a feature that
+ # has been present since long in OOo. Don't confuse it with
+ # building LibreOffice itself as 64-bit code, which is
+ # unfished work and highly experimental.
+
+ BUILD_X64=
+ CC_X64_BINARY=
+ LINK_X64_BINARY=
+ LIBMGR_X64_BINARY=
+
+ if test "$CL_X64" = ""; then
+ AC_MSG_CHECKING([for a x64 compiler])
+
+ # Prefer native x64 compiler to cross-compiler, in case we are running
+ # the build on a 64-bit OS.
+ if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
+ BUILD_X64=TRUE
+ CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+ CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+ LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
+ LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
+ elif "$with_cl_home/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
+ BUILD_X64=TRUE
+ CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+ CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+ LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
+ LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
+ fi
+ if test "$BUILD_X64" = TRUE; then
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
+ fi
+ fi
+ AC_SUBST(BUILD_X64)
+
+ # These are passed to the environment through set_soenv.in as usual, and then
+ # used in set_wntx64.mk
+ AC_SUBST(CC_X64_BINARY)
+ AC_SUBST(CXX_X64_BINARY)
+ AC_SUBST(LINK_X64_BINARY)
+ AC_SUBST(LIBMGR_X64_BINARY)
+
else
- AC_MSG_CHECKING([the MinGW C++ Compiler])
- if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
- AC_MSG_RESULT([found.])
+ AC_MSG_CHECKING([the compiler is MinGW])
+ MACHINE_PREFIX=`$CC -dumpmachine`
+ if echo $MACHINE_PREFIX | grep -q mingw32; then
+ AC_MSG_RESULT([yes])
if $CC -dumpspecs | grep -q "mno-cygwin"; then
USE_MINGW="cygwin"
else
@@@ -2389,33 -2290,8 +2434,34 @@@ f
AC_SUBST(COMEX)
AC_SUBST(MSPDB_PATH)
AC_SUBST(USE_MINGW)
+ AC_SUBST(SHOWINCLUDES_PREFIX)
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
+
+ # If you use CC=/path/to/compiler/foo-gcc or even CC="ccache
+ # /path/to/compiler/foo-gcc" you need to set the AR etc env vars
+ # explicitly. Or put /path/to/compiler in PATH yourself.
+
+ AC_CHECK_TOOL(AR,ar)
+ AC_CHECK_TOOL(NM,nm)
+ AC_CHECK_TOOL(OBJDUMP,objdump)
+ AC_CHECK_TOOL(PKG_CONFIG,pkg-config)
+ AC_CHECK_TOOL(RANLIB,ranlib)
+ AC_CHECK_TOOL(STRIP,strip)
+ if test "$_os" = "WINNT"; then
+ AC_CHECK_TOOL(DLLTOOL,dlltool)
+ AC_CHECK_TOOL(WINDRES,windres)
+ fi
+fi
+AC_SUBST(AR)
+AC_SUBST(DLLTOOL)
+AC_SUBST(NM)
+AC_SUBST(OBJDUMP)
+AC_SUBST(PKG_CONFIG)
+AC_SUBST(RANLIB)
+AC_SUBST(STRIP)
+AC_SUBST(WINDRES)
+
dnl ===================================================================
dnl .NET needs special treatment
dnl (does the above comment really mean .NET, or is it misusing
@@@ -2648,10 -2461,10 +2694,10 @@@ f
AC_SUBST([VALGRIND_CFLAGS])
dnl ===================================================================
-dnl Testing for c++ compiler and version...
+dnl Testing for C++ compiler and version...
dnl ===================================================================
if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
- if test -e "$CC"; then
+ if test -n "$CC" -a -z "$CXX"; then
CXX="$CC"
fi
fi
@@@ -6385,7 -6179,16 +6437,9 @@@ AC_SUBST(ENABLE_DBUS
AC_SUBST(ENABLE_SYSTRAY_GTK)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+ AC_SUBST(GTHREAD_CFLAGS)
+ AC_SUBST(GTHREAD_LIBS)
-AC_ARG_ENABLE(unix-qstart,
- AS_HELP_STRING([--disable-unix-qstart],
- [On UNIX systems, we can enable a faster splash app that accelerates
- startup, if we can link to the system libpng, use this if you are
- a Linux Distro packager.]),
-,enable_unix_quickstarter=yes)
-
PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" )
AC_SUBST(LIBPNG_LIBS)
AC_SUBST(LIBPNG_CFLAGS)
diff --cc ooo.lst.in
index c698634,0000000..bcd0390
mode 100644,000000..100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@@ -1,111 -1,0 +1,121 @@@
+http://download.go-oo.org/src
+48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
+63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
+09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
+0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
+128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
+17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
+18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
+26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
+284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
+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
+ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
+35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
+39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
+3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
+48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
+4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
+4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
+599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
+7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
+7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
+798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
+8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
+bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
+a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
+a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
+a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
+c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
+ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
+d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
+d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
- dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz
+e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
+e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
+e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
+ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
+ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
+ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
+fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
+fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
+fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
+831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
+067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
+3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
++3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
++9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
++a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
++3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz
++22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
++0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
++d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
++220035f111ea045a51e290906025e8b5-libpng-1.5.1.tar.gz
++a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
++c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
++
+314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
+451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
+90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
+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
+8d265a592619166f29c4672ea54812b7-libwpd-0.9.2.tar.bz2
+29721a16f25967d59969d5f0ae485b4a-libwps-0.2.2.tar.bz2
+7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
+f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
+0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
+763bb9b14eec5ba9a533d7a9279301db-libvisio-0.0.0.tar.gz
+http://download.go-oo.org/extern
+185d60944ea767075d27247c3162b3bc-unowinreg.dll
+b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
+http://www.numbertext.org/linux
+881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
+http://ooo.itc.hu/oxygenoffice/download/libreoffice/
+ at OOOP_GALLERY_PACK@
+ at OOOP_TEMPLATES_PACK@
+ at OOOP_FONTS_PACK@
+ at OOOP_SAMPLES_PACK@
+ at CT2N_EXTENSION_PACK@
+ at BARCODE_EXTENSION_PACK@
+ at DIAGRAM_EXTENSION_PACK@
+ at VALIDATOR_EXTENSION_PACK@
+ at WATCH_WINDOW_EXTENSION_PACK@
+ at NUMBERTEXT_EXTENSION_PACK@
+ at HUNART_EXTENSION_PACK@
+ at TYPO_EXTENSION_PACK@
+ at GOOGLE_DOCS_EXTENSION_PACK@
+ at OOOBLOGGER_EXTENSION_PACK@
+ at LIGHTPROOF_EN_US_PACK@
+ at LIGHTPROOF_HU_PACK@
+ at SUNTEMPLATES_DE_PACK@
+ at SUNTEMPLATES_EN_US_PACK@
+ at SUNTEMPLATES_ES_PACK@
+ at SUNTEMPLATES_FR_PACK@
+ at SUNTEMPLATES_HU_PACK@
+ at SUNTEMPLATES_IT_PACK@
+
diff --cc scp2/source/ooo/file_library_ooo.scp
index 922c07a,95c7ea2..bbca5d1
mode 100755,100644..100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
diff --cc scp2/source/ooo/module_lang_template.scp
index f801a62,6825ed2..f801a62
mode 100755,100644..100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
diff --cc scp2/source/ooo/module_langpack.ulf
index 3f9e27b,a8d2316..7e1f9e6
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@@ -269,13 -269,19 +269,19 @@@ en-US = "Installs the Swahili user inte
en-US = "Lao"
[STR_DESC_MODULE_LANGPACK_LO]
-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Lao user interface"
- [STR_NAME_MODULE_LANGPACK_NS]
+ [STR_NAME_MODULE_LANGPACK_MY]
+ en-US = "Burmese"
+
+ [STR_DESC_MODULE_LANGPACK_MY]
+ en-US = "Installs the Burmese (Myanmar) user interface"
+
+ [STR_NAME_MODULE_LANGPACK_NSO]
en-US = "Northern Sotho"
- [STR_DESC_MODULE_LANGPACK_NS]
+ [STR_DESC_MODULE_LANGPACK_NSO]
-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Northern Sotho user interface"
[STR_NAME_MODULE_LANGPACK_BN]
en-US = "Bengali"
@@@ -419,13 -425,13 +425,13 @@@ en-US = "Installs the Indonesian user i
en-US = "Ukrainian"
[STR_DESC_MODULE_LANGPACK_UK]
-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Ukrainian user interface"
- [STR_NAME_MODULE_LANGPACK_BE_BY]
+ [STR_NAME_MODULE_LANGPACK_BE]
en-US = "Belarusian"
- [STR_DESC_MODULE_LANGPACK_BE_BY]
+ [STR_DESC_MODULE_LANGPACK_BE]
-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Belarusian user interface"
[STR_NAME_MODULE_LANGPACK_SL]
en-US = "Slovenian"
diff --cc scp2/source/ooo/ure.scp
index 6d61daf,16fe707..6d61daf
mode 100755,100644..100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
diff --cc set_soenv.in
index ee990a9,9535ee1..569a867
--- a/set_soenv.in
+++ b/set_soenv.in
@@@ -73,14 -74,14 +73,14 @@@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $I
# Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
+ $L10N_MODULE, $WITH_POOR_HELP_LOCALIZATIONS,
$UPD, $WORK_STAMP, $gb_REPOS, $BUILD_TYPE,
$SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, $SOLARDEFIMG,
- $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
$DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
- $MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
+ $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $SHOWINCLUDES_PREFIX,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB,
- $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
- $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME,
+ $SOLARINC, $FRAMEWORKSHOME, $COMEX, $PERL,
+ $COMP_ENV, $ILIB, $JAVAHOME, $WINDOWS_SDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
$USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
@@@ -639,10 -655,12 +635,11 @@@ elsif ( $platform =~ m/cygwin|mingw32/
$MSPDB_PATH = PathFormat('@MSPDB_PATH@');
$MIDL_PATH = PathFormat('@MIDL_PATH@');
$CSC_PATH = PathFormat('@CSC_PATH@');
+ $SHOWINCLUDES_PREFIX = '@SHOWINCLUDES_PREFIX@';
- $PSDK_HOME = PathFormat('@PSDK_HOME@');
+ $WINDOWS_SDK_HOME = PathFormat('@WINDOWS_SDK_HOME@');
$DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
$USE_DIRECTX5 = "";
- $FRAME_HOME = PathFormat('@FRAME_HOME@');
- $USE_NEW_SDK = "TRUE";
+ $DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
$CPUNAME = "INTEL";
$CPUNAME = "X86_64" if $CL_X64;
$CPU = "I";
@@@ -1561,9 -1621,9 +1560,8 @@@ ToFile( "GTHREAD_LIBS", "@GTHR
ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
-ToFile( "ENABLE_BROFFICE", "@ENABLE_BROFFICE@", "e" );
ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
- ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );
ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
diff --cc solenv/bin/modules/installer/windows/msp.pm
index b6c611b,ede2557..b48b8d3
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@@ -85,6 -86,196 +86,196 @@@ sub install_installation_set
}
#################################################################################
+ # Collecting the destinations of all files with flag PATCH in a hash.
+ #################################################################################
+
+ sub collect_patch_file_destinations
+ {
+ my ( $filesarray ) = @_;
-
++
+ my %patchfiledestinations = ();
+ my %nopatchfiledestinations = ();
+ my $patchcounter = 0;
+ my $nopatchcounter = 0;
-
++
+ for ( my $i = 0; $i <= $#{$filesarray}; $i++ )
+ {
+ my $onefile = ${$filesarray}[$i];
+ my $styles = "";
+
+ if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'} };
+
+ if ( $styles =~ /\bPATCH\b/ )
+ {
+ $patchfiledestinations{$onefile->{'destination'}} = 1;
+ $patchcounter++;
+ }
+ else
+ {
+ $nopatchfiledestinations{$onefile->{'destination'}} = 1;
+ $nopatchcounter++;
+ }
+ }
-
++
+ return (\%patchfiledestinations, \%nopatchfiledestinations, $patchcounter, $nopatchcounter);
+ }
+
+ #################################################################################
+ # Returning the first path segment of a path
+ #################################################################################
+
+ sub get_first_path_segment
+ {
+ my ( $path ) = @_;
-
++
+ my $firstsegment = "";
+ my $remainder = $path;
+
+ if ( $path =~ /^\s*(.*?)[\/\\](.*)\s*$/ )
+ {
+ $firstsegment = $1;
+ $remainder = $2;
+ }
-
++
+ return ($firstsegment, $remainder);
+ }
+
+ #################################################################################
+ # Finding the flexible path in the destinations, that are saved in
+ # the hash $nopatchfiledestinations.
+ #################################################################################
+
+ sub prepare_path_in_nopatchfilehash
+ {
+ my ($nopatchfiledestinations, $newpath) = @_;
-
++
+ my $infoline = "";
+ my $flexiblepath = "";
+ my $found = 0;
+ my %checked_destinations = ();
-
++
+ foreach my $onedestination ( keys %{$nopatchfiledestinations} )
+ {
+ $flexiblepath = "";
+ $found = 0;
-
++
+ my $found_first_segement = 1;
+ my $firstsegement = "";
+ my $fixedpath = $onedestination;
+ my $testfile = $newpath . $installer::globals::separator . $fixedpath;
+
+ while (( ! -f $testfile ) && ( $found_first_segement ))
+ {
+ $firstsegement = "";
+ ( $firstsegement, $fixedpath ) = get_first_path_segment($fixedpath);
+
+ if ( $firstsegement ne "" )
+ {
+ $found_first_segement = 1;
- $flexiblepath = $flexiblepath . $firstsegement . $installer::globals::separator;
++ $flexiblepath = $flexiblepath . $firstsegement . $installer::globals::separator;
+ }
+ else
+ {
+ $found_first_segement = 0;
+ }
+
+ $testfile = $newpath . $installer::globals::separator . $fixedpath;
+ }
-
++
+ if ( -f $testfile ) { $found = 1; }
-
++
+ if ( $found ) { last; }
+ }
+
+ if ( ! $found ) { installer::exiter::exit_program("ERROR: Could not determine flexible destination path for msp patch creation!", "prepare_path_in_nopatchfilehash"); }
+
+ $infoline = "Setting flexible path for msp creation: $flexiblepath\n";
+ push( @installer::globals::logfileinfo, $infoline);
+
+ foreach my $onedestination ( keys %{$nopatchfiledestinations} )
+ {
+ $onedestination =~ s/^\s*\Q$flexiblepath\E//;
+ $checked_destinations{$onedestination} = 1;
+ }
+
+ return \%checked_destinations;
+ }
+
+ #################################################################################
+ # Synchronizing the two installed products in that way, that only
+ # files with flag PATCH are different.
+ #################################################################################
+
+ sub synchronize_installation_sets
+ {
+ my ($olddatabase, $newdatabase, $filesarray) = @_;
+
+ my $infoline = "\nSynchronizing installed products because of PATCH flag\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ $infoline = "Old product: $olddatabase\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ $infoline = "New product: $newdatabase\n";
+ push( @installer::globals::logfileinfo, $infoline);
-
++
+ my ( $patchfiledestinations, $nopatchfiledestinations, $patchfilecounter, $nopatchfilecounter ) = collect_patch_file_destinations($filesarray);
-
++
+ $infoline = "Number of files with PATCH flag: $patchfilecounter\n";
+ push( @installer::globals::logfileinfo, $infoline);
+
+ $infoline = "Number of files without PATCH flag: $nopatchfilecounter\n";
+ push( @installer::globals::logfileinfo, $infoline);
-
++
+ foreach my $localfile ( sort keys %{$patchfiledestinations} )
+ {
+ $infoline = "\tPATCH file: $localfile\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ }
-
++
+ my $oldpath = $olddatabase;
+ if ( $^O =~ /cygwin/i ) { $oldpath =~ s/\\/\//g; }
+ installer::pathanalyzer::get_path_from_fullqualifiedname(\$oldpath);
+ $oldpath =~ s/\\\s*$//;
+ $oldpath =~ s/\/\s*$//;
+
- my $newpath = $newdatabase;
++ my $newpath = $newdatabase;
+ if ( $^O =~ /cygwin/i ) { $newpath =~ s/\\/\//g; }
+ installer::pathanalyzer::get_path_from_fullqualifiedname(\$newpath);
+ $newpath =~ s/\\\s*$//;
+ $newpath =~ s/\/\s*$//;
-
++
+ # The destination path is not correct. destinations in the hash contain
+ # the flexible installation path, that is not part in the administrative installation
+ $nopatchfiledestinations = prepare_path_in_nopatchfilehash($nopatchfiledestinations, $newpath);
+
+ foreach my $onedestination ( keys %{$nopatchfiledestinations} )
+ {
+ my $source = $oldpath . $installer::globals::separator . $onedestination;
+ my $dest = $newpath . $installer::globals::separator . $onedestination;
-
++
+ if ( -f $source )
+ {
+ if ( -f $dest )
+ {
+ my $copyreturn = copy($source, $dest);
+ # installer::systemactions::copy_one_file($source, $dest);
+ # $infoline = "Synchronizing file: $source to $dest\n";
+ # push( @installer::globals::logfileinfo, $infoline);
+ }
+ else
+ {
+ $infoline = "Not synchronizing. Destination file \"$dest\" does not exist.\n";
- push( @installer::globals::logfileinfo, $infoline);
++ push( @installer::globals::logfileinfo, $infoline);
+ }
+ }
+ else
+ {
+ $infoline = "Not synchronizing. Source file \"$source\" does not exist.\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ }
+ }
+ }
+
+ #################################################################################
# Extracting all tables from a pcp file
#################################################################################
@@@ -1197,6 -1388,12 +1388,12 @@@ sub create_msp_patc
installer::logger::print_message( "... installing products ...\n" );
my ($olddatabase, $newdatabase) = install_installation_sets($installationdir);
+ installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting synchronization of installation sets");
-
++
+ # Synchronizing installed products, allowing only different files with PATCH flag
+ installer::logger::print_message( "... synchronizing installation sets ...\n" );
+ synchronize_installation_sets($olddatabase, $newdatabase, $filesarray);
+
installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting pcp file creation");
# Create pcp file
diff --cc solenv/bin/modules/installer/windows/registry.pm
index ba121bd,9abcf6b..92a6bcb
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@@ -60,7 -60,10 +60,10 @@@ sub get_registry_component_nam
if ( $componentname eq "gid_module_root" ) { $isrootmodule = 1; }
# Attention: Maximum length for the componentname is 72
-
+
+ # identifying this component as registryitem component
+ $componentname = "registry_" . $componentname;
+
$componentname =~ s/gid_module_/g_m_/g;
$componentname =~ s/_optional_/_o_/g;
$componentname =~ s/_javafilter_/_jf_/g;
@@@ -96,11 -97,74 +97,74 @@@
elsif (( $styles =~ /\bHELPPACK\b/ ) && ( $installer::globals::helppack )) { $componentname = $componentname . "_help"; }
if ( $styles =~ /\bALWAYS_REQUIRED\b/ ) { $componentname = $componentname . "_forced"; }
+ # Attention: Maximum length for the componentname is 72
- # %installer::globals::allregistrycomponents_in_this_database_ : resetted for each database
++ # %installer::globals::allregistrycomponents_in_this_database_ : resetted for each database
+ # %installer::globals::allregistrycomponents_ : not resetted for each database
+ # Component strings must be unique for the complete product, because they are used for
- # the creation of the globally unique identifier.
++ # the creation of the globally unique identifier.
+
+ my $fullname = $componentname; # This can be longer than 72
-
++
+ if (( exists($installer::globals::allregistrycomponents_{$fullname}) ) && ( ! exists($installer::globals::allregistrycomponents_in_this_database_{$fullname}) ))
+ {
+ # This is not allowed: One component cannot be installed with different packages.
+ installer::exiter::exit_program("ERROR: Windows registry component \"$fullname\" is already included into another package. This is not allowed.", "get_registry_component_name");
+ }
-
++
+ if ( exists($installer::globals::allregistrycomponents_{$fullname}) )
+ {
+ $componentname = $installer::globals::allregistrycomponents_{$fullname};
+ }
+ else
+ {
+ if ( length($componentname) > 60 )
+ {
+ $componentname = generate_new_short_registrycomponentname($componentname); # This has to be unique for the complete product, not only one package
+ }
+
+ $installer::globals::allregistrycomponents_{$fullname} = $componentname;
+ $installer::globals::allregistrycomponents_in_this_database_{$fullname} = 1;
+ }
+
if ( $isrootmodule ) { $installer::globals::registryrootcomponent = $componentname; }
return $componentname;
}
+ #########################################################
+ # Create a shorter version of a long component name,
+ # because maximum length in msi database is 72.
+ # Attention: In multi msi installation sets, the short
+ # names have to be unique over all packages, because
+ # this string is used to create the globally unique id
+ # -> no resetting of
+ # %installer::globals::allshortregistrycomponents
+ # after a package was created.
+ #########################################################
+
+ sub generate_new_short_registrycomponentname
+ {
+ my ($componentname) = @_;
-
++
+ my $shortcomponentname = "";
+ my $counter = 1;
-
++
+ my $startversion = substr($componentname, 0, 60); # taking only the first 60 characters
+ $startversion = $startversion . "_";
-
++
+ $shortcomponentname = $startversion . $counter;
+
+ while ( exists($installer::globals::allshortregistrycomponents{$shortcomponentname}) )
+ {
+ $counter++;
+ $shortcomponentname = $startversion . $counter;
+ }
-
++
+ $installer::globals::allshortregistrycomponents{$shortcomponentname} = 1;
-
++
+ return $shortcomponentname;
+ }
+
##############################################################
# Returning identifier for registry table.
##############################################################
@@@ -122,8 -186,16 +186,16 @@@ sub get_registry_identifie
$identifier =~ s/_clsid_/_c_/;
$identifier =~ s/_currentversion_/_cv_/;
$identifier =~ s/_microsoft_/_ms_/;
+ $identifier =~ s/_manufacturer_/_mf_/;
+ $identifier =~ s/_productname_/_pn_/;
+ $identifier =~ s/_productversion_/_pv_/;
$identifier =~ s/_staroffice_/_so_/;
+ $identifier =~ s/_software_/_sw_/;
- $identifier =~ s/_capabilities_/_cap_/;
++ $identifier =~ s/_capabilities_/_cap_/;
$identifier =~ s/_classpath_/_cp_/;
+ $identifier =~ s/_extension_/_ex_/;
+ $identifier =~ s/_fileassociations_/_fa_/;
+ $identifier =~ s/_propertysheethandlers_/_psh_/;
$identifier =~ s/__/_/g;
# Saving this in the registry collector
diff --cc solenv/bin/ooinstall
index b080598,87bc9dc..c4f44b4
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@@ -13,16 -13,12 +13,22 @@@ use Cwd
$path = '';
$do_link = 0;
+ $is_windows = 0;
+my $tmp_dir;
+
+ if ($ENV{GUI} eq 'WNT') {
+ $is_windows = 1;
+ }
+
+if( defined($ENV{TMPDIR}) ) {
+ $tmp_dir = $ENV{TMPDIR};
+} elsif( defined($ENV{TMP}) ) {
+ $tmp_dir = $ENV{TMP};
+} else {
+ $tmp_dir = '/tmp';
+}
+if (!-d $tmp_dir) {die "Set TMP or TMPDIR!\n";}
+
# Workaround for system Mozilla
if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
$ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}";
@@@ -102,8 -93,7 +114,8 @@@ print "Running LibreOffice installer\n"
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
"-f openoffice.lst -l $langs -p LibreOffice " .
+ "-u $tmp_dir " .
- "-buildid $BUILD $destdir $strip " .
+ "-buildid $BUILD $destdir $strip $msi " .
"-simple $path") && die "Failed to install: $!";
if ($ENV{BUILD_TYPE} =~ m/ODK/) {
@@@ -111,8 -101,7 +123,8 @@@
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
"-f openoffice.lst -l en-US -p LibreOffice_SDK " .
+ "-u $tmp_dir " .
- "-buildid $BUILD $destdir $strip " .
+ "-buildid $BUILD $destdir $strip $msi" .
"-simple $path") && die "Failed to install: $!";
}
print "Installer finished\n";
diff --cc solenv/gbuild/ComponentTarget.mk
index 504bd5a,504bd5a..7b76fd3
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@@ -53,16 -53,16 +53,16 @@@ ende
$(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
$(call gb_ComponentTarget_get_target,%) :
-- $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xlstproc is missing.))
++ $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.))
$(call gb_ComponentTarget_get_external_target,%) :
$(call gb_Deliver_deliver,$<,$@)
define gb_ComponentTarget_ComponentTarget
--$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
--$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
--$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
--$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
++$(call gb_ComponentTarget_get_target,$(4)) : LIBFILENAME := $(3)
++$(call gb_ComponentTarget_get_target,$(4)) : COMPONENTPREFIX := $(2)
++$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(4))
++$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(4)))
endef
diff --cc solenv/gbuild/Library.mk
index 47640bd,4d06274..7eafe5b
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@@ -79,9 -80,9 +80,9 @@@ $(call gb_Deliver_add_deliverable,$(cal
endef
define gb_Library_set_componentfile
--$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1)))
--$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
--$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
++$(call gb_ComponentTarget_ComponentTarget,$(or $(strip $(3)),$(strip $(2))),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1)),$(2))
++$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(or $(strip $(3)),$(strip $(2))))
++$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2))))
endef
diff --cc solenv/gbuild/TargetLocations.mk
index f2c7320,3cb92bc..40ccb30
mode 100644,100755..100755
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@@ -90,8 -82,7 +90,9 @@@ gb_SdiTarget_get_target = $(WORKDIR)/Sd
gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
+gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
+gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
+ gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
define gb_Library_get_external_headers_target
$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
diff --cc solenv/gbuild/platform/macosx.mk
index b016a95,46520ec..ae57972
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@@ -246,8 -227,7 +246,8 @@@ ende
gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
- gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
+ gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_OBJCFLAGS := $(gb_CFLAGS) $(gb_OBJCFLAGS) $(gb_COMPILEROPTFLAGS)
ifeq ($(gb_SYMBOL),$(true))
gb_LinkTarget_CFLAGS += -g
diff --cc solenv/gbuild/platform/solaris.mk
index 591c100,449a5f1..d30fe2f
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@@ -244,14 -246,21 +246,23 @@@ gb_Library_OOOEXT := ss$(gb_Library_PLA
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
endif
+ gb_STDLIBS := \
+ Crun \
+ m \
+ c \
+
gb_Library_PLAINLIBS_NONE += \
+ $(gb_STDLIBS) \
dl \
+ freetype \
+ GL \
+ GLU \
jpeg \
- m \
pthread \
X11 \
+ Xext \
+ SM \
+ ICE \
z
gb_Library_FILENAMES := \
diff --cc solenv/gbuild/platform/unxgcc.mk
index c17805f,7dd7715..dde1bc8
mode 100644,100755..100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@@ -298,8 -278,8 +298,10 @@@ gb_Library_UNOEXT := .uno$(gb_Library_P
gb_Library_PLAINLIBS_NONE += \
dl \
+ freetype \
+ GL \
+ GLU \
+ ICE \
jpeg \
m \
pthread \
diff --cc solenv/inc/minor.mk
index dfd0189,cbfc3b9..38646f1
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
- RSCVERSION=340
- RSCREVISION=340m1(Build:1)
-RSCVERSION=300
-RSCREVISION=300m106(Build:2)
-BUILD=2
-LAST_MINOR=m106
-SOURCEVERSION=DEV300
++RSCVERSION=350
++RSCREVISION=350m1(Build:1)
+BUILD=1
+LAST_MINOR=m1
- SOURCEVERSION=OOO340
++SOURCEVERSION=OOO350
diff --cc solenv/inc/settings.mk
index 04dfd34,356bda2..da564bf
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@@ -826,9 -809,23 +826,13 @@@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR
.EXPORT : SOLARBINDIR
+ .IF "$(GUI)" == "WNT"
+ L10N_MODULE*=$(shell cygpath -m $(SRC_ROOT)/translations)
+ .ELSE
-L10N_MODULE*=$(SRC_ROOT)/translations
+ .ENDIF
-ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
-
.IF "$(WITH_LANG)"!=""
.INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
-.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
-
-# check for localizations not hosted in l10n module. if a file exists there
-# it won't in l10n
-.IF "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYALTSDF:=$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
-LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
-.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!=""
+
# if the l10n module exists, use split localize.sdf directly from there
.IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
# still check for existence as there may be no localization yet
commit d4e0d177170b2bee4cb6ddaf6670c1f7f6118eb4
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 29 19:23:22 2011 +0200
Update .gitignore with the new modules.
diff --git a/.gitignore b/.gitignore
index 9dff7ee..990b37a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,6 +122,9 @@
/formula
/fpicker
/framework
+/gdk-pixbuf
+/gettext
+/glib
/graphite
/helpcontent2
/hsqldb
@@ -145,7 +148,11 @@
/l10n
/l10ntools
/languagetool
+/libcroco
/libegg
+/libgsf
+/libpng
+/librsvg
/libtextcat
/libwpd
/libwpg
@@ -181,6 +188,7 @@
/package
/packimages
/padmin
+/pango
/postprocess
/psprint_config
/python
commit 41f2c7adead04881fbdd2b2e505c43cd3d79a92d
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 29 19:14:29 2011 +0200
Updates to make vcl building.
diff --git a/Repository.mk b/Repository.mk
index 584e63a..279250c 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -148,11 +148,12 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ graphite2_off \
jpeglib \
ooopathutils \
salcpprt \
+ vclmain \
zlib \
- graphite \
))
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d3b63ed..7dd7715 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -278,10 +278,14 @@ gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
gb_Library_PLAINLIBS_NONE += \
dl \
+ freetype \
+ ICE \
jpeg \
m \
pthread \
+ SM \
X11 \
+ Xext \
z
gb_Library_FILENAMES := \
commit d8c78f46b626120ed434a55d13d1d04c5e839e8f
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Apr 28 08:04:08 2011 +0200
Make 'make dev-install' do something even on Windows.
It creates an install set only, but better than just throwing an error ;-)
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 103cacb..bd06248 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -397,7 +397,6 @@ sub setglobalvariables
if ($installer::globals::unpackpath eq "") # unpackpath not set
{
$installer::globals::unpackpath = cwd();
- if ( $installer::globals::iswin ) { $installer::globals::unpackpath =~ s/\//\\/g; }
}
if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; }
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 83717fa..87bc9dc 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -13,6 +13,11 @@ use Cwd;
$path = '';
$do_link = 0;
+$is_windows = 0;
+
+if ($ENV{GUI} eq 'WNT') {
+ $is_windows = 1;
+}
# Workaround for system Mozilla
if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
@@ -78,11 +83,17 @@ if ( defined $ENV{DISABLE_STRIP} &&
$strip = "-dontstrip";
}
+$msi='';
+if ($is_windows) {
+ $msi = "-msitemplate $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/openoffice/msi_templates " .
+ "-msilanguage $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/win_ulffiles";
+}
+
print "Running LibreOffice installer\n";
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
"-f openoffice.lst -l $langs -p LibreOffice " .
- "-buildid $BUILD $destdir $strip " .
+ "-buildid $BUILD $destdir $strip $msi " .
"-simple $path") && die "Failed to install: $!";
if ($ENV{BUILD_TYPE} =~ m/ODK/) {
@@ -90,11 +101,11 @@ if ($ENV{BUILD_TYPE} =~ m/ODK/) {
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
"-f openoffice.lst -l en-US -p LibreOffice_SDK " .
- "-buildid $BUILD $destdir $strip " .
+ "-buildid $BUILD $destdir $strip $msi" .
"-simple $path") && die "Failed to install: $!";
}
print "Installer finished\n";
-if ($do_link) {
+if ($do_link && !$is_windows) {
`$ENV{SOLARENV}/bin/linkoo $path $ENV{SRC_ROOT}`;
}
commit 73848202876de5b01e5b2bd7e066cebe737b5f82
Merge: 8c5bd2e... af86d1f...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 22 15:07:18 2011 +0200
Merge branch 'DEV300_m106' into libreoffice-3-4
Conflicts:
Module_ooo.mk
Repository.mk
configure
configure.in
ooo.lst
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/makefile.mk
scp2/source/ooo/module_hidden_ooo.scp
solenv/config/sdev300.ini
solenv/config/ssolar.cmn
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/JunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/Module.mk
solenv/gbuild/Output.mk
solenv/gbuild/SdiTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/platform/winmingw.mk
solenv/inc/minor.mk
diff --cc Module_ooo.mk
index 9835771,b4f0a24..8805ac8
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@@ -28,34 -28,22 +28,35 @@@
$(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
- comphelper \
- editeng \
- framework \
- padmin \
- sfx2 \
- sot \
- svl \
- svtools \
- svx \
- sw \
- toolkit \
- tools \
+ comphelper \
+ editeng \
+ framework \
+ padmin \
+ sfx2 \
+ sot \
+ svl \
+ svtools \
+ svx \
+ sw \
+ toolkit \
+ tools \
+ vcl \
- unoxml \
- xmloff \
- vbahelper \
+ unoxml \
+ xmloff \
+ vbahelper \
+))
+
+# these have only migrated subsequentcheck for now
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+ chart2 \
+ configmgr \
+ dbaccess \
+ forms \
+ linguistic \
+ qadevOOo \
+ sal \
+ ucb \
+ unotools \
))
# vim: set noet ts=4 sw=4:
diff --cc Repository.mk
index fc5aa93,c514693..584e63a
mode 100644,100755..100755
--- a/Repository.mk
+++ b/Repository.mk
@@@ -43,13 -43,15 +43,16 @@@ $(eval $(call gb_Helper_register_execut
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ AppleRemote \
avmedia \
basegfx \
+ basebmp \
cui \
+ desktop_detector \
drawinglayer \
editeng \
- eggtray \
+ for \
+ forui \
fwe \
fwi \
fwk \
@@@ -97,9 -97,11 +105,12 @@@ $(eval $(call gb_Helper_register_librar
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ test \
cppunit \
icuuc \
+ icule \
+ graphite_dll \
+ cppunit \
rdf \
xslt \
))
@@@ -109,7 -111,9 +120,8 @@@ $(eval $(call gb_Helper_register_librar
comphelper \
i18nisolang1 \
i18nutil \
+ jvmaccess \
ucbhelper \
- vos3 \
))
$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
@@@ -139,8 -145,9 +151,8 @@@ $(eval $(call gb_Helper_register_static
jpeglib \
ooopathutils \
salcpprt \
- vclmain \
zlib \
+ graphite \
- vclmain \
))
# vim: set noet sw=4 ts=4:
diff --cc RepositoryFixes.mk
index 15a0f87,f5776f7..f7aff97
mode 100644,100755..100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@@ -111,11 -128,20 +111,16 @@@ gb_Library_FILENAMES := $(patsubst z:iz
gb_Library_NOILIBFILENAMES:=\
advapi32 \
gdi32 \
+ gdiplus \
+ graphite_dll \
gnu_getopt \
icuuc \
+ icule \
+ imm32\
kernel32 \
+ msimg32 \
msvcrt \
+ msvcprt \
mpr \
oldnames \
ole32 \
diff --cc configure.in
index 64f88ec,10dcbb3..537c848
mode 100755,100644..100755
--- a/configure.in
+++ b/configure.in
@@@ -1,1331 -1,879 +1,1345 @@@
-dnl /******************************************************************
-dnl * vi:set sw=3 ts=3 et:
-dnl *
-dnl * Name: configure.in
-dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
-dnl * Date: $Date: 2008-09-08 07:38:40 $
-dnl *
-dnl * Desc: This file serves as input for the GNU autoconf package
-dnl * in order to create a configure script.
-dnl * In this stage configure just checks the pre-requisites
-dnl * necessary to build OpenOffice.org
-dnl *
-dnl *
-dnl ******************************************************************/
-AC_REVISION( $Revision: 1.290 $ )
+dnl configure.in serves as input for the GNU autoconf package
+dnl in order to create a configure script.
+
+AC_INIT([LibreOffice], [3.3],,, [http://documentfoundation.org/])
AC_PREREQ(2.50)
-AC_INIT()
echo "$@" >config.parms
-AC_ARG_WITH(gnu-patch,
-[ --with-gnu-patch Specify location of GNU patch on Solaris or FreeBSD
-],,)
-AC_ARG_WITH(agg,
-[ --without-agg Disable the use of agg altogether
-],,with_agg=yes)
-AC_ARG_WITH(gnu-cp,
-[ --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD
-],,)
+
+dnl ===================================================================
+dnl Optional Features (--enable/disable-)
+dnl ===================================================================
+
+dnl ---------- Extensions ----------
+
+AC_ARG_ENABLE(ext-barcode,
+ AS_HELP_STRING([--enable-ext-barcode],
+ [Enables the Barcode extension.]),
+,)
+
+AC_ARG_ENABLE(ext-diagram,
+ AS_HELP_STRING([--enable-ext-diagram],
+ [Enables the Diagram extension.]),
+,)
+
+AC_ARG_ENABLE(ext-google-docs,
+ AS_HELP_STRING([--enable-ext-google-docs],
+ [Download and enables the Google Documents extension.]),
+,)
+
+AC_ARG_ENABLE(ext-hunart,
+ AS_HELP_STRING([--enable-ext-hunart],
+ [Enables the Hungarian Cross-reference Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-lightproof,
+ AS_HELP_STRING([--enable-ext-lightproof],
+ [Enables the Lightproof extension.]),
+,)
+
+AC_ARG_ENABLE(ext-mysql-connector,
+ AS_HELP_STRING([--enable-ext-mysql-connector],
+ [Enables the build of the MySQL Connector/LibO extension. This requires
+ access to the MySQL Connector/C (aka libmysql) to be given, too, with
+ either the --with-system-mysql or --with-libmysql-path option.]),
+,)
+
+AC_ARG_ENABLE(ext-nlpsolver,
+ AS_HELP_STRING([--enable-ext-nlpsolver],
+ [Download and enables the NLPSolver extension.]),
+,)
+
+AC_ARG_ENABLE(ext-ct2n,
+ AS_HELP_STRING([--enable-ext-ct2n],
+ [Enables the ConvertTextToNumber extension.]),
+,)
+
+AC_ARG_ENABLE(ext-numbertext,
+ AS_HELP_STRING([--enable-ext-numbertext],
+ [Enables the Numbertext extension.]),
+,)
+
+AC_ARG_ENABLE(ext-oooblogger,
+ AS_HELP_STRING([--enable-ext-oooblogger],
+ [Download and enables the OOo Blogger extension.]),
+,)
+
+AC_ARG_ENABLE(ext-pdfimport,
+ AS_HELP_STRING([--enable-ext-pdfimport],
+ [Enables the PDF Import extension and xpdf.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-console,
+ AS_HELP_STRING([--enable-ext-presenter-console],
+ [Enables the Presenter Console extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-minimizer,
+ AS_HELP_STRING([--enable-ext-presenter-minimizer],
+ [Enables the Presentation Minimizer extension.]),
+,)
+
+AC_ARG_ENABLE(ext-report-builder,
+ AS_HELP_STRING([--enable-ext-report-builder],
+ [Enables the build of the Report Builder extension.]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-beanshell,
+ AS_HELP_STRING([--enable-ext-scripting-beanshell],
+ [Enables support for scripts in BeanShell.]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-javascript,
+ AS_HELP_STRING([--enable-ext-scripting-javascript],
+ [Enables support for scripts in JavaScript.]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-python,
+ AS_HELP_STRING([--enable-ext-scripting-python],
+ [Enables support for scripts in Python.]),
+,)
+
+AC_ARG_ENABLE(ext-typo,
+ AS_HELP_STRING([--enable-ext-typo],
+ [Enables the Typography Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-validator,
+ AS_HELP_STRING([--enable-ext-validator],
+ [Enables the Validator extension.]),
+,)
+
+AC_ARG_ENABLE(ext-watch-window,
+ AS_HELP_STRING([--enable-ext-watch-window],
+ [Enables the Watch Window extension to Calc.]),
+,)
+
+AC_ARG_ENABLE(ext-wiki-publisher,
+ AS_HELP_STRING([--enable-ext-wiki-publisher],
+ [Enables the Wiki Publisher extension.]),
+,)
+
+dnl ---------- *** ----------
+
AC_ARG_ENABLE(graphite,
-[ --enable-graphite Enables the compilation of Graphite smart font rendering
-],,)
-AC_ARG_WITH(system-graphite,
-[ --with-system-graphite use graphite library already installed on system
-],,)
+ AS_HELP_STRING([--enable-graphite],
+ [Enables the compilation of Graphite smart font rendering.]),
+,)
+
AC_ARG_ENABLE(ldap,
-[ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla
- or OpenLDAP LDAP SDK
-],,)
+ AS_HELP_STRING([--disable-ldap],
+ [Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK]),
+,)
+
AC_ARG_ENABLE(fetch-external,
-[ --disable-fetch-external Disables fetching external tarballs from web sources.
-],,)
-AC_ARG_WITH(external-tar,
-[ --with-external-tar=<TARFILE PATH> Specify path to tarfiles manually ],
-[ TARFILE_LOCATION="$withval"
-])
-AC_ARG_WITH(openldap,
-[ --with-openldap Enables the use of the OpenLDAP LDAP SDK instead
- of the Netscape/Mozilla one
-],,)
+ AS_HELP_STRING([--disable-fetch-external],
+ [Disables fetching external tarballs from web sources.]),
+,)
+
AC_ARG_ENABLE(lockdown,
-[ --enable-lockdown Enables the gconf integration work in OOo
-],,)
+ AS_HELP_STRING([--disable-lockdown],
+ [Disables the gconf integration work in LibO.]),
+,enable_lockdown=yes)
+
AC_ARG_ENABLE(vba,
-[ --disable-vba disables the vba compatibility feature
-],,)
-AC_ARG_WITH(vba-package-format,
-[ --with-vba-package-format specify package format for vba compatibility api.
- Specifying "builtin" means the api component and
- associated type library are part of the installation set.
- Specifying "extn" creates an uno extension that is
- part of the installation set ( located in the program
- directory ) that MUST be optionly registered using
- either the unopkg executeable or the extension manager
- gui.
-
- Note: "builtin" is the default, "extn" can cause
- problems.
- Usage: --with-vba-package-format="builtin" or
- --with-vba-package-format="extn"
-],,)
+ AS_HELP_STRING([--disable-vba],
+ [Disables the vba compatibility feature.]),
+,)
+
AC_ARG_ENABLE(pch,
-[ --enable-pch EXPERIMENTAL: Enables precompiled header support for C++.
-],,)
+ AS_HELP_STRING([--enable-pch],
+ [EXPERIMENTAL: Enables precompiled header support for C++.]),
+,)
+
AC_ARG_ENABLE(mozilla,
-[ --disable-mozilla OO.o usually includes a strangely hacked up mozilla
- binary for your platform, to build without this
- version, use this option.
-],,enable_mozilla="yes")
-AC_ARG_WITH(fonts,
-[ --without-fonts OOo includes some third-party fonts to provide a reliable
- basis for help content, templates, samples, etc.
- When these fonts are already known to be available on the
- system then you should use this option.
-],,)
-AC_ARG_WITH(ppds,
-[ --without-ppds Removes Postscript Printer definition files from
- openoffice.org installation set, for people building
- for specific distributions where PPDs are known to be
- already available (every recent distro with CUPS
- backend)
-],,)
-AC_ARG_WITH(afms,
-[ --without-afms Removes bitmap font files from openoffice.org
- installation set, for people building for specific
- distributions where AFM files or TrueType Fonts
- are known to be available.
-],,)
+ AS_HELP_STRING([--disable-mozilla],
+ [LibO usually includes a strangely hacked up mozilla binary for your
+ platform, to build without this version, use this option.]),
+,enable_mozilla=yes)
+
AC_ARG_ENABLE(epm,
-[ --disable-epm OO.o includes self-packaging code, that requires
- epm, however epm is useless for large scale
- package building.
-],,enable_epm="yes")
-AC_ARG_WITH(epm,
-[ --with-epm Decides which epm to use. Default is to use
- the one from the system if one is built. When
- either this is not there or you say =internal
- epm will be built.
-],,)
-AC_ARG_WITH(package-format,
-[ --with-package-format specify package format(s) for OOo installsets.
- Default is "normal" one of the OS/Distribution.
+ AS_HELP_STRING([--enable-epm],
+ [LibO includes self-packaging code, that requires epm, however epm is
+ useless for large scale package building.]),
+,enable_epm=no)
+
+AC_ARG_ENABLE(activex_component,
+ AS_HELP_STRING([--disable-activex-component],
+ [Remove support for ActiveX embedding of LibO.]),
+,enable_activex_component=yes)
- Usage: --with-package-format="foo bar"
-],,)
AC_ARG_ENABLE(odk,
-[ --disable-odk OO.o includes an ODK, office development kit
- which some packagers may with to build without
-],,enable_odk="yes")
+ AS_HELP_STRING([--disable-odk],
+ [LibO includes an ODK, office development kit which some packagers may
+ with to build without.]),
+,enable_odk=yes)
+
AC_ARG_ENABLE(mathmldtd,
-[ --disable-mathmldtd disable mathmldtd
- (useful for distributions that want to avoid packaging
- it)
-],,enable_mathmldtd="yes")
+ AS_HELP_STRING([--disable-mathmldtd],
+ [Disable mathmldtd (useful for distributions that want to avoid
+ packaging it).]),
+,enable_mathmldtd=yes)
+
AC_ARG_ENABLE(evolution2,
-[ --enable-evolution2 Allows the built-in evolution 2 addressbook
- connectivity build to be enabled.
-],,)
-AC_ARG_WITH(system-stdlibs,
-[ --with-system-stdlibs use libstdc++/libgcc_s already on system
-],,)
+ AS_HELP_STRING([--enable-evolution2],
+ [Allows the built-in evolution 2 addressbook connectivity build to be
+ enabled.]))
+
AC_ARG_ENABLE(cups,
-[ --disable-cups disable cups support in the psprint project
-],,enable_cups=yes)
+ AS_HELP_STRING([--disable-cups],
+ [Disable cups support in the psprint project.]))
+
AC_ARG_ENABLE(fontconfig,
-[ --disable-fontconfig disable support for the fontconfig library
-],,enable_fontconfig=yes)
+ AS_HELP_STRING([--disable-fontconfig],
+ [Disable support for the fontconfig library.]),
+,enable_fontconfig=yes)
+
AC_ARG_ENABLE(directx,
-[ --disable-directx Remove DirectX implementation for the new XCanvas
- interface. The DirectX support requires more stuff
- installed on Windows to compile.
- (DirectX SDK, GDI+ libs)
-],,enable_directx=yes)
+ AS_HELP_STRING([--disable-directx],
+ [Remove DirectX implementation for the new XCanvas interface.
+ The DirectX support requires more stuff installed on Windows to
+ compile. (DirectX SDK, GDI+ libs)]),
+,enable_directx=yes)
+
AC_ARG_ENABLE(activex,
-[ --disable-activex Disable the use of ActiveX for windows build.
- This switch is mandatory when using VC++ 2005/2008 Express.
-],,)
+ AS_HELP_STRING([--disable-activex],
+ [Disable the use of ActiveX for windows build.])
+ [
+ This switch is mandatory when using VC++ 2008 Express.
+ ],
+,)
AC_ARG_ENABLE(atl,
-[ --disable-atl Disable the use of ATL for windows build.
- This switch is mandatory when using VC++ 2005/2008 Express.
-],,)
+ AS_HELP_STRING([--disable-atl],
+ [Disable the use of ATL for windows build.])
+ [
+ This switch is mandatory when using VC++ 2008 Express.
+ ],
+,)
AC_ARG_ENABLE(symbols,
-[ --enable-symbols Include debugging symbols in output.
- WARNING - a complete build needs 8 Gb of space and
- takes much longer. (enables -g compiler flag)
-
- --enable-symbols=SMALL sets the gcc -g1 setting
- which is smaller.
-
+ AS_HELP_STRING([--enable-symbols],
+ [Include debugging symbols in output. WARNING - a complete build needs
+ 8 Gb of space and takes much longer (enables -g compiler flag).])
+ [
Enabling symbols disables the stripping of the solver
(--disable-strip-solver).
-],,)
-AC_ARG_ENABLE(strip-solver,
-[ --disable-strip-solver Disable the stripping of the solver.
- By default the solver is stripped unless a build with
- debugging symbols (--enable-symbols) is requested.
+ ],
+,)
+AC_ARG_ENABLE(strip-solver,
+ AS_HELP_STRING([--disable-strip-solver],
+ [Disable the stripping of the solver. By default the solver is stripped
+ unless a build with debugging symbols (--enable-symbols) is requested.])
+ [
This switch allows to override this setting.
-],,)
+ ],
+,)
+
AC_ARG_ENABLE(werror,
-[ --enable-werror Turn warnings to errors. (Has no effect in modules
- where the treating of warnings as errors is disabled
- explicitely)
-],,)
+ AS_HELP_STRING([--enable-werror],
+ [Turn warnings to errors. (Has no effect in modules where the treating
+ of warnings as errors is disabled explicitly.)]),
+,)
+
AC_ARG_ENABLE(debug,
-[ --enable-debug Include debugging symbols from --enable-symbols
- plus extra debugging code. Extra large build!
- (enables -g compiler flag and dmake debug=true)
-],,)
+ AS_HELP_STRING([--enable-debug],
+ [Include debugging symbols from --enable-symbols plus extra debugging
+ code. Extra large build! (enables -g compiler flag and dmake debug=true)
+ If you need even more verbose output, build a module with
+ "build -- debug=true dbglevel=2".]))
+
AC_ARG_ENABLE(dbgutil,
-[ --enable-dbgutil Include additional debugging utilities, such as
- assertions, object counting, etc. Larger build.
- Independent from --enable-debug
-],,)
+ AS_HELP_STRING([--enable-dbgutil],
+ [Include additional debugging utilities, such as assertions, object
+ counting, etc. Larger build. Independent from --enable-debug]))
+
AC_ARG_ENABLE(crashdump,
-[ --enable-crashdump Enable the crashdump feature code.
-],,)
-AC_ARG_ENABLE(cl-standard,
-[ --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing
- standard compiler. ( This just disavles optimization
- options and therefore removes a lot of warnings when
- using the cheaper standard compiler. )
-],,)
+ AS_HELP_STRING([--enable-crashdump],
+ [Enable the crashdump feature.]))
+
+AC_ARG_ENABLE(python,
+ AS_HELP_STRING([--disable-python],
+ [Disable build of Python 2.x UNO API.]))
AC_ARG_ENABLE(gtk,
-[ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
- where Gtk+ is available.
-],,enable_gtk=yes)
-AC_ARG_ENABLE(gstreamer,
-[ --disable-gstreamer Determines whether to use the GStreamer media
- backend on platforms where GStreamer is available.
-],,enable_gstreamer=yes)
+ AS_HELP_STRING([--disable-gtk],
+ [Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available.]),
+,enable_gtk=yes)
+
AC_ARG_ENABLE(systray,
-[ --disable-systray Determines whether to build the systray quickstarter.
-],,enable_systray=yes)
+ AS_HELP_STRING([--disable-systray],
+ [Determines whether to build the systray quickstarter.]),
+,enable_systray=yes)
+
+AC_ARG_ENABLE(broffice,
+ AS_HELP_STRING([--disable-broffice],
+ [When disabled, broffice specific branding artwork for use in the pt_BR
+ locale is removed, giving uniform branding.]),
+,enable_broffice=yes)
+
AC_ARG_ENABLE(cairo,
-[ --enable-cairo Determines whether to use Cairo library on
- platforms where Cairo is available.
-],,enable_cairo=no)
-AC_ARG_WITH(system-cairo,
-[ --with-system-cairo Use Cairo libraries already on system
-],,)
+ AS_HELP_STRING([--disable-cairo],
+ [Determines whether to use Cairo library on platforms where Cairo is
+ available.]),
+,enable_cairo=yes)
+
+ AC_ARG_ENABLE(librsvg,
+ [ --enable-librsvg Determines whether to use librsvg library on
+ platforms where librsvg is available.
+ (actually, it is possible to build with
+ --disable-librsvg and to still have SVG support
+ within a running soffice instance, since this
+ dependency is a runtime only dependency.
+ To have SVG suppport at runtime, the librsvg, the cairo
+ and the gobject library - and all depending libraries
+ as well - need to be accessible by the running soffice
+ instance.
+ The intention of defaulting this flag to yes is to
+ indicate this fact to the build maintainer)
+ ],,enable_librsvg=yes)
AC_ARG_ENABLE(opengl,
-[ --enable-opengl Determines whether to build the OpenGL 3D slide
- transitions component
-],,enable_opengl=no)
+ AS_HELP_STRING([--disable-opengl],
+ [Determines whether to build the OpenGL 3D slide transitions component.]),
+,enable_opengl=yes)
+
AC_ARG_ENABLE(dbus,
-[ --enable-dbus Determines whether to enable presentation mode
- screensaver control under GNOME via DBUS
-],,enable_dbus=no)
+ AS_HELP_STRING([--enable-dbus],
+ [Determines whether to enable presentation mode screensaver control
+ under GNOME via DBUS.]),
+,enable_dbus=no)
+
AC_ARG_ENABLE(gconf,
-[ --disable-gconf Determines whether to use the GConf support
-],,enable_gconf=yes)
+ AS_HELP_STRING([--disable-gconf],
+ [Determines whether to use the GConf support.]),
+,enable_gconf=yes)
+
AC_ARG_ENABLE(gnome-vfs,
-[ --disable-gnome-vfs Determines whether to use the Gnome Virtual Filing
- System on platforms where that VFS is available
-],,enable_gnome_vfs=yes)
+ AS_HELP_STRING([--disable-gnome-vfs],
+ [Determines whether to use the Gnome Virtual Filing System on platforms
+ where that VFS is available.]),
+,enable_gnome_vfs=yes)
+
AC_ARG_ENABLE(gio,
-[ --enable-gio Determines whether to use the GIO support
-],,enable_gio=no)
+ AS_HELP_STRING([--enable-gio],
+ [Determines whether to use the GIO support.]),
+,enable_gio=no)
+
AC_ARG_ENABLE(static-gtk,
-[ --enable-static-gtk Modules that are linked against gtk libraries use
- the static libraries instead of the dynamic ones.
- (enables -Bstatic linker flag for gtk libraries)
-],,)
+ AS_HELP_STRING([--enable-static-gtk],
+ [Modules that are linked against gtk libraries use the static libraries
+ instead of the dynamic ones. (Enables -Bstatic linker flag for gtk libraries.)]),
+,)
+
AC_ARG_ENABLE(layout,
-[ --enable-layout Enable the compilation and use of layout dialogs
-],,)
+ AS_HELP_STRING([--enable-layout],
+ [Enable the compilation and use of layout dialogs.]),
+,)
+
AC_ARG_ENABLE(build-mozilla,
-[ --disable-build-mozilla Use this option if you do not want to build the
- mozilla components from the mozilla source code but
- take precompiled zips
-],,)
-AC_ARG_WITH(mozilla-version,
-[ --with-mozilla-version Choose which version of mozilla to use while building
- mozilla. Default: 1.7.5.
- Note that not all versions are supported.
-],,)
-AC_ARG_WITH(mozilla-toolkit,
-[ --with-mozilla-toolkit Choose which GUI toolkit to use while building mozilla
- components. Default: gtk2
-],,)
+ AS_HELP_STRING([--disable-build-mozilla],
+ [Use this option if you do not want to build the mozilla components from
+ the mozilla source code but take precompiled zips.]),
+,)
+
AC_ARG_ENABLE(nss_module,
-[ --disable-nss-module Whether to use provided NSS module
-],,enable_nss_module=yes)
+ AS_HELP_STRING([--disable-nss-module],
+ [Whether to use provided NSS module.]),
+,enable_nss_module=yes)
+
AC_ARG_ENABLE(kde,
-[ --enable-kde Determines whether to use Qt/KDE vclplug on platforms
- where Qt and KDE are available.
-],,)
+ AS_HELP_STRING([--enable-kde],
+ [Determines whether to use Qt3/KDE3 vclplug on platforms where Qt3 and
+ KDE3 are available.]),
+,)
+
AC_ARG_ENABLE(kdeab,
-[ --disable-kdeab Disable the KDE address book support
-],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
+ AS_HELP_STRING([--disable-kdeab],
+ [Disable the KDE3 address book support.]),
+,
+ if test "$enable_kde" = "yes"; then
+ enable_kdeab=yes;
+ fi
+)
+
AC_ARG_ENABLE(kde4,
-[ --enable-kde4 Determines whether to use Qt4/KDE4 vclplug on platforms
- where Qt4 and KDE4 are available. May be used with --enable-kde
- if you want to support both KDE3 and KDE4.
-],,)
+ AS_HELP_STRING([--enable-kde4],
+ [Determines whether to use Qt4/KDE4 vclplug on platforms where Qt4 and
+ KDE4 are available. May be used with --enable-kde if you want to support
+ both KDE3 and KDE4.]),
+,)
+
AC_ARG_ENABLE(binfilter,
-[ --disable-binfilter Disable legacy binary file formats filters
-],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
+ AS_HELP_STRING([--enable-binfilter],
+ [Enable legacy binary file formats filters build.]),
+,enable_binfilter=no
+)
+
AC_ARG_ENABLE(rpath,
-[ --disable-rpath Disable the use of relative paths in shared libraries
-],,)
-AC_ARG_ENABLE(pam,
-[ --disable-pam Disable pam support.
-],,)
-AC_ARG_ENABLE(pam-link,
-[ --enable-pam-link link with libpam instead of dynamically open it
-],,)
-AC_ARG_ENABLE(crypt-link,
-[ --disable-crypt-link disable linking with libcrypt instead of dynamically
- open it (needed for ancient GNU/Linux distributions
- without crypt()/libcrypt)
-],,enable_crypt_link=yes)
+ AS_HELP_STRING([--disable-rpath],
+ [Disable the use of relative paths in shared libraries.]),
+,)
+
AC_ARG_ENABLE(xrender-link,
-[ --enable-xrender-link link with libXrender instead of dynamically open it
-],,)
+ AS_HELP_STRING([--enable-xrender-link],
+ [Link with libXrender instead of dynamically open it.]),
+,)
+
AC_ARG_ENABLE(randr,
-[ --disable-randr disable RandR support in the vcl project
-],,enable_randr=yes)
+ AS_HELP_STRING([--disable-randr],
+ [Disable RandR support in the vcl project.]),
+,enable_randr=yes)
+
AC_ARG_ENABLE(randr-link,
-[ --disable-randr-link disable linking with libXrandr, instead dynamically
- open it at runtime
-],,enable_randr_link=yes)
+ AS_HELP_STRING([--disable-randr-link],
+ [Disable linking with libXrandr, instead dynamically open it at runtime.]),
+,enable_randr_link=yes)
+
+AC_ARG_ENABLE(gstreamer,
+ AS_HELP_STRING([--disable-gstreamer],
+ [Disable building the gstreamer avmedia backend.]),
+,enable_gstreamer=yes)
+
+AC_ARG_ENABLE(neon,
+ AS_HELP_STRING([--disable-neon],
+ [Disable neon and the compilation of webdav binding.]),
+,)
+
+AC_ARG_ENABLE(Xaw,
+ AS_HELP_STRING([--disable-Xaw],
+ [Disables the use of Xaw for the Netscape/Mozilla plugin.]),
+,)
+
+AC_ARG_ENABLE(check-only,
+ AS_HELP_STRING([--enable-check-only],
+ [Use this option option if you just want to check your environment.
+ This option stops the generation of an ????env.set.])
+ [
+ Usage: --enable-check-only=yes
+ ],
+,)
+
+AC_ARG_ENABLE(ccache-skip,
+ AS_HELP_STRING([--enable-ccache-skip],
+ [Allow the use of --ccache-skip to escape compiler flags that would
+ otherwise prevent caching of the result (currently used on Mac only)
+ NOTE: requires patched version because of a bug in ccache (see issue
+ 104567 for details and patch) explicitly enable if your version of
+ ccache doesn't identify as version 2.4_OOo. (default=auto)]),
+,enable_ccache_skip=auto)
+
+AC_ARG_ENABLE(build-unowinreg,
+ AS_HELP_STRING([--enable-build-unowinreg],
+ [Do not use the prebuilt unowinreg.dll. Build it instead. The MinGW C++
+ compiler is needed on Linux.])
+ [
+ Usage: --enable-build-unowinreg
+ ],
+,)
+
+AC_ARG_ENABLE(verbose,
+ AS_HELP_STRING([--enable-verbose],
+ [Increase build verbosity.])[
+ --disable-verbose Decrease build verbosity.],
+,)
+
+AC_ARG_ENABLE(dependency-tracking,
+ AS_HELP_STRING([--enable-dependency-tracking],
+ [Do not reject slow dependency extractors.])[
+ --disable-dependency-tracking
+ Disables generation of dependency information.
+ Speed up one-time builds.],
+,)
+
+AC_ARG_ENABLE(icecream,
+ AS_HELP_STRING([--enable-icecream],
+ [Use the 'icecream' distributed compiling tool to speedup the compilation.
+ It defaults to /opt/icecream for the location of the icecream gcc/g++
+ wrappers, you can override that using --with-gcc-home=/the/path switch.]),
+,)
+
+AC_ARG_ENABLE(zenity,
+ AS_HELP_STRING([--disable-zenity],
+ [Do not display a build icon in the notification area (on unix) during build.]),
+,enable_zenity=yes)
+
+AC_ARG_ENABLE(cl-x64,
+ AS_HELP_STRING([--enable-cl-x64],
+ [Use the Microsoft C/C++ x64 compiler instead of the default x86 one.]),
+,)
+
+AC_ARG_ENABLE(extra-gallery,
+ AS_HELP_STRING([--enable-extra-gallery],
+ [Add extra gallery content.]),
+,)
+
+AC_ARG_ENABLE(extra-template,
+ AS_HELP_STRING([--enable-extra-template],
+ [Add extra temaplte content.]),
+,)
+
+AC_ARG_ENABLE(extra-sample,
+ AS_HELP_STRING([--enable-extra-sample],
+ [Add extra sample content.]),
+,)
+
+AC_ARG_ENABLE(extra-font,
+ AS_HELP_STRING([--enable-extra-font],
+ [Add extra font content.]),
+,)
+
+dnl ===================================================================
+dnl Optional Packages (--with/without-)
+dnl ===================================================================
+AC_ARG_WITH(gnu-patch,
+ AS_HELP_STRING([--with-gnu-patch],
+ [Specify location of GNU patch on Solaris or FreeBSD.]),
+,)
+
+AC_ARG_WITH(gnu-cp,
+ AS_HELP_STRING([--with-gnu-cp],
+ [Specify location of GNU cp on Solaris or FreeBSD.]),
+,)
+
+AC_ARG_WITH(system-graphite,
+ AS_HELP_STRING([--with-system-graphite],
+ [Use graphite library already installed on system.]),
+,)
+
+AC_ARG_WITH(external-tar,
+ AS_HELP_STRING([--with-external-tar=<TARFILE PATH>],
+ [Specify path to tarfiles manually.]),
+ TARFILE_LOCATION=$withval ,
+)
+
+AC_ARG_WITH(linked-git,
+ AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>],
+ [Specify another checkout's clonedir to re-use. This makes use of
+ git-new-workdir, and saves a lot of diskspace when having multiple
+ trees side-by-side.]),
+ GIT_LINK_SRC=$withval ,
+)
+
+AC_ARG_WITH(openldap,
+ AS_HELP_STRING([--with-openldap],
+ [Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one.]),
+,)
+
+AC_ARG_WITH(vba-package-format,
+ AS_HELP_STRING([--with-vba-package-format],
+ [Specify package format for vba compatibility api. Specifying "builtin"
+ means the api component and associated type library are part of the
+ installation set. Specifying "extn" creates an uno extension that is
+ part of the installation set (located in the program directory) that
+ MUST be optionly registered using either the unopkg executeable or the
+ extension manager gui.])
+ [
+ Note: "builtin" is the default, "extn" can cause
+ problems.
+
+ Usage: --with-vba-package-format="builtin" or
+ --with-vba-package-format="extn"
+ ],
+,)
+
+AC_ARG_WITH(theme,
+ AS_HELP_STRING([--with-theme="theme1 theme2..."],
+ [Choose which themes to include. By default those themes with an '*' are included.
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+,)
+
+AC_ARG_WITH(theme,
+ AS_HELP_STRING([--with-theme="theme1 theme2..."],
+ [Choose which themes to include. By default those themes with an '*' are included.
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+,)
+
+AC_ARG_WITH(extension-integration,
+ AS_HELP_STRING([--with-extension-integration],
+ [It will integrate the builded extensions to the installer of the product.
+ Please use this switch to include any extension.]),
+,)
+
+AC_ARG_WITH(helppack-integration,
+[
+ --without-helppack-integration It will not integrate the helppacks to the installer
+ of the product.
+ Please use this switch to use the online help or separate help packages.],
+,)
+
+AC_ARG_WITH(fonts,
+ AS_HELP_STRING([--without-fonts],
+ [LibO includes some third-party fonts to provide a reliable basis for
+ help content, templates, samples, etc. When these fonts are already
+ known to be available on the system then you should use this option.]),
+,)
+
+AC_ARG_WITH(ppds,
+ AS_HELP_STRING([--without-ppds],
+ [Removes Postscript Printer definition files from LibreOffice
+ installation set, for people building for specific distributions where
+ PPDs are known to be already available (every recent distro with CUPS backend).]),
+,)
+
+AC_ARG_WITH(afms,
+ AS_HELP_STRING([--without-afms],
+ [Removes bitmap font files from LibreOffice installation set, for people
+ building for specific distributions where AFM files or TrueType Fonts
+ are known to be available.]),
+,)
+
+AC_ARG_WITH(agfa-monotype-fonts,
+ AS_HELP_STRING([--with-agfa-monotype-fonts],
+ [Do not include the proprietary Agfa Monotype fonts
+ (even if present) in the LibreOffice installation
+ set.])
+,)
+
+AC_ARG_WITH(epm,
+ AS_HELP_STRING([--with-epm],
+ [Decides which epm to use. Default is to use the one from the system if
+ one is built. When either this is not there or you say =internal epm
+ will be built.]),
+,)
+
+AC_ARG_WITH(package-format,
+ AS_HELP_STRING([--with-package-format],
+ [Specify package format(s) for LibO installsets. Default is the
+ "normal" one of the OS/Distribution. Possible values: aix, bsd, deb,
+ inst, tardist, osx, pkg, rpm, setld, native, portable, archive, dmg,
+ installed, msi. Example: --with-package-format="deb dmg"]),
+,)
+
+AC_ARG_WITH(system-stdlibs,
+ AS_HELP_STRING([--with-system-stdlibs],
+ [Use libstdc++/libgcc_s already on system.]),
+,)
+
+AC_ARG_WITH(system-cairo,
+ AS_HELP_STRING([--with-system-cairo],
+ [Use Cairo libraries already on system.]),
+,)
+
+AC_ARG_WITH(mozilla-version,
+ AS_HELP_STRING([--with-mozilla-version],
+ [Choose which version of mozilla to use while building mozilla.
+ (default=1.7.5) Note that not all versions are supported.]),
+,)
+
+AC_ARG_WITH(mozilla-toolkit,
+ AS_HELP_STRING([--with-mozilla-toolkit],
+ [Choose which GUI toolkit to use while building mozilla components. (default=gtk2)]),
+,)
+
AC_ARG_WITH(myspell-dicts,
-[ --without-myspell-dicts Removes myspell dictionaries from openoffice.org
- installation set, for people building for specific
- distributions where the myspell dictionaries are
- installed from other sources
-],,)
+ AS_HELP_STRING([--without-myspell-dicts],
+ [Removes myspell dictionaries from LibreOffice installation set, for
+ people building for specific distributions where the myspell dictionaries
+ are installed from other sources.]),
+,)
+
AC_ARG_WITH(system-dicts,
-[ --with-system-dicts Use dictionaries from system paths- Specify
- them via --with-{dict,hyph,thes}-path=/path
- if you want to override the default ones
-],,)
+ AS_HELP_STRING([--with-system-dicts],
+ [Use dictionaries from system paths- Specify them via
+ --with-{dict,hyph,thes}-path=/path if you want to override the default ones.]),
+,)
+
AC_ARG_WITH(external-dict-dir,
-[ --with-external-dict-dir Specify external dictionary dir
-],,)
+ AS_HELP_STRING([--with-external-dict-dir],
+ [Specify external dictionary dir.]),
+,)
+
AC_ARG_WITH(external-hyph-dir,
-[ --with-external-hyph-dir Specify external hyphenation pattern dir
-],,)
+ AS_HELP_STRING([--with-external-hyph-dir],
+ [Specify external hyphenation pattern dir.]),
+,)
+
AC_ARG_WITH(external-thes-dir,
-[ --with-external-thes-dir Specify external thesaurus dir
-],,)
+ AS_HELP_STRING([--with-external-thes-dir],
+ [Specify external thesaurus dir.]),
+,)
+
AC_ARG_WITH(system-libs,
-[ --with-system-libs Use libs already on system -- enables all
- --with-system-* flags except mozilla and
- odbc/sane/xrender-header(s)
-],,)
+ AS_HELP_STRING([--with-system-libs],
+ [Use libs already on system -- enables all --with-system-* flags except
+ mozilla and odbc/sane/xrender-header(s).]),
+,)
+
AC_ARG_WITH(system-headers,
-[ --with-system-headers Use headers already on system -- enables all
- --with-system-* flags for external packages
- whose headers are the only entities used i.e.
- boost/vigra/odbc/sane/xrender-header(s)
-],,)
+ AS_HELP_STRING([--with-system-headers],
+ [Use headers already on system -- enables all --with-system-* flags for
+ external packages whose headers are the only entities used i.e.
+ boost/vigra/odbc/sane/xrender-header(s).]),
+,)
+
AC_ARG_WITH(system-jars,
-[ --without-system-jars When building with --with-system-libs, also the
- needed jars are expected on the system. Use this to
- disable that.
- (except for the db case where --with-system-db
- *has to* imply using the db.jar from there, too)
-],,)
+ AS_HELP_STRING([--without-system-jars],
+ [When building with --with-system-libs, also the needed jars are expected
+ on the system. Use this to disable that (except for the db case where
+ --with-system-db *has to* imply using the db.jar from there, too).]),
+,)
+
AC_ARG_WITH(system-zlib,
-[ --with-system-zlib Use zlib already on system
-],,)
+ AS_HELP_STRING([--with-system-zlib],
+ [Use zlib already on system.]),
+,)
+
AC_ARG_WITH(system-openssl,
-[ --with-system-openssl Use OpenSSL already on system
-],,)
+ AS_HELP_STRING([--with-system-openssl],
+ [Use OpenSSL already on system.]),
+,)
+
AC_ARG_WITH(system-jpeg,
-[ --with-system-jpeg Use jpeg already on system
-],,)
+ AS_HELP_STRING([--with-system-jpeg],
+ [Use jpeg already on system.]),
+,)
+
AC_ARG_WITH(system-expat,
-[ --with-system-expat Use expat already on system
-],,)
+ AS_HELP_STRING([--with-system-expat],
+ [Use expat already on system.]),
+,)
+
AC_ARG_WITH(system-libwpd,
-[ --with-system-libwpd Use libwpd already on system
-],,)
+ AS_HELP_STRING([--with-system-libwpd],
+ [Use libwpd already on system.]),
+,)
+
+AC_ARG_WITH(system-libwps,
+ AS_HELP_STRING([--with-system-libwps],
+ [Use libwps already on system.]),
+,)
+
+AC_ARG_WITH(system-libwpg,
+ AS_HELP_STRING([--with-system-libwpg],
+ [Use libwpg already on system.]),
+,)
+
AC_ARG_WITH(system-libxml,
-[ --with-system-libxml Use libxml already on system
-],,)
+ AS_HELP_STRING([--with-system-libxml],
+ [Use libxml already on system.]),
+,)
+
AC_ARG_WITH(system-python,
-[ --with-system-python Use python already on system
-],,)
+ AS_HELP_STRING([--with-system-python],
+ [Use python already on system.]),
+,with_system_python=yes)
+
+AC_ARG_WITH(system-translate-toolkit,
+ AS_HELP_STRING([--with-system-translate-toolkit],
+ [Use translate-toolkit already on system.]))
+
AC_ARG_WITH(system-icu,
-[ --with-system-icu Use icu already on system
-],,)
+ AS_HELP_STRING([--with-system-icu],
+ [Use icu already on system.]))
+
AC_ARG_WITH(system-poppler,
-[ --with-system-poppler Use poppler already on system
-],,)
+ AS_HELP_STRING([--with-system-poppler],
+ [Use system poppler. (only needed for pdfimport extension)]))
+
AC_ARG_WITH(system-db,
-[ --with-system-db Use berkeley db already on system
-],,)
+ AS_HELP_STRING([--with-system-db],
+ [Use berkeley db already on system.]))
+
AC_ARG_WITH(system-lucene,
-[ --with-system-lucene Use lucene already on system
-],,)
+ AS_HELP_STRING([--with-system-lucene],
+ [Use lucene already on system.]))
+
+AC_ARG_WITH(system-apache-commons,
+ AS_HELP_STRING([--with-system-apache-commons],
+ [Use apache commons libraries already on system.]))
+
AC_ARG_WITH(lucene-core-jar,
-[ --with-lucene-core-jar=JARFILE Specify path to jarfile manually ],
-[ LUCENE_CORE_JAR="$withval"
-])
+ AS_HELP_STRING([--with-lucene-core-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LUCENE_CORE_JAR=$withval)
+
AC_ARG_WITH(lucene-analyzers-jar,
-[ --with-lucene-analyzers-jar=JARFILE Specify path to jarfile manually ],
-[ LUCENE_ANALYZERS_JAR="$withval"
-])
-AC_ARG_ENABLE(mysql-connector,
-[ --enable-mysql-connector enables the build of the MySQL Connector/OOo extension.
- This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with
- either the --with-system-mysql or --with-libmysql-path option.
-],,)
+ AS_HELP_STRING([--with-lucene-analyzers-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LUCENE_ANALYZERS_JAR=$withval ,)
+
AC_ARG_WITH(system-mysql,
-[ --with-system-mysql Use MySQL libraries already on system, for building the MySQL Connector/OOo extension.
- Requires MYSQLCONFIG to point to the mysql_config executable.
-],,)
+ AS_HELP_STRING([--with-system-mysql],
+ [Use MySQL libraries already on system, for building the MySQL Connector/LibO
+ extension. Requires MYSQLCONFIG to point to the mysql_config executable.]))
+
AC_ARG_WITH(libmysql-path,
-[ --with-libmysql-path Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
+ AS_HELP_STRING([--with-libmysql-path],
+ [Use Connector/C (libmysql) installation for building the MySQL
+ Connector/LibO extension.])
+ [
+ Usage: --with-libmysql-path=<absolute path to
+ your Connector/C installation>
+ ],
+,)
- Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
-],,)
AC_ARG_WITH(system-mysql-cppconn,
-[ --with-system-mysql-cppconn Use MySQL C++ Connector libraries already on system
-],,)
+ AS_HELP_STRING([--with-system-mysql-cppconn],
+ [Use MySQL C++ Connector libraries already on system.]))
+
AC_ARG_WITH(system-hsqldb,
-[ --with-system-hsqldb Use hsqldb already on system
-],,)
+ AS_HELP_STRING([--with-system-hsqldb],
+ [Use hsqldb already on system.]))
+
AC_ARG_WITH(hsqldb-jar,
-[ --with-hsqldb-jar=JARFILE Specify path to jarfile manually ],
-[ HSQLDB_JAR="$withval"
-])
+ AS_HELP_STRING([--with-hsqldb-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ HSQLDB_JAR=$withval)
+
AC_ARG_WITH(system-beanshell,
-[ --with-system-beanshell Use beanshell already on system
-],,)
+ AS_HELP_STRING([--with-system-beanshell],
+ [Use beanshell already on system.]))
+
AC_ARG_WITH(beanshell-jar,
-[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
-[ BSH_JAR="$withval"
-])
-AC_ARG_ENABLE(presenter-extra-ui,
-[ --enable-presenter-extra-ui enables extra functionality during slideshow,
- e.g. selecting pen color, erasing drawings etc.
-],,enable_presenter_extra_ui=no)
-AC_ARG_ENABLE(minimizer,
-[ --enable-minimizer enables the build of the Presentation Minimizer extension
-],,)
-AC_ARG_ENABLE(presenter-console,
-[ --enable-presenter-console enables the build of the Presenter Console extension
-],,)
-AC_ARG_ENABLE(pdfimport,
-[ --enable-pdfimport enables the build of the PDF Import extension and xpdf
-],,)
-AC_ARG_ENABLE(wiki-publisher,
-[ --enable-wiki-publisher enables the build of the Wiki Publisher extension
-],,)
+ AS_HELP_STRING([--with-beanshell-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ BSH_JAR=$withval)
+
AC_ARG_WITH(commons-codec-jar,
-[ --with-commons-codec-jar=JARFILE Specify path to jarfile manually ],
-[ COMMONS_CODEC_JAR="$withval"
-])
+ AS_HELP_STRING([--with-commons-codec-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ COMMONS_CODEC_JAR=$withval)
+
AC_ARG_WITH(commons-lang-jar,
-[ --with-commons-lang-jar=JARFILE Specify path to jarfile manually ],
-[ COMMONS_LANG_JAR="$withval"
-])
+ AS_HELP_STRING([--with-commons-lang-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ COMMONS_LANG_JAR=$withval)
+
AC_ARG_WITH(commons-httpclient-jar,
-[ --with-commons-httpclient-jar=JARFILE Specify path to jarfile manually ],
-[ COMMONS_HTTPCLIENT_JAR="$withval"
-])
+ AS_HELP_STRING([--with-commons-httpclient-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ COMMONS_HTTPCLIENT_JAR=$withval)
+
AC_ARG_WITH(commons-logging-jar,
-[ --with-commons-logging-jar=JARFILE Specify path to jarfile manually ],
-[ COMMONS_LOGGING_JAR="$withval"
-])
+ AS_HELP_STRING([--with-commons-logging-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ COMMONS_LOGGING_JAR=$withval)
+
AC_ARG_WITH(servlet-api-jar,
-[ --servlet-api-jar=JARFILE Specify path to jarfile manually ],
-[ SERVLETAPI_JAR="$withval"
-])
-AC_ARG_ENABLE(report-builder,
-[ --enable-report-builder enables the build of the Report Builder extension
-],,)
+ AS_HELP_STRING([--with-servlet-api-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ SERVLETAPI_JAR=$withval)
+
AC_ARG_WITH(system-jfreereport,
-[ --with-system-jfreereport Use JFreeReport already on system
-],,)
+ AS_HELP_STRING([--with-system-jfreereport],
+ [Use JFreeReport already on system.]))
+
AC_ARG_WITH(sac-jar,
-[ --with-sac-jar=JARFILE Specify path to jarfile manually ],
-[ SAC_JAR="$withval"
-])
+ AS_HELP_STRING([--with-sac-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ SAC_JAR=$withval)
+
AC_ARG_WITH(libxml-jar,
-[ --with-libxml-jar=JARFILE Specify path to jarfile manually ],
-[ LIBXML_JAR="$withval"
-])
+ AS_HELP_STRING([--with-libxml-jar=JARFILE],
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list