Return-Path: X-Original-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8A66A6F28 for ; Tue, 19 Jul 2011 21:22:32 +0000 (UTC) Received: (qmail 38873 invoked by uid 500); 19 Jul 2011 21:22:32 -0000 Delivered-To: apmail-incubator-ooo-dev-archive@incubator.apache.org Received: (qmail 38817 invoked by uid 500); 19 Jul 2011 21:22:31 -0000 Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-dev@incubator.apache.org Received: (qmail 38809 invoked by uid 99); 19 Jul 2011 21:22:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jul 2011 21:22:31 +0000 X-ASF-Spam-Status: No, hits=0.7 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_NEUTRAL,T_FILL_THIS_FORM_SHORT X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [212.227.126.187] (HELO moutng.kundenserver.de) (212.227.126.187) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jul 2011 21:22:22 +0000 Received: from ulungele.erack.de (d107237.adsl.hansenet.de [80.171.107.237]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0M4klp-1Rf5Q23xCX-00zLus; Tue, 19 Jul 2011 23:22:00 +0200 Received: from erack by ulungele.erack.de with local (Exim 4.72) (envelope-from ) id 1QjHjr-0002dW-6U for ooo-dev@incubator.apache.org; Tue, 19 Jul 2011 23:21:59 +0200 Date: Tue, 19 Jul 2011 23:21:59 +0200 From: Eike Rathke To: ooo-dev@incubator.apache.org Subject: Re: A first try to remove some copyleft components from the build Message-ID: <20110719212159.GB9499@ulungele.erack.de> Mail-Followup-To: ooo-dev@incubator.apache.org References: <4E246A06.50301@gmx.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="kfjH4zxOES6UT95V" Content-Disposition: inline In-Reply-To: <4E246A06.50301@gmx.net> X-Accept-Language: de,en X-Nickname: erAck User-Agent: Mutt/1.5.21 (2010-09-15) X-Provags-ID: V02:K0:Ujhzx2DDSDuVcI969anZvzQH3OdyPM+TwZZMNvyzcGX IH9mdxhmBXHLCXWt9WVXwo/LT0PEkmYJa86lJE6cypW9DZt130 dx4CZN6FkaCA6zc4UVLhwaeM65Lq+6yRex8W6OVPT8lt7Bohwg uqbglctipBCx3wUn7MVAarbRlvrwzzBlm48x9QJwwQtusHkcp6 6H6gnw+1niyMGDf5a2+bw== --kfjH4zxOES6UT95V Content-Type: multipart/mixed; boundary="MfFXiAuoTsnnDAfZ" Content-Disposition: inline --MfFXiAuoTsnnDAfZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Mathias, On Monday, 2011-07-18 19:14:46 +0200, Mathias Bauer wrote: > I wanted to have it lazy ;-), so I just added a single configure switch > "--with-disable-copyleft" and did some quick and dirty changes to > configure.in. Well, that resulted in copyleft always disabled ;-) because in if test "$with-disable-copyleft" !=3D ""; then the expression is always true as "-disable-copyleft" appended to $with is a non-empty string.. that would had to use "$with_disable_copyleft" instead. > If someone wants to make the name or the implementation > nicer - please go for it. I never got when to use "yes/no" or > "true/false" in our configure.in. :-) --with-... options take any argument, for example a path where a library can be found. --enable-.../--disable-... indeed sometimes evaluate both, yes/no and true/false, but many places only check for yes/no, to me that's sufficient. I changed the option to --enable-copyleft with yes/no, defaulting to empty =3D=3D no. I also provided empty sets for the variables so invoking configure --enable-copyleft from an already set environment produces the desired results. Attached are on_top_of_mba.diff with only the changes to the previous version one can apply on top, and aooo_disable_copyleft.diff with the merged patches. Don't forget to run autoconf when applied. Builds fine on Debian Squeeze unxlngx6.pro, but I didn't get any install set, not even a .tar.gz, this helped: cd $SRC_ROOT/instsetoo_native/util dmake openoffice_en-US PKGFORMAT=3Dinstalled Smoketest worked, except one message: Gtk-Message: Failed to load module "gnomebreakpad": libgnomebreakpad.so: ca= nnot open shared object file: No such file or directory Eike --=20 PGP/OpenPGP/GnuPG encrypted mail preferred in all private communication. Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD --MfFXiAuoTsnnDAfZ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="on_top_of_mba.diff" Content-Transfer-Encoding: quoted-printable # HG changeset patch # Parent a5a03f67e2623c6756aa42f2eaa84566d9a8f5b0 really make copylefts an option diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -842,8 +842,8 @@ AC_ARG_ENABLE(verbose, AC_ARG_ENABLE(dependency-tracking, [ --disable-dependency-tracking Disables generation of dependency inform= ation. ],,) -AC_ARG_WITH(disable-copyleft, -[ --with-disable-copyleft Whether to use provided NSS module =20 +AC_ARG_ENABLE(copyleft, +[ --enable-copyleft Whether to use copyleft components. ],,) =20 BUILD_TYPE=3D"OOo" @@ -1231,8 +1231,8 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Build options dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -AC_MSG_CHECKING([whether to disable copyleft components]) -if test "$with-disable-copyleft" !=3D ""; then +AC_MSG_CHECKING([whether to enable copyleft components]) +if test "$enable_copyleft" !=3D "yes"; then =20 enable_mozilla=3D"no" enable_nss_module=3D"no" @@ -1245,17 +1245,29 @@ if test "$with-disable-copyleft" !=3D "";=20 DISABLE_HYPHEN=3D"TRUE" DISABLE_LIBWPD=3D"TRUE" DISABLE_SAXON=3D"TRUE" + DISABLE_NEON=3D"TRUE" BUILD_EPM=3D"NO" =20 -AC_MSG_RESULT([yes]) - + AC_MSG_RESULT([yes]) + +else + + DISABLE_HUNSPELL=3D + DISABLE_HYPHEN=3D + DISABLE_LIBWPD=3D + DISABLE_SAXON=3D + DISABLE_NEON=3D + + AC_MSG_RESULT([no]) + +fi AC_SUBST(DISABLE_HUNSPELL) AC_SUBST(DISABLE_HYPHEN) AC_SUBST(DISABLE_LIBWPD) AC_SUBST(DISABLE_SAXON) +AC_SUBST(DISABLE_NEON) AC_SUBST(BUILD_EPM) =20 -fi =20 AC_MSG_CHECKING([whether to enable native CUPS support]) if test "$test_cups" =3D "yes" -a \( "$enable_cups" =3D "yes" -o "$enable_= cups" =3D "TRUE" \) ; then @@ -3652,7 +3664,7 @@ AC_SUBST(SYSTEM_EXPAT) dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Check for system libwpd dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -if test "with-disable-copyleft" =3D=3D ""; then +if test -n "$enable_copyleft" -a "$enable_copyleft" !=3D "no"; then AC_MSG_CHECKING([which libwpd to use]) if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \ test "$with_system_libwpd" !=3D "no"; then @@ -4125,7 +4137,7 @@ AC_SUBST(BSH_JAR) dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Check for system saxon dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -if test "with-disable-copyleft" =3D=3D ""; then +if test -n "$enable_copyleft" -a "$enable_copyleft" !=3D "no"; then AC_MSG_CHECKING([which saxon to use]) if test -n "$with_system_saxon" -o -n "$with_system_libs" && \ test "$with_system_saxon" !=3D "no" && test "$with_system_jars" != =3D "no"; then @@ -5129,7 +5141,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Check for system hunspell dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -if test "with-disable-copyleft" =3D=3D ""; then +if test -n "$enable_copyleft" -a "$enable_copyleft" !=3D "no"; then =20 AC_MSG_CHECKING([which libhunspell to use]) if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \ --MfFXiAuoTsnnDAfZ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="aooo_disable_copyleft.diff" Content-Transfer-Encoding: quoted-printable # HG changeset patch # Parent c904c194446275403ad0332f003072ea4d39cc12 * * * really make copylefts an option diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -842,6 +842,9 @@ AC_ARG_ENABLE(verbose, AC_ARG_ENABLE(dependency-tracking, [ --disable-dependency-tracking Disables generation of dependency inform= ation. ],,) +AC_ARG_ENABLE(copyleft, +[ --enable-copyleft Whether to use copyleft components. +],,) =20 BUILD_TYPE=3D"OOo" =20 @@ -1227,6 +1230,45 @@ AC_SUBST(DISABLE_STRIP) dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Build options dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +AC_MSG_CHECKING([whether to enable copyleft components]) +if test "$enable_copyleft" !=3D "yes"; then + + enable_mozilla=3D"no" + enable_nss_module=3D"no" + enable_gstreamer=3D"no" + enable_epm=3D"no" + with_myspell_dicts=3D"no" + enable_neon=3D"no" + + DISABLE_HUNSPELL=3D"TRUE" + DISABLE_HYPHEN=3D"TRUE" + DISABLE_LIBWPD=3D"TRUE" + DISABLE_SAXON=3D"TRUE" + DISABLE_NEON=3D"TRUE" + BUILD_EPM=3D"NO" + + AC_MSG_RESULT([yes]) + +else + + DISABLE_HUNSPELL=3D + DISABLE_HYPHEN=3D + DISABLE_LIBWPD=3D + DISABLE_SAXON=3D + DISABLE_NEON=3D + + AC_MSG_RESULT([no]) + +fi +AC_SUBST(DISABLE_HUNSPELL) +AC_SUBST(DISABLE_HYPHEN) +AC_SUBST(DISABLE_LIBWPD) +AC_SUBST(DISABLE_SAXON) +AC_SUBST(DISABLE_NEON) +AC_SUBST(BUILD_EPM) + + AC_MSG_CHECKING([whether to enable native CUPS support]) if test "$test_cups" =3D "yes" -a \( "$enable_cups" =3D "yes" -o "$enable_= cups" =3D "TRUE" \) ; then ENABLE_CUPS=3D"TRUE" @@ -3622,6 +3664,7 @@ AC_SUBST(SYSTEM_EXPAT) dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Check for system libwpd dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +if test -n "$enable_copyleft" -a "$enable_copyleft" !=3D "no"; then AC_MSG_CHECKING([which libwpd to use]) if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \ test "$with_system_libwpd" !=3D "no"; then @@ -3636,6 +3679,7 @@ fi AC_SUBST(SYSTEM_LIBWPD) AC_SUBST(LIBWPD_CFLAGS) AC_SUBST(LIBWPD_LIBS) +fi =20 dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Check for system cppunit @@ -4093,6 +4137,7 @@ AC_SUBST(BSH_JAR) dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Check for system saxon dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +if test -n "$enable_copyleft" -a "$enable_copyleft" !=3D "no"; then AC_MSG_CHECKING([which saxon to use]) if test -n "$with_system_saxon" -o -n "$with_system_libs" && \ test "$with_system_saxon" !=3D "no" && test "$with_system_jars" != =3D "no"; then @@ -4196,6 +4241,7 @@ AC_SUBST(SAXON_JAR) if test -n "$NEED_SAXON"; then BUILD_TYPE=3D"$BUILD_TYPE SAXON" fi +fi =20 dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Check for system curl @@ -5094,6 +5140,9 @@ AC_SUBST(REDLAND_LIBS) dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Check for system hunspell dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +if test -n "$enable_copyleft" -a "$enable_copyleft" !=3D "no"; then + AC_MSG_CHECKING([which libhunspell to use]) if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \ test "$with_system_hunspell" !=3D "no"; then @@ -5184,6 +5233,8 @@ AC_SUBST(SYSTEM_MYTHES) AC_SUBST(MYTHES_CFLAGS) AC_SUBST(MYTHES_LIBS) =20 +fi + dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Checking for lpsolve dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/filter/source/xsltfilter/makefile.mk b/filter/source/xsltfilte= r/makefile.mk --- a/filter/source/xsltfilter/makefile.mk +++ b/filter/source/xsltfilter/makefile.mk @@ -35,6 +35,8 @@ LIBTARGET=3DNO CLASSDIR!:=3D$(CLASSDIR)$/$(TARGET) .INCLUDE: settings.mk =20 +.IF "$(DISABLE_SAXON)" =3D=3D "" + SLOFILES=3D$(SLO)$/XSLTFilter.obj $(SLO)$/fla.obj LIBNAME=3Dxsltfilter SHL1TARGETDEPN=3Dmakefile.mk @@ -101,3 +103,8 @@ ALLTAR : $(MISC)/XSLTFilter.jar.componen $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt xsltfilter.component + +.ELSE +all: + @echo "saxon disabled" +.ENDIF diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -36,6 +36,8 @@ TARGET=3Dhunspell =20 # --- Files -------------------------------------------------------- =20 +.IF "$(DISABLE_HUNSPELL)" =3D=3D "" + TARFILE_NAME=3Dhunspell-1.2.9 TARFILE_MD5=3D68dd2e8253d9a7930e9fd50e2d7220d0 ADDITIONAL_FILES+=3Dconfig.h @@ -96,3 +98,7 @@ OUT2INC=3D \ .INCLUDE : target.mk .INCLUDE : tg_ext.mk =20 +.ELSE +all: + @echo "hunspell disabled" +.ENDIF diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -36,6 +36,8 @@ TARGET=3Dhyphen =20 # --- Files -------------------------------------------------------- =20 +.IF "$(DISABLE_HYPHEN)" =3D=3D "" + TARFILE_NAME=3Dhyphen-2.7.1 TARFILE_MD5=3D48a9f787f43a09c0a9b7b00cd1fddbbf =20 @@ -107,3 +109,8 @@ OUT2INC +=3D hyphen.h .INCLUDE : target.mk .INCLUDE : tg_ext.mk =20 +.ELSE +all: + @echo "hyphen disabled" + +.ENDIF diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -36,6 +36,8 @@ TARGET=3Dwpd =20 # --- Files -------------------------------------------------------- =20 +.IF "$(DISABLE_LIBWPD)" =3D=3D "" + .IF "$(SYSTEM_LIBWPD)" =3D=3D "YES" @all: @echo "Using system libwpd..." @@ -53,3 +55,7 @@ BUILD_DIR=3Dsrc$/lib .INCLUDE : target.mk .INCLUDE : tg_ext.mk =20 +.ELSE +all: + @echo "libwpd disabled" +.ENDIF diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.= mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk @@ -46,6 +46,8 @@ HNJLIB=3Dhyphen.lib =20 # --- Files -------------------------------------------------------- =20 +.IF "$(DISABLE_HYPHEN)" =3D=3D "" + .IF "$(SYSTEM_HUNSPELL)" !=3D "YES" HUNSPELL_CFLAGS +=3D -I$(SOLARINCDIR)$/hunspell .ENDIF @@ -99,3 +101,9 @@ ALLTAR : $(MISC)/hyphen.component $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt hyphen.component + +.ELSE +all: + @echo "hyphen disabled" + +.ENDIF diff --git a/lingucomponent/source/lingutil/makefile.mk b/lingucomponent/so= urce/lingutil/makefile.mk --- a/lingucomponent/source/lingutil/makefile.mk +++ b/lingucomponent/source/lingutil/makefile.mk @@ -37,6 +37,8 @@ ENABLE_EXCEPTIONS=3DTRUE =20 .INCLUDE : settings.mk =20 +.IF "$(DISABLE_HUNSPELL)" =3D=3D "" + .IF "$(SYSTEM_HUNSPELL)" !=3D "YES" HUNSPELL_CFLAGS +=3D -I$(SOLARINCDIR)$/hunspell .ENDIF @@ -61,3 +63,7 @@ LIB1OBJFILES=3D $(SLOFILES) # --- Targets ------------------------------------------------------ =20 .INCLUDE : target.mk +.ELSE +all: + @echo "hunspell disabled" +.ENDIF diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomp= onent/source/spellcheck/spell/makefile.mk --- a/lingucomponent/source/spellcheck/spell/makefile.mk +++ b/lingucomponent/source/spellcheck/spell/makefile.mk @@ -42,6 +42,8 @@ HUNSPELL_CFLAGS +=3D -I$(SOLARINCDIR)$/hun =20 # --- Files -------------------------------------------------------- =20 +.IF "$(DISABLE_HUNSPELL)" =3D=3D "" + CXXFLAGS +=3D -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS) CFLAGSCXX +=3D -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS) CFLAGSCC +=3D -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS) @@ -93,3 +95,8 @@ ALLTAR : $(MISC)/spell.component $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt spell.component + +.ELSE +all: + @echo "hunspell disabled" +.ENDIF diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomp= onent/source/thesaurus/libnth/makefile.mk --- a/lingucomponent/source/thesaurus/libnth/makefile.mk +++ b/lingucomponent/source/thesaurus/libnth/makefile.mk @@ -51,6 +51,8 @@ MYTHESLIB=3Dlibmythes.lib =20 # --- Files -------------------------------------------------------- =20 +.IF "$(DISABLE_HUNSPELL)" =3D=3D "" + .IF "$(SYSTEM_HUNSPELL)" !=3D "YES" HUNSPELL_CFLAGS +=3D -I$(SOLARINCDIR)$/hunspell .ENDIF @@ -113,3 +115,8 @@ ALLTAR : $(MISC)/lnth.component $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt lnth.component + +.ELSE +all: + @echo "hunspell disabled" +.ENDIF diff --git a/mythes/makefile.mk b/mythes/makefile.mk --- a/mythes/makefile.mk +++ b/mythes/makefile.mk @@ -36,6 +36,8 @@ TARGET=3Dmythes =20 # --- Files -------------------------------------------------------- =20 +.IF "$(DISABLE_HUNSPELL)" =3D=3D "" + TARFILE_NAME=3Dmythes-1.2.0 TARFILE_MD5=3D067201ea8b126597670b5eff72e1f66c =20 @@ -112,3 +114,7 @@ OUT2INC +=3D mythes.hxx .EXPORT: HUNSPELL_LIBS HUNSPELL_CFLAGS .ENDIF =20 +.ELSE +all: + @echo "hunspell disabled" +.ENDIF diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcompo= nents/makefile.mk --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -106,11 +106,9 @@ my_components =3D \ frm \ guesslang \ hwp \ - hyphen \ i18npool \ i18nsearch \ lng \ - lnth \ localebe1 \ log \ mcnttype \ @@ -148,7 +146,6 @@ my_components =3D \ sm \ smd \ solver \ - spell \ spl \ srtrs1 \ stringresource \ @@ -173,14 +170,12 @@ my_components =3D \ vbaevents \ vbaobj \ vclcanvas \ - wpft \ writerfilter \ xcr \ xmlfa \ xmlfd \ xmx \ xsltdlg \ - xsltfilter \ xstor =20 .IF "$(OS)" =3D=3D "MACOSX" @@ -197,6 +192,25 @@ my_components +=3D component/vcl/vcl.unx my_components +=3D oooimprovement .END =20 +.IF "$(DISABLE_SAXON)" =3D=3D "" +my_components +=3D XSLTFilter.jar \ + xsltfilter +.END + +.IF "$(DISABLE_HYPHEN)" =3D=3D "" +my_components +=3D hyphen +.END + +.IF "$(DISABLE_HUNSPELL)" =3D=3D "" +my_components +=3D \ + lnth \ + spell +.END + +.IF "$(DISABLE_LIBWPD)" =3D=3D "" +my_components +=3D wpft +.END + .IF "$(DISABLE_ATL)" =3D=3D "" my_components +=3D emboleobj .END @@ -249,7 +263,6 @@ my_components +=3D \ ScriptProviderForJava \ ScriptProviderForJavaScript \ XMergeBridge \ - XSLTFilter.jar \ XSLTValidate \ agenda \ fax \ diff --git a/rhino/makefile.mk b/rhino/makefile.mk --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -38,6 +38,8 @@ TARGET=3Dooo_rhino =20 # --- Files -------------------------------------------------------- =20 +#.IF "$(DISABLE_RHINO)" =3D=3D "" + TARFILE_NAME=3Drhino1_5R5 TARFILE_MD5=3D798b2ffdc8bcfe7bca2cf92b62caf685 TARFILE_ROOTDIR=3Drhino1_5R5 @@ -63,6 +65,11 @@ BUILD_ACTION=3D$(ANT) -Dbuild.label=3D"build .INCLUDE : target.mk .INCLUDE : tg_ext.mk =20 +#.ELSE +#all: +# @echo rhino disabled +#.ENDIF + .ELSE all: @echo java disabled diff --git a/saxon/makefile.mk b/saxon/makefile.mk --- a/saxon/makefile.mk +++ b/saxon/makefile.mk @@ -35,6 +35,8 @@ TARGET=3Dsaxon .INCLUDE : settings.mk .INCLUDE : antsettings.mk =20 +.IF "$(DISABLE_SAXON)" =3D=3D "" + .IF "$(SOLAR_JAVA)" !=3D "" .IF "$(SYSTEM_SAXON)" =3D=3D "YES" all: @@ -67,3 +69,8 @@ nojava: .INCLUDE : tg_ext.mk .ENDIF =20 +.ELSE +all: + @echo "saxon disabled" +.ENDIF + diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_li= brary_ooo.scp --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -889,7 +889,9 @@ End =20 #endif =20 +#ifndef DISABLE_LIBWPD STD_LIB_FILE(gid_File_Lib_Wpft,wpft) +#endif =20 STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter) =20 @@ -1311,12 +1313,14 @@ End =20 #endif =20 +#ifndef DISABLE_HUNSPELL File gid_File_Lib_Spell TXT_FILE_BODY; Styles =3D (PACKED); Name =3D LIBNAME(spell); Dir =3D SCP2_OOO_BIN_DIR; End +#endif =20 STD_LIB_FILE( gid_File_Lib_Spl, spl) =20 @@ -1429,19 +1433,23 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpe =20 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) =20 +#ifndef DISABLE_HUNSPELL File gid_File_Lib_Lnth TXT_FILE_BODY; Styles =3D (PACKED); Name =3D LIBNAME(lnth); Dir =3D SCP2_OOO_BIN_DIR; End +#endif =20 +#ifndef DISABLE_HYPHEN File gid_File_Lib_Hyph TXT_FILE_BODY; Styles =3D (PACKED); Name =3D LIBNAME(hyphen); Dir =3D SCP2_OOO_BIN_DIR; End +#endif =20 STD_LIB_FILE( gid_File_Lib_Utl , utl) =20 @@ -1481,12 +1489,16 @@ End SPECIAL_LIB_FILE(gid_File_Lib_Xstor,xstor) =20 STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg ) +#ifndef DISABLE_SAXON STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter ) +#endif STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa ) STD_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd ) =20 #ifdef SOLAR_JAVA +#ifndef DISABLE_SAXON STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter ) +#endif STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate ) #endif =20 diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -483,9 +483,11 @@ End =20 #ifdef SOLAR_JAVA #ifndef SYSTEM_SAXON +#ifndef DISABLE_SAXON STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 ) #endif #endif +#endif =20 #ifndef SYSTEM_LIBTEXTCAT_DATA // fingerprint files (lm) diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -182,6 +182,22 @@ SCPDEFS+=3D-DSYSTEM_HSQLDB -DHSQLDB_JAR=3D\" SCPDEFS+=3D-DSYSTEM_SAXON -DSAXON_JAR=3D\""file://$(SAXON_JAR)"\" .ENDIF =20 +.IF "$(DISABLE_SAXON)" =3D=3D "TRUE" +SCPDEFS+=3D-DDISABLE_SAXON +.ENDIF + +.IF "$(DISABLE_LIBWPD)" =3D=3D "TRUE" +SCPDEFS+=3D-DDISABLE_LIBWPD +.ENDIF + +.IF "$(DISABLE_HUNSPELL)" =3D=3D "TRUE" +SCPDEFS+=3D-DDISABLE_HUNSPELL +.ENDIF + +.IF "$(DISABLE_HYPHEN)" =3D=3D "TRUE" +SCPDEFS+=3D-DDISABLE_HYPHEN +.ENDIF + .IF "$(JDK)" =3D=3D "gcj" SCPDEFS+=3D-DGCJ .ENDIF diff --git a/set_soenv.in b/set_soenv.in --- a/set_soenv.in +++ b/set_soenv.in @@ -90,6 +90,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLK= IT, $PREBUILD_MOZAB, $MOZILLABUILD, $PROEXT, $TARFILE_LOCATION, + $DISABLE_SAXON, $DISABLE_HUNSPELL, $DISABLE_HYPHEN, $DISABLE_LIBWPD, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS); # #------------------------------------------- @@ -1743,6 +1744,12 @@ if ( $platform =3D~ m/cygwin/ ) chomp($tmpdir); ToFile( "TMPDIR", $tmpdir, "e" ); } +ToFile( "DISABLE_SAXON", "@DISABLE_SAXON@", "e" ); +ToFile( "DISABLE_HUNSPELL", "@DISABLE_HUNSPELL@", "e" ); +ToFile( "DISABLE_HYPHEN", "@DISABLE_HYPHEN@", "e" ); +ToFile( "DISABLE_LIBWPD", "@DISABLE_LIBWPD@", "e" ); + + ToFile( "PERL", $PERL, "e" ); ToFile( "RPM", "@RPM@", "e" ); ToFile( "DPKG", "@DPKG@", "e" ); diff --git a/sw/prj/build.lst b/sw/prj/build.lst --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,2 +1,2 @@ -sw sw : filter L10N:l10n connectivity OOo:writerperfect vbahe= lper svx stoc writerfilter LIBXSLT:libxslt NULL +sw sw : filter L10N:l10n connectivity LIBWPD:writerperfect vb= ahelper svx stoc writerfilter LIBXSLT:libxslt NULL sw sw\prj nmake - all sw_prj NULL diff --git a/writerperfect/source/filter/makefile.mk b/writerperfect/source= /filter/makefile.mk --- a/writerperfect/source/filter/makefile.mk +++ b/writerperfect/source/filter/makefile.mk @@ -6,6 +6,8 @@ ENABLE_EXCEPTIONS=3Dtrue =20 .INCLUDE : settings.mk =20 +.IF "$(DISABLE_LIBWPD)" =3D=3D "" + .IF "$(SYSTEM_LIBWPD)" =3D=3D "YES" INCPRE+=3D$(LIBWPD_CFLAGS) -I.. .ELSE @@ -25,3 +27,9 @@ SLOFILES=3D \ $(SLO)$/DocumentCollector.obj =20 .INCLUDE : target.mk + +.ELSE +all: + @echo "libwpd disabled" +.ENDIF + diff --git a/writerperfect/source/stream/makefile.mk b/writerperfect/source= /stream/makefile.mk --- a/writerperfect/source/stream/makefile.mk +++ b/writerperfect/source/stream/makefile.mk @@ -6,6 +6,8 @@ ENABLE_EXCEPTIONS=3Dtrue =20 .INCLUDE : settings.mk =20 +.IF "$(DISABLE_LIBWPD)" =3D=3D "" + .IF "$(SYSTEM_LIBWPD)" =3D=3D "YES" INCPRE+=3D$(LIBWPD_CFLAGS) .ENDIF @@ -16,3 +18,10 @@ INCPRE+=3D -I.. SLOFILES=3D $(SLO)$/WPXSvStream.obj =20 .INCLUDE : target.mk + +.ELSE +all: + @echo "libwpd disabled" +.ENDIF + + diff --git a/writerperfect/source/wpdimp/makefile.mk b/writerperfect/source= /wpdimp/makefile.mk --- a/writerperfect/source/wpdimp/makefile.mk +++ b/writerperfect/source/wpdimp/makefile.mk @@ -6,6 +6,8 @@ ENABLE_EXCEPTIONS=3Dtrue =20 .INCLUDE : settings.mk =20 +.IF "$(DISABLE_LIBWPD)" =3D=3D "" + .IF "$(SYSTEM_LIBWPD)" =3D=3D "YES" INCPRE+=3D$(LIBWPD_CFLAGS) -I.. .ELSE @@ -19,3 +21,9 @@ SLOFILES=3D \ $(SLO)$/wpft_genericfilter.obj =09 =20 .INCLUDE : target.mk + +.ELSE +all: + @echo "libwpd disabled" +.ENDIF + diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk --- a/writerperfect/util/makefile.mk +++ b/writerperfect/util/makefile.mk @@ -4,6 +4,8 @@ TARGET=3Dwriterperfect =20 .INCLUDE : settings.mk =20 +.IF "$(DISABLE_LIBWPD)" =3D=3D "" + .IF "$(GUI)"=3D=3D"UNX" .IF "$(SYSTEM_LIBWPD)" =3D=3D "YES" LIBWPD=3D$(LIBWPD_LIBS) @@ -51,3 +53,9 @@ ALLTAR : $(MISC)/wpft.component $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt wpft.component + +.ELSE +all: + @echo "libwpd disabled" +.ENDIF + --MfFXiAuoTsnnDAfZ-- --kfjH4zxOES6UT95V Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAk4l9XYACgkQFbLmO4lpmVphcwCgkq9VJ5H+IoYcAlLUsLkjLE9K 6BAAn0+sJw0+m7FtZ3QnmfMBpcXNou2q =R83i -----END PGP SIGNATURE----- --kfjH4zxOES6UT95V--