You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2011/12/16 14:59:56 UTC
svn commit: r1215131 - in /incubator/ooo/trunk/main: ./ beanshell/ graphite/
hunspell/ hyphen/ moz/ nss/ postprocess/packcomponents/ rhino/ saxon/
scp2/source/ooo/ scripting/java/ scripting/prj/ sw/ vcl/
Author: af
Date: Fri Dec 16 13:59:55 2011
New Revision: 1215131
URL: http://svn.apache.org/viewvc?rev=1215131&view=rev
Log:
118674: Made category B code optional and disabled by default.
Modified:
incubator/ooo/trunk/main/beanshell/makefile.mk
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/graphite/makefile.mk
incubator/ooo/trunk/main/hunspell/makefile.mk
incubator/ooo/trunk/main/hyphen/makefile.mk
incubator/ooo/trunk/main/moz/makefile.mk
incubator/ooo/trunk/main/nss/makefile.mk
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
incubator/ooo/trunk/main/rhino/makefile.mk
incubator/ooo/trunk/main/saxon/makefile.mk
incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
incubator/ooo/trunk/main/scripting/java/build.xml
incubator/ooo/trunk/main/scripting/prj/build.lst
incubator/ooo/trunk/main/set_soenv.in
incubator/ooo/trunk/main/sw/Module_sw.mk
incubator/ooo/trunk/main/vcl/Library_vcl.mk
Modified: incubator/ooo/trunk/main/beanshell/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/beanshell/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/beanshell/makefile.mk (original)
+++ incubator/ooo/trunk/main/beanshell/makefile.mk Fri Dec 16 13:59:55 2011
@@ -30,7 +30,18 @@ PRJ=.
PRJNAME=ooo_beanshell
TARGET=ooo_beanshell
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(SOLAR_JAVA)"==""
+
+all:
+ @echo java disabled
+
+.ELIF "$(DISABLE_BEANSHELL)"=="YES"
+
+all:
+ @echo beanshell support disabled
+
+.ELSE
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@@ -52,7 +63,4 @@ BUILD_ACTION=dmake $(MFLAGS) $(CALLMACRO
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
-.ELSE
-all:
- @echo java disabled
.ENDIF
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Fri Dec 16 13:59:55 2011
@@ -80,11 +80,6 @@ AC_ARG_WITH(vba-package-format,
AC_ARG_ENABLE(pch,
[ --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.
@@ -255,6 +250,11 @@ AC_ARG_ENABLE(static-gtk,
AC_ARG_ENABLE(layout,
[ --enable-layout Enable the compilation and use of layout dialogs
],,)
+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_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
@@ -269,6 +269,14 @@ AC_ARG_WITH(mozilla-toolkit,
[ --with-mozilla-toolkit Choose which GUI toolkit to use while building mozilla
components. Default: gtk2
],,)
+AC_ARG_WITH(system-mozilla,
+[ --with-system-mozilla Use mozilla already on system. Note that some
+ components cannot be built against a contemporary
+ mozilla. The flavour used can be specified by
+ --with-system-mozilla=<flavour>. Supported are:
+ libxul (default), xulrunner, firefox, seamonkey,
+ mozilla
+], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
AC_ARG_ENABLE(nss_module,
[ --disable-nss-module Whether to use provided NSS module
],,enable_nss_module=yes)
@@ -314,7 +322,7 @@ AC_ARG_ENABLE(randr-link,
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
+ if you want to override the default ones
],,)
AC_ARG_WITH(external-dict-dir,
[ --with-external-dict-dir Specify external dictionary dir
@@ -406,7 +414,10 @@ AC_ARG_WITH(hsqldb-jar,
[ HSQLDB_JAR="$withval"
])
AC_ARG_WITH(system-beanshell,
-[ --with-system-beanshell Use beanshell already on system
+[ --with-system-beanshell Use beanshell already on system (default)
+],,)
+AC_ARG_ENABLE(beanshell,
+[ --disable-beanshell Disable the use of beanshell.
],,)
AC_ARG_WITH(beanshell-jar,
[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
@@ -500,10 +511,13 @@ AC_ARG_WITH(libbase-jar,
[ LIBBASE_JAR="$withval"
])
AC_ARG_WITH(system-saxon,
-[ --with-system-saxon Use saxon already on system
+[ --with-system-saxon Use saxon already on system (default)
+],,)
+AC_ARG_ENABLE(saxon,
+[ --disable-saxon Disable use of saxon
],,)
AC_ARG_WITH(saxon-jar,
-[ --with-saxon-jar=JARFILE Specify path to jarfile manually ],
+[ --with-saxon-jar=JARFILE Specify path to jarfile manually. This implies --with-system-saxon ],
[ SAXON_JAR="$withval"
])
AC_ARG_WITH(system-libxslt,
@@ -576,14 +590,6 @@ AC_ARG_WITH(system-cppunit,
AC_ARG_WITH(system-redland,
[ --with-system-redland Use redland library already on system
],,)
-AC_ARG_WITH(system-mozilla,
-[ --with-system-mozilla Use mozilla already on system. Note that some
- components cannot be built against a contemporary
- mozilla. The flavour used can be specified by
- --with-system-mozilla=<flavour>. Supported are:
- libxul (default), xulrunner, firefox, seamonkey,
- mozilla
-], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
AC_ARG_WITH(stlport,
[ --with-stlport The location that STLport is installed in. The STL
header files are assumed to be in
@@ -727,6 +733,9 @@ AC_ARG_WITH(local-solver,
Usage: --with-local-solver=<absolute path to solver>
],,)
+AC_ARG_ENABLE(javascript,
+[ --disable-javascript Disables support for JavaScript macros.
+],,)
AC_ARG_ENABLE(check-only,
[ --enable-check-only Use this option option if you just want to check your
environment. This option stops the generation of an
@@ -845,8 +854,12 @@ AC_ARG_ENABLE(verbose,
AC_ARG_ENABLE(dependency-tracking,
[ --disable-dependency-tracking Disables generation of dependency information.
],,)
-AC_ARG_ENABLE(copyleft,
-[ --enable-copyleft Whether to use copyleft components.
+AC_ARG_ENABLE(category-b,
+[ --enable-category-b Activate components under a category B license
+ (see http://www.apache.org/legal/3party.html#category-b):
+ MPL (seamonkey, hunspell, hyphen, nss, saxon, rhino),
+ CPL (silgraphite), SPL (beanshell).
+ Flags for individual libraries override this one.
],,)
AC_ARG_WITH(arm-target,
[ --arm-target The minimal targeted arm processor
@@ -1243,31 +1256,59 @@ else
DISABLE_STRIP=
fi
fi
+if test -z "$DISABLE_STRIP"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+fi
AC_SUBST(DISABLE_STRIP)
dnl ===================================================================
dnl Build options
dnl ===================================================================
-AC_MSG_CHECKING([whether to enable copyleft components])
-if test "$enable_copyleft" != "yes"; then
+# Disable or enable libraries seamonkey, nss, hunspell, hyphen, saxon,
+# rhino, silgraphite, beanshell.
- enable_mozilla="no"
- enable_nss_module="no"
- enable_gstreamer="no"
-
- DISABLE_SAXON="TRUE"
+# Note that further below they may be enabled or disabled again by
+# more specific options.
- AC_MSG_RESULT([no])
+AC_MSG_CHECKING([whether to enable category B components])
+# Category B modules (libraries):
+# moz (seamonkey)
+# nss (nss)
+# hunspell (hunspell)
+# hyphen (hyphen)
+# saxon (saxon)
+# rhino (rhino)
+# beanshell (beanshell)
+# graphite (silgraphite)
+if test "$enable_category_b" == "yes"; then
+# enable_mozilla="yes"
+# enable_nss_module="yes"
+ enable_hunspell="yes"
+ enable_hyphen="yes"
+ enable_saxon="yes"
+ enable_javascript="yes"
+ enable_beanshell="yes"
+ enable_graphite="yes"
+ AC_MSG_RESULT([yes: allow modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite to be built])
else
+ # Disable libaries.
+ enable_mozilla="no"
+ enable_nss_module="no"
+ enable_hunspell="no"
+ enable_hyphen="no"
+ enable_saxon="no"
+ enable_javascript="no"
+ enable_beanshell="no"
+ enable_graphite="no"
- DISABLE_SAXON=
-
- AC_MSG_RESULT([yes])
-
+ AC_MSG_RESULT([no: disabled modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite])
fi
-AC_SUBST(DISABLE_SAXON)
+
+# gstreamer is used only via pre-installed libraries: not a problem
AC_MSG_CHECKING([whether to enable native CUPS support])
@@ -4119,6 +4160,7 @@ AC_SUBST(HSQLDB_JAR)
dnl ===================================================================
dnl Check for system beanshell
dnl ===================================================================
+ENABLE_BEANSHELL=YES
AC_MSG_CHECKING([which beanshell to use])
if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
@@ -4129,19 +4171,29 @@ if test -n "$with_system_beanshell" -o -
fi
AC_CHECK_FILE($BSH_JAR, [],
[AC_MSG_ERROR(bsh.jar not found.)], [])
-else
+elif test "x$enable_beanshell" = "xyes"; then
AC_MSG_RESULT([internal])
SYSTEM_BSH=NO
BUILD_TYPE="$BUILD_TYPE BSH"
+else
+ AC_MSG_RESULT([none (disabled)])
+ SYSTEM_BSH=NO
+ ENABLE_BEANSHELL=NO
fi
AC_SUBST(SYSTEM_BSH)
AC_SUBST(BSH_JAR)
+AC_SUBST(ENABLE_BEANSHELL)
dnl ===================================================================
-dnl Check for system saxon
+dnl Check for saxon. It can come from two different places:
+dnl - pre-installed on the system. This is checked when the --with-system-saxon
+dnl option is given to configure.
+dnl The exact place can be specified with the --with-saxon-jar=<path> option.
+dnl - From the saxon tar ball in ext_sources/. This is used when --enable-saxon
+dnl is given to configure but not any of --with-system-saxon or --with-saxon-jar.
dnl ===================================================================
-if test -n "$enable_copyleft" -a "$enable_copyleft" != "no"; then
+DISABLE_SAXON=
AC_MSG_CHECKING([which saxon to use])
if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
@@ -4234,18 +4286,35 @@ _ACEOF
cat saxontest.java >&5
AC_MSG_ERROR([saxontest could not be compiled, non-functional saxon jar])
fi
-else
+elif test "x$enable_saxon" = "xyes"; then
AC_MSG_RESULT([internal])
SYSTEM_SAXON=NO
- NEED_SAXON=TRUE
+ BUILD_TYPE="$BUILD_TYPE SAXON"
+else
+ AC_MSG_RESULT([none (disabled)])
+ SYSTEM_SAXON=NO
+ DISABLE_SAXON=YES
fi
AC_SUBST(SYSTEM_SAXON)
AC_SUBST(SAXON_JAR)
+AC_SUBST(DISABLE_SAXON)
-if test -n "$NEED_SAXON"; then
- BUILD_TYPE="$BUILD_TYPE SAXON"
-fi
+
+dnl ===================================================================
+dnl Check for rhino
+dnl ===================================================================
+ENABLE_JAVASCRIPT=
+AC_MSG_CHECKING([whether to enable support for JavaScript])
+if test "x$enable_javascript" = "xyes"; then
+ BUILD_TYPE="$BUILD_TYPE RHINO"
+ AC_MSG_RESULT([yes])
+ ENABLE_JAVASCRIPT=YES
+else
+ AC_MSG_RESULT([no])
+ ENABLE_JAVASCRIPT=NO
fi
+AC_SUBST(ENABLE_JAVASCRIPT)
+
dnl ===================================================================
dnl Check for system curl
@@ -4377,6 +4446,7 @@ else
fi
AC_SUBST(SYSTEM_ODBC_HEADERS)
+WITH_MOZILLA=NO
AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using components])
if test "$enable_mozilla" = "no"; then
AC_MSG_RESULT([no])
@@ -4386,7 +4456,6 @@ else
AC_MSG_RESULT([yes])
WITH_MOZILLA=YES
fi
-AC_SUBST(WITH_MOZILLA)
AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
if test "$enable_mozilla" = "no"; then
@@ -4556,6 +4625,7 @@ else
fi
AC_SUBST(MOZILLA_VERSION)
+AC_SUBST(WITH_MOZILLA)
AC_MSG_CHECKING([for toolkit mozilla should use])
if test -z "$with_mozilla_toolkit"; then
@@ -4799,8 +4869,9 @@ dnl ====================================
dnl Graphite
dnl ===================================================================
+ENABLE_GRAPHITE="FALSE"
AC_MSG_CHECKING([whether to enable graphite support])
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
+if test "x$enable_graphite" = "xyes" -a \( "$_os" = "WINNT" -o "$_os" = "Linux" \) ; then
AC_MSG_RESULT([yes])
ENABLE_GRAPHITE="TRUE"
AC_MSG_CHECKING([which graphite to use])
@@ -4816,6 +4887,7 @@ if test "$_os" = "WINNT" -o "$_os" = "Li
fi
else
AC_MSG_RESULT([no])
+ ENABLE_GRAPHITE="FALSE"
fi
AC_SUBST(ENABLE_GRAPHITE)
AC_SUBST(SYSTEM_GRAPHITE)
@@ -6718,16 +6790,13 @@ else
case "$_os" in
WINNT*) # Windows
SYSTEM_LIBJPEG=NO
- AC_MSG_RESULT([yes])
;;
Darwin*)
SYSTEM_LIBJPEG=NO
- AC_MSG_RESULT([yes])
;;
*)
- SYSTEM_LIBJPEG=YES
- AC_MSG_RESULT([no])
- ;;
+ SYSTEM_LIBJPEG=YES
+ ;;
esac
fi
@@ -7127,7 +7196,11 @@ AC_SUBST(BUILD_TYPE)
# make sure config.guess is +x; we execute config.guess, so it has to be so;
chmod +x ./config.guess
-AC_OUTPUT([set_soenv Makefile])
+# Create files from their *.in templates.
+AC_CONFIG_FILES([set_soenv Makefile])
+
+AC_MSG_NOTICE([writing config.status])
+AC_OUTPUT
dnl Executing the set_soenv script to setup the environment variables.
chmod a+x set_soenv
Modified: incubator/ooo/trunk/main/graphite/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/graphite/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/graphite/makefile.mk (original)
+++ incubator/ooo/trunk/main/graphite/makefile.mk Fri Dec 16 13:59:55 2011
@@ -38,13 +38,20 @@ TARGET=so_graphite
.INCLUDE : settings.mk
.IF "$(SYSTEM_GRAPHITE)" == "YES"
+
all:
@echo "An already available installation of silgraphite should exist on your system."
@echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
+
+.ELIF "$(ENABLE_GRAPHITE)" != "TRUE"
+
+all:
+ @echo "Support for silgraphite has been disabled. Nothing to do."
+
+.ELSE
# --- Files --------------------------------------------------------
-.IF "$(ENABLE_GRAPHITE)"=="TRUE"
+
TARFILE_NAME=silgraphite-2.3.1
TARFILE_MD5=d35724900f6a4105550293686688bbb3
PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch
@@ -162,10 +169,7 @@ OUTDIR2INC= \
.IF "$(OS)"=="WNT"
OUT2INC=wrappers$/win32$/WinFont.h
.ENDIF
-.ELSE
-dddd:
- @echo Nothing to do
-.ENDIF
+
# --- Targets ------------------------------------------------------
@@ -173,3 +177,4 @@ dddd:
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+.ENDIF
\ No newline at end of file
Modified: incubator/ooo/trunk/main/hunspell/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/hunspell/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/hunspell/makefile.mk (original)
+++ incubator/ooo/trunk/main/hunspell/makefile.mk Fri Dec 16 13:59:55 2011
@@ -36,7 +36,12 @@ TARGET=hunspell
# --- Files --------------------------------------------------------
-.IF "$(ENABLE_HUNSPELL)" == "YES"
+.IF "$(ENABLE_HUNSPELL)" != "YES"
+
+all:
+ @echo "hunspell is disabled"
+
+.ELSE
TARFILE_NAME=hunspell-1.2.9
TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0
@@ -47,7 +52,7 @@ PATCH_FILES=\
hunspell-solaris.patch \
hunspell-stacksmash.patch \
hunspell.patch
-
+
.IF "$(GUI)"=="UNX"
#relative to CONFIGURE_DIR
@@ -100,8 +105,4 @@ OUT2INC= \
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
-
-.ELSE
-all:
- @echo "hunspell disabled"
.ENDIF
Modified: incubator/ooo/trunk/main/hyphen/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/hyphen/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/hyphen/makefile.mk (original)
+++ incubator/ooo/trunk/main/hyphen/makefile.mk Fri Dec 16 13:59:55 2011
@@ -36,7 +36,12 @@ TARGET=hyphen
# --- Files --------------------------------------------------------
-.IF "$(DISABLE_HYPHEN)" == ""
+.IF "$(ENABLE_HYPHEN)" != "YES"
+
+all:
+ @echo "hyphen is disabled"
+
+.ELSE
TARFILE_NAME=hyphen-2.7.1
TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf
@@ -109,8 +114,4 @@ OUT2INC += hyphen.h
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
-.ELSE
-all:
- @echo "hyphen disabled"
-
-.ENDIF
+.ENDIF # "$(ENABLE_HYPHEN)"
Modified: incubator/ooo/trunk/main/moz/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/moz/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/moz/makefile.mk (original)
+++ incubator/ooo/trunk/main/moz/makefile.mk Fri Dec 16 13:59:55 2011
@@ -35,6 +35,20 @@ TARGET=ooo_mozab
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
+
+.IF "$(WITH_MOZILLA)"=="NO"
+
+all:
+ @echo Support for mozilla is disabled.
+
+.ELIF "$(BUILD_MOZAB)"==""
+
+all:
+ @echo Use of internal mozilla is disabled.
+
+.ELSE
+
+
# ----- pkg-config start -------
.INCLUDE .IGNORE : pkgroot.mk
.IF "$(PKGCONFIG_ROOT)"!=""
@@ -267,11 +281,6 @@ LIBIDL_PREFIX:=$(MOZ_TOOLS)/vc71
# --- Targets ------------------------------------------------------
-.IF "$(BUILD_MOZAB)"==""
-all:
- @echo "Never Build Mozilla."
-.ENDIF
-
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
@@ -428,3 +437,5 @@ $(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip
.ENDIF # $(GUIBASE)=="aqua"
.INCLUDE : extractfiles.mk
+
+.ENDIF
Modified: incubator/ooo/trunk/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/nss/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/nss/makefile.mk (original)
+++ incubator/ooo/trunk/main/nss/makefile.mk Fri Dec 16 13:59:55 2011
@@ -37,9 +37,11 @@ TARGET=nss
# --- Files --------------------------------------------------------
.IF "$(ENABLE_NSS_MODULE)"!="YES"
+
all:
@echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'"
-.ENDIF
+
+.ELSE
TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4
TARFILE_MD5=b92261a5679276c400555004937af965
@@ -180,3 +182,5 @@ OUTDIR2INC=mozilla$/dist$/public$/nss mo
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+
+.ENDIF
Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Fri Dec 16 13:59:55 2011
@@ -7,10 +7,9 @@
# Load libraries from svn.apache.org. When the source code was checked out
# with SVN then these should already be present.
http://svn.apache.org/repos/asf/incubator/ooo/trunk/ext_sources/
-48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
+# Libraries with category A license
63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
-68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
@@ -24,25 +23,18 @@ http://svn.apache.org/repos/asf/incubato
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
-b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.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
-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
-377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
-d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
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
@@ -56,6 +48,16 @@ cf8a6967f7de535ae257fa411c98eb88-mdds_0.
a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+# Libraries with category B license
+a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
+68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
+48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
+b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
+ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
+d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
+ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
# Temporary
http://hg.services.openoffice.org/binaries/
Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Fri Dec 16 13:59:55 2011
@@ -257,9 +257,7 @@ my_components += productregistration.jar
my_components += \
LuceneHelpWrapper \
ScriptFramework \
- ScriptProviderForBeanShell \
ScriptProviderForJava \
- ScriptProviderForJavaScript \
XMergeBridge \
XSLTValidate \
agenda \
@@ -272,6 +270,12 @@ my_components += \
report \
table \
web
+.IF "$(ENABLE_BEANSHELL)" == "YES"
+my_components += ScriptProviderForBeanShell
+.END
+.IF "$(ENABLE_JAVASCRIPT)" == "YES"
+my_components += ScriptProviderForJavaScript
+.END
.END
.IF "$(WITH_BINFILTER)" != "NO"
Modified: incubator/ooo/trunk/main/rhino/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/rhino/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/rhino/makefile.mk (original)
+++ incubator/ooo/trunk/main/rhino/makefile.mk Fri Dec 16 13:59:55 2011
@@ -30,7 +30,15 @@ PRJ=.
PRJNAME=ooo_rhino
TARGET=ooo_rhino
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(SOLAR_JAVA)"==""
+all:
+ @echo java disabled
+
+.ELIF "$(ENABLE_JAVASCRIPT)"!="YES"
+all:
+ @echo javascript support disabled
+.ELSE
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@@ -65,12 +73,4 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
-#.ELSE
-#all:
-# @echo rhino disabled
-#.ENDIF
-
-.ELSE
-all:
- @echo java disabled
.ENDIF
Modified: incubator/ooo/trunk/main/saxon/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/saxon/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/saxon/makefile.mk (original)
+++ incubator/ooo/trunk/main/saxon/makefile.mk Fri Dec 16 13:59:55 2011
@@ -35,14 +35,23 @@ TARGET=saxon
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-.IF "$(DISABLE_SAXON)" == ""
-
-.IF "$(SOLAR_JAVA)" != ""
.IF "$(SYSTEM_SAXON)" == "YES"
+
all:
- @echo "An already available installation of saxon should exist on your system."
+ @echo "An already available installation of saxon should exist on your system."
@echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
+
+.ELIF "$(DISABLE_SAXON)" == "YES"
+
+all:
+ @echo Support for saxon is disabled.
+
+.ELIF "$(SOLAR_JAVA)" == ""
+
+all:
+ @echo No Java support. Can not compile saxon.
+
+.ELSE
# --- Files --------------------------------------------------------
@@ -57,19 +66,10 @@ BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolar
OUT2CLASS= saxon-build$/9.0.0.7$/bj$/saxon9.jar
-.ELSE # $(SOLAR_JAVA)!= ""
-nojava:
- @echo "Not building $(PRJNAME) because Java is disabled"
-.ENDIF # $(SOLAR_JAVA)!= ""
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
-.ENDIF
-.ELSE
-all:
- @echo "saxon disabled"
-.ENDIF
+.ENDIF # "$(SOLAR_JAVA)" == ""
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp Fri Dec 16 13:59:55 2011
@@ -399,27 +399,23 @@ End
#endif
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_BSH
+#if defined SOLAR_JAVA && defined ENABLE_BEANSHELL && ! defined SYSTEM_BSH
STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
#endif
-#endif
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_LUCENE
+#if defined SOLAR_JAVA && ! defined SYSTEM_LUCENE
STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.3 )
STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 )
#endif
-#endif
-#ifdef SOLAR_JAVA
+
STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
-#endif
-#ifdef SOLAR_JAVA
+#if defined SOLAR_JAVA && defined ENABLE_JAVASCRIPT
STD_JAR_FILE( gid_File_Jar_Js, js )
#endif
+
#ifdef SOLAR_JAVA
#ifndef MACOSX
@@ -465,10 +461,14 @@ End
#ifdef SOLAR_JAVA
STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
+#ifdef ENABLE_BEANSHELL
STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
+#endif
STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
+#ifdef ENABLE_JAVASCRIPT
STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
#endif
+#endif
#ifdef SOLAR_JAVA
@@ -1210,11 +1210,13 @@ File gid_File_Share_Registry_Ctl_Xcd
Name (my) = "ctl.xcd";
End
+#ifdef ENABLE_BEANSHELL
File gid_File_Scripts_Beanshell
Dir = gid_Dir_Share_Scripts;
ARCHIVE_TXT_FILE_BODY;
Name = "ScriptsBeanShell.zip";
End
+#endif
#ifdef SOLAR_JAVA
File gid_File_Scripts_Java
@@ -1224,11 +1226,13 @@ File gid_File_Scripts_Java
End
#endif
+#ifdef ENABLE_JAVASCRIPT
File gid_File_Scripts_Javascript
Dir = gid_Dir_Share_Scripts;
ARCHIVE_TXT_FILE_BODY;
Name = "ScriptsJavaScript.zip";
End
+#endif
// new user interface configuration files
File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
Modified: incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk Fri Dec 16 13:59:55 2011
@@ -174,6 +174,14 @@ SCPDEFS+=\
SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
.ENDIF
+.IF "$(ENABLE_BEANSHELL)" == "YES"
+SCPDEFS+=-DENABLE_BEANSHELL
+.ENDIF
+
+.IF "$(ENABLE_JAVASCRIPT)" == "YES"
+SCPDEFS+=-DENABLE_JAVASCRIPT
+.ENDIF
+
.IF "$(SYSTEM_HSQLDB)" == "YES"
SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
.ENDIF
@@ -182,7 +190,7 @@ SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\"
SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\"
.ENDIF
-.IF "$(DISABLE_SAXON)" == "TRUE"
+.IF "$(DISABLE_SAXON)" == "YES"
SCPDEFS+=-DDISABLE_SAXON
.ENDIF
Modified: incubator/ooo/trunk/main/scripting/java/build.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scripting/java/build.xml?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scripting/java/build.xml (original)
+++ incubator/ooo/trunk/main/scripting/java/build.xml Fri Dec 16 13:59:55 2011
@@ -45,6 +45,15 @@
<property environment="env"/>
<property name="env.BSH_JAR" value="${solar.jar}/bsh.jar"/>
+ <target name="eval_environment">
+ <condition property="with_rhino">
+ <equals arg1="${env.ENABLE_JAVASCRIPT}" arg2="YES" />
+ </condition>
+ <condition property="with_beanshell">
+ <equals arg1="${env.ENABLE_BEANSHELL}" arg2="YES" />
+ </condition>
+ </target>
+
<!-- ==================== classpath setting ============================ -->
<path id="idlclasspath">
<pathelement location="${solar.jar}/jurt.jar"/>
@@ -95,10 +104,12 @@
</target>
<!-- ======================== Compile Classes ========================== -->
- <target name="compile" depends="prepare">
+ <target name="compile" depends="prepare, eval_environment">
<javac srcdir="com" destdir="${jardir}"
includes="**/*.java" classpathref="idlclasspath"
debug="${debug}" optimize="${optimize}" deprecation="off">
+ <exclude name="**/provider/javascript/*.java" unless="with_rhino" />
+ <exclude name="**/provider/beanshell/*.java" unless="with_beanshell" />
<compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
</javac>
<javac srcdir="Framework/" destdir="${jardir}"
@@ -156,7 +167,7 @@
</target>
<!-- ===================== jar ========================= -->
- <target name="jar" depends="compile">
+ <target name="jar.provider.java" depends="compile">
<jar jarfile="${jardir}/ScriptProviderForJava.jar"
basedir="${jardir}">
<manifest>
@@ -168,7 +179,9 @@
</manifest>
<include name="**/provider/java/*.class"/>
</jar>
+ </target>
+ <target name="jar.provider.beanshell" depends="compile" if="with_beanshell">
<jar jarfile="${jardir}/ScriptProviderForBeanShell.jar"
basedir="${jardir}">
<manifest>
@@ -183,7 +196,9 @@
<include name="**/provider/beanshell/*.bsh"/>
</fileset>
</jar>
+ </target>
+ <target name="jar.provider.javascript" depends="compile" if="with_rhino">
<jar jarfile="${jardir}/ScriptProviderForJavaScript.jar"
basedir="${jardir}">
<manifest>
@@ -198,7 +213,9 @@
<include name="**/provider/javascript/*.js"/>
</fileset>
</jar>
+ </target>
+ <target name="jar.scriptframework" depends="compile">
<jar jarfile="${jardir}/ScriptFramework.jar"
basedir="${jardir}">
<manifest>
@@ -214,7 +231,9 @@
<include name="**/container/*.class"/>
<include name="**/io/*.class"/>
</jar>
+ </target>
+ <target name="jar" depends="jar.provider.java,jar.provider.beanshell,jar.provider.javascript,jar.scriptframework">
</target>
<target name="idesupport.jar" depends="idesupport.compile">
Modified: incubator/ooo/trunk/main/scripting/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scripting/prj/build.lst?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scripting/prj/build.lst (original)
+++ incubator/ooo/trunk/main/scripting/prj/build.lst Fri Dec 16 13:59:55 2011
@@ -1,4 +1,4 @@
-tc scripting : oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
+tc scripting : oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 RHINO:rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
tc scripting usr1 - all tc1_mkout NULL
tc scripting\inc nmake - all tc1_inc NULL
tc scripting\source\provider nmake - all tc1_scriptingprovider tc1_inc NULL
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Fri Dec 16 13:59:55 2011
@@ -90,7 +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_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
$PROEXT, $TARFILE_LOCATION,
- $DISABLE_SAXON, $ENABLE_HUNSPELL, $ENABLE_HYPHEN,
+ $ENABLE_HUNSPELL, $ENABLE_HYPHEN,
$SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
#
#-------------------------------------------
@@ -1768,7 +1768,6 @@ if ( $platform =~ m/cygwin/ )
chomp($tmpdir);
ToFile( "TMPDIR", $tmpdir, "e" );
}
-ToFile( "DISABLE_SAXON", "@DISABLE_SAXON@", "e" );
ToFile( "ENABLE_HUNSPELL", "@ENABLE_HUNSPELL@", "e" );
ToFile( "ENABLE_HYPHEN", "@ENABLE_HYPHEN@", "e" );
@@ -1943,8 +1942,11 @@ ToFile( "LUCENE_CORE_JAR", "@LUCENE_CO
ToFile( "LUCENE_ANALYZERS_JAR", "@LUCENE_ANALYZERS_JAR@", "e" );
ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" );
ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
+ToFile( "ENABLE_BEANSHELL", "@ENABLE_BEANSHELL@", "e" );
ToFile( "SYSTEM_SAXON", "@SYSTEM_SAXON@", "e" );
ToFile( "SAXON_JAR", "@SAXON_JAR@", "e" );
+ToFile( "DISABLE_SAXON", "@DISABLE_SAXON@", "e" );
+ToFile( "ENABLE_JAVASCRIPT", "@ENABLE_JAVASCRIPT@","e" );
ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" );
ToFile( "LIBXSLT_CFLAGS", "@LIBXSLT_CFLAGS@", "e" );
Modified: incubator/ooo/trunk/main/sw/Module_sw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/Module_sw.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/Module_sw.mk (original)
+++ incubator/ooo/trunk/main/sw/Module_sw.mk Fri Dec 16 13:59:55 2011
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_targets,sw,\
Package_xml \
))
+
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
JunitTest_sw_complex \
JunitTest_sw_unoapi \
Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1215131&r1=1215130&r2=1215131&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Fri Dec 16 13:59:55 2011
@@ -447,7 +447,7 @@ $(eval $(call gb_Library_add_exception_o
))
## handle Graphite
-ifneq ($(ENABLE_GRAPHITE),)
+ifeq ($(ENABLE_GRAPHITE),TRUE)
# add defines, graphite sources for all platforms
$(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \