You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by er...@apache.org on 2011/08/28 17:46:32 UTC
svn commit: r1162539 [3/3] - in /incubator/ooo/trunk/main: ./
filter/source/xsltfilter/ hunspell/ hyphen/ libwpd/
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/
lingucomponent/source/lingutil/ lingucomponent/source/spellcheck/spell/
lingucompone...
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Sun Aug 28 15:46:31 2011
@@ -842,6 +842,9 @@ 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.
+],,)
BUILD_TYPE="OOo"
@@ -1227,6 +1230,45 @@ AC_SUBST(DISABLE_STRIP)
dnl ===================================================================
dnl Build options
dnl ===================================================================
+
+AC_MSG_CHECKING([whether to enable copyleft components])
+if test "$enable_copyleft" != "yes"; then
+
+ enable_mozilla="no"
+ enable_nss_module="no"
+ enable_gstreamer="no"
+ enable_epm="no"
+ with_myspell_dicts="no"
+ enable_neon="no"
+
+ DISABLE_HUNSPELL="TRUE"
+ DISABLE_HYPHEN="TRUE"
+ DISABLE_LIBWPD="TRUE"
+ DISABLE_SAXON="TRUE"
+ DISABLE_NEON="TRUE"
+ BUILD_EPM="NO"
+
+ AC_MSG_RESULT([yes])
+
+else
+
+ DISABLE_HUNSPELL=
+ DISABLE_HYPHEN=
+ DISABLE_LIBWPD=
+ DISABLE_SAXON=
+ DISABLE_NEON=
+
+ 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" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
ENABLE_CUPS="TRUE"
@@ -3622,6 +3664,7 @@ AC_SUBST(SYSTEM_EXPAT)
dnl ===================================================================
dnl Check for system libwpd
dnl ===================================================================
+if test -n "$enable_copyleft" -a "$enable_copyleft" != "no"; then
AC_MSG_CHECKING([which libwpd to use])
if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
test "$with_system_libwpd" != "no"; then
@@ -3636,6 +3679,7 @@ fi
AC_SUBST(SYSTEM_LIBWPD)
AC_SUBST(LIBWPD_CFLAGS)
AC_SUBST(LIBWPD_LIBS)
+fi
dnl ===================================================================
dnl Check for system cppunit
@@ -4093,6 +4137,7 @@ AC_SUBST(BSH_JAR)
dnl ===================================================================
dnl Check for system saxon
dnl ===================================================================
+if test -n "$enable_copyleft" -a "$enable_copyleft" != "no"; then
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
@@ -4196,6 +4241,7 @@ AC_SUBST(SAXON_JAR)
if test -n "$NEED_SAXON"; then
BUILD_TYPE="$BUILD_TYPE SAXON"
fi
+fi
dnl ===================================================================
dnl Check for system curl
@@ -5094,6 +5140,9 @@ AC_SUBST(REDLAND_LIBS)
dnl ===================================================================
dnl Check for system hunspell
dnl ===================================================================
+
+if test -n "$enable_copyleft" -a "$enable_copyleft" != "no"; then
+
AC_MSG_CHECKING([which libhunspell to use])
if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
test "$with_system_hunspell" != "no"; then
@@ -5184,6 +5233,8 @@ AC_SUBST(SYSTEM_MYTHES)
AC_SUBST(MYTHES_CFLAGS)
AC_SUBST(MYTHES_LIBS)
+fi
+
dnl ===================================================================
dnl Checking for lpsolve
dnl ===================================================================
Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/makefile.mk (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/makefile.mk Sun Aug 28 15:46:31 2011
@@ -35,6 +35,8 @@ LIBTARGET=NO
CLASSDIR!:=$(CLASSDIR)$/$(TARGET)
.INCLUDE: settings.mk
+.IF "$(DISABLE_SAXON)" == ""
+
SLOFILES=$(SLO)$/XSLTFilter.obj $(SLO)$/fla.obj
LIBNAME=xsltfilter
SHL1TARGETDEPN=makefile.mk
@@ -101,3 +103,8 @@ $(MISC)/xsltfilter.component .ERRREMOVE
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt xsltfilter.component
+
+.ELSE
+all:
+ @echo "saxon disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/hunspell/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/hunspell/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/hunspell/makefile.mk (original)
+++ incubator/ooo/trunk/main/hunspell/makefile.mk Sun Aug 28 15:46:31 2011
@@ -36,6 +36,8 @@ TARGET=hunspell
# --- Files --------------------------------------------------------
+.IF "$(DISABLE_HUNSPELL)" == ""
+
TARFILE_NAME=hunspell-1.2.9
TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0
ADDITIONAL_FILES+=config.h
@@ -96,3 +98,7 @@ OUT2INC= \
.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=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/hyphen/makefile.mk (original)
+++ incubator/ooo/trunk/main/hyphen/makefile.mk Sun Aug 28 15:46:31 2011
@@ -36,6 +36,8 @@ TARGET=hyphen
# --- Files --------------------------------------------------------
+.IF "$(DISABLE_HYPHEN)" == ""
+
TARFILE_NAME=hyphen-2.7.1
TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf
@@ -107,3 +109,8 @@ OUT2INC += hyphen.h
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+.ELSE
+all:
+ @echo "hyphen disabled"
+
+.ENDIF
Modified: incubator/ooo/trunk/main/libwpd/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libwpd/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/libwpd/makefile.mk (original)
+++ incubator/ooo/trunk/main/libwpd/makefile.mk Sun Aug 28 15:46:31 2011
@@ -36,6 +36,8 @@ TARGET=wpd
# --- Files --------------------------------------------------------
+.IF "$(DISABLE_LIBWPD)" == ""
+
.IF "$(SYSTEM_LIBWPD)" == "YES"
@all:
@echo "Using system libwpd..."
@@ -53,3 +55,7 @@ BUILD_DIR=src$/lib
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+.ELSE
+all:
+ @echo "libwpd disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk (original)
+++ incubator/ooo/trunk/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk Sun Aug 28 15:46:31 2011
@@ -46,6 +46,8 @@ HNJLIB=hyphen.lib
# --- Files --------------------------------------------------------
+.IF "$(DISABLE_HYPHEN)" == ""
+
.IF "$(SYSTEM_HUNSPELL)" != "YES"
HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hunspell
.ENDIF
@@ -99,3 +101,9 @@ $(MISC)/hyphen.component .ERRREMOVE : $(
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt hyphen.component
+
+.ELSE
+all:
+ @echo "hyphen disabled"
+
+.ENDIF
Modified: incubator/ooo/trunk/main/lingucomponent/source/lingutil/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lingucomponent/source/lingutil/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lingucomponent/source/lingutil/makefile.mk (original)
+++ incubator/ooo/trunk/main/lingucomponent/source/lingutil/makefile.mk Sun Aug 28 15:46:31 2011
@@ -37,6 +37,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(DISABLE_HUNSPELL)" == ""
+
.IF "$(SYSTEM_HUNSPELL)" != "YES"
HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hunspell
.ENDIF
@@ -61,3 +63,7 @@ LIB1OBJFILES= $(SLOFILES)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+.ELSE
+all:
+ @echo "hunspell disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/lingucomponent/source/spellcheck/spell/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lingucomponent/source/spellcheck/spell/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lingucomponent/source/spellcheck/spell/makefile.mk (original)
+++ incubator/ooo/trunk/main/lingucomponent/source/spellcheck/spell/makefile.mk Sun Aug 28 15:46:31 2011
@@ -42,6 +42,8 @@ HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hun
# --- Files --------------------------------------------------------
+.IF "$(DISABLE_HUNSPELL)" == ""
+
CXXFLAGS += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
CFLAGSCXX += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
CFLAGSCC += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
@@ -93,3 +95,8 @@ $(MISC)/spell.component .ERRREMOVE : $(S
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt spell.component
+
+.ELSE
+all:
+ @echo "hunspell disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/lingucomponent/source/thesaurus/libnth/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lingucomponent/source/thesaurus/libnth/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lingucomponent/source/thesaurus/libnth/makefile.mk (original)
+++ incubator/ooo/trunk/main/lingucomponent/source/thesaurus/libnth/makefile.mk Sun Aug 28 15:46:31 2011
@@ -51,6 +51,8 @@ MYTHESLIB=libmythes.lib
# --- Files --------------------------------------------------------
+.IF "$(DISABLE_HUNSPELL)" == ""
+
.IF "$(SYSTEM_HUNSPELL)" != "YES"
HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hunspell
.ENDIF
@@ -113,3 +115,8 @@ $(MISC)/lnth.component .ERRREMOVE : $(SO
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt lnth.component
+
+.ELSE
+all:
+ @echo "hunspell disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/mythes/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/mythes/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/mythes/makefile.mk (original)
+++ incubator/ooo/trunk/main/mythes/makefile.mk Sun Aug 28 15:46:31 2011
@@ -36,6 +36,8 @@ TARGET=mythes
# --- Files --------------------------------------------------------
+.IF "$(DISABLE_HUNSPELL)" == ""
+
TARFILE_NAME=mythes-1.2.0
TARFILE_MD5=067201ea8b126597670b5eff72e1f66c
@@ -112,3 +114,7 @@ OUT2INC += mythes.hxx
.EXPORT: HUNSPELL_LIBS HUNSPELL_CFLAGS
.ENDIF
+.ELSE
+all:
+ @echo "hunspell disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Sun Aug 28 15:46:31 2011
@@ -106,11 +106,9 @@ my_components = \
frm \
guesslang \
hwp \
- hyphen \
i18npool \
i18nsearch \
lng \
- lnth \
localebe1 \
log \
mcnttype \
@@ -148,7 +146,6 @@ my_components = \
sm \
smd \
solver \
- spell \
spl \
srtrs1 \
stringresource \
@@ -173,14 +170,12 @@ my_components = \
vbaevents \
vbaobj \
vclcanvas \
- wpft \
writerfilter \
xcr \
xmlfa \
xmlfd \
xmx \
xsltdlg \
- xsltfilter \
xstor
.IF "$(OS)" == "MACOSX"
@@ -197,6 +192,25 @@ my_components += component/vcl/vcl.unx
my_components += oooimprovement
.END
+.IF "$(DISABLE_SAXON)" == ""
+my_components += XSLTFilter.jar \
+ xsltfilter
+.END
+
+.IF "$(DISABLE_HYPHEN)" == ""
+my_components += hyphen
+.END
+
+.IF "$(DISABLE_HUNSPELL)" == ""
+my_components += \
+ lnth \
+ spell
+.END
+
+.IF "$(DISABLE_LIBWPD)" == ""
+my_components += wpft
+.END
+
.IF "$(DISABLE_ATL)" == ""
my_components += emboleobj
.END
@@ -249,7 +263,6 @@ my_components += \
ScriptProviderForJava \
ScriptProviderForJavaScript \
XMergeBridge \
- XSLTFilter.jar \
XSLTValidate \
agenda \
fax \
Modified: incubator/ooo/trunk/main/rhino/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/rhino/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/rhino/makefile.mk (original)
+++ incubator/ooo/trunk/main/rhino/makefile.mk Sun Aug 28 15:46:31 2011
@@ -38,6 +38,8 @@ TARGET=ooo_rhino
# --- Files --------------------------------------------------------
+#.IF "$(DISABLE_RHINO)" == ""
+
TARFILE_NAME=rhino1_5R5
TARFILE_MD5=798b2ffdc8bcfe7bca2cf92b62caf685
TARFILE_ROOTDIR=rhino1_5R5
@@ -63,6 +65,11 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+#.ELSE
+#all:
+# @echo rhino disabled
+#.ENDIF
+
.ELSE
all:
@echo java disabled
Modified: incubator/ooo/trunk/main/saxon/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/saxon/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/saxon/makefile.mk (original)
+++ incubator/ooo/trunk/main/saxon/makefile.mk Sun Aug 28 15:46:31 2011
@@ -35,6 +35,8 @@ TARGET=saxon
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.IF "$(DISABLE_SAXON)" == ""
+
.IF "$(SOLAR_JAVA)" != ""
.IF "$(SYSTEM_SAXON)" == "YES"
all:
@@ -67,3 +69,7 @@ nojava:
.INCLUDE : tg_ext.mk
.ENDIF
+.ELSE
+all:
+ @echo "saxon disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Sun Aug 28 15:46:31 2011
@@ -889,7 +889,9 @@ End
#endif
+#ifndef DISABLE_LIBWPD
STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
+#endif
STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
@@ -1311,12 +1313,14 @@ End
#endif
+#ifndef DISABLE_HUNSPELL
File gid_File_Lib_Spell
TXT_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(spell);
Dir = SCP2_OOO_BIN_DIR;
End
+#endif
STD_LIB_FILE( gid_File_Lib_Spl, spl)
@@ -1429,19 +1433,23 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpe
SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
+#ifndef DISABLE_HUNSPELL
File gid_File_Lib_Lnth
TXT_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(lnth);
Dir = SCP2_OOO_BIN_DIR;
End
+#endif
+#ifndef DISABLE_HYPHEN
File gid_File_Lib_Hyph
TXT_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(hyphen);
Dir = SCP2_OOO_BIN_DIR;
End
+#endif
STD_LIB_FILE( gid_File_Lib_Utl , utl)
@@ -1481,12 +1489,16 @@ End
SPECIAL_LIB_FILE(gid_File_Lib_Xstor,xstor)
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 )
#ifdef SOLAR_JAVA
+#ifndef DISABLE_SAXON
STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
+#endif
STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
#endif
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=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp Sun Aug 28 15:46:31 2011
@@ -483,9 +483,11 @@ End
#ifdef SOLAR_JAVA
#ifndef SYSTEM_SAXON
+#ifndef DISABLE_SAXON
STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
#endif
#endif
+#endif
#ifndef SYSTEM_LIBTEXTCAT_DATA
// fingerprint files (lm)
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=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk Sun Aug 28 15:46:31 2011
@@ -182,6 +182,22 @@ SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\"
SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\"
.ENDIF
+.IF "$(DISABLE_SAXON)" == "TRUE"
+SCPDEFS+=-DDISABLE_SAXON
+.ENDIF
+
+.IF "$(DISABLE_LIBWPD)" == "TRUE"
+SCPDEFS+=-DDISABLE_LIBWPD
+.ENDIF
+
+.IF "$(DISABLE_HUNSPELL)" == "TRUE"
+SCPDEFS+=-DDISABLE_HUNSPELL
+.ENDIF
+
+.IF "$(DISABLE_HYPHEN)" == "TRUE"
+SCPDEFS+=-DDISABLE_HYPHEN
+.ENDIF
+
.IF "$(JDK)" == "gcj"
SCPDEFS+=-DGCJ
.ENDIF
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Sun Aug 28 15:46:31 2011
@@ -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_TOOLKIT, $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 =~ 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" );
Modified: incubator/ooo/trunk/main/sw/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/prj/build.lst?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/prj/build.lst (original)
+++ incubator/ooo/trunk/main/sw/prj/build.lst Sun Aug 28 15:46:31 2011
@@ -1,2 +1,2 @@
-sw sw : filter L10N:l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter LIBXSLT:libxslt NULL
+sw sw : filter L10N:l10n connectivity LIBWPD:writerperfect vbahelper svx stoc writerfilter LIBXSLT:libxslt NULL
sw sw\prj nmake - all sw_prj NULL
Modified: incubator/ooo/trunk/main/writerperfect/source/filter/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerperfect/source/filter/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerperfect/source/filter/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerperfect/source/filter/makefile.mk Sun Aug 28 15:46:31 2011
@@ -6,6 +6,8 @@ ENABLE_EXCEPTIONS=true
.INCLUDE : settings.mk
+.IF "$(DISABLE_LIBWPD)" == ""
+
.IF "$(SYSTEM_LIBWPD)" == "YES"
INCPRE+=$(LIBWPD_CFLAGS) -I..
.ELSE
@@ -25,3 +27,8 @@ SLOFILES= \
$(SLO)$/DocumentCollector.obj
.INCLUDE : target.mk
+
+.ELSE
+all:
+ @echo "libwpd disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/writerperfect/source/stream/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerperfect/source/stream/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerperfect/source/stream/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerperfect/source/stream/makefile.mk Sun Aug 28 15:46:31 2011
@@ -6,6 +6,8 @@ ENABLE_EXCEPTIONS=true
.INCLUDE : settings.mk
+.IF "$(DISABLE_LIBWPD)" == ""
+
.IF "$(SYSTEM_LIBWPD)" == "YES"
INCPRE+=$(LIBWPD_CFLAGS)
.ENDIF
@@ -16,3 +18,8 @@ INCPRE+= -I..
SLOFILES= $(SLO)$/WPXSvStream.obj
.INCLUDE : target.mk
+
+.ELSE
+all:
+ @echo "libwpd disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/writerperfect/source/wpdimp/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerperfect/source/wpdimp/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerperfect/source/wpdimp/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerperfect/source/wpdimp/makefile.mk Sun Aug 28 15:46:31 2011
@@ -6,6 +6,8 @@ ENABLE_EXCEPTIONS=true
.INCLUDE : settings.mk
+.IF "$(DISABLE_LIBWPD)" == ""
+
.IF "$(SYSTEM_LIBWPD)" == "YES"
INCPRE+=$(LIBWPD_CFLAGS) -I..
.ELSE
@@ -19,3 +21,8 @@ SLOFILES= \
$(SLO)$/wpft_genericfilter.obj
.INCLUDE : target.mk
+
+.ELSE
+all:
+ @echo "libwpd disabled"
+.ENDIF
Modified: incubator/ooo/trunk/main/writerperfect/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerperfect/util/makefile.mk?rev=1162539&r1=1162538&r2=1162539&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerperfect/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerperfect/util/makefile.mk Sun Aug 28 15:46:31 2011
@@ -4,6 +4,8 @@ TARGET=writerperfect
.INCLUDE : settings.mk
+.IF "$(DISABLE_LIBWPD)" == ""
+
.IF "$(GUI)"=="UNX"
.IF "$(SYSTEM_LIBWPD)" == "YES"
LIBWPD=$(LIBWPD_LIBS)
@@ -51,3 +53,8 @@ $(MISC)/wpft.component .ERRREMOVE : $(SO
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt wpft.component
+
+.ELSE
+all:
+ @echo "libwpd disabled"
+.ENDIF