incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1201697 - in /incubator/ooo/trunk/main: ./ filter/source/config/fragments/ libwpd/ postprocess/packcomponents/ scp2/source/ooo/ sw/prj/ writerperfect/prj/ writerperfect/source/filter/ writerperfect/source/stream/ writerperfect/source/wpdim...
Date Mon, 14 Nov 2011 13:37:30 GMT
Author: jsc
Date: Mon Nov 14 13:37:29 2011
New Revision: 1201697

URL: http://svn.apache.org/viewvc?rev=1201697&view=rev
Log:
118587: remove libwpd, disable WordPerfect filter, allow built with system libwpd

Removed:
    incubator/ooo/trunk/main/libwpd/
Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk
    incubator/ooo/trunk/main/ooo.lst
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
    incubator/ooo/trunk/main/set_soenv.in
    incubator/ooo/trunk/main/sw/prj/build.lst
    incubator/ooo/trunk/main/writerperfect/prj/build.lst
    incubator/ooo/trunk/main/writerperfect/source/filter/makefile.mk
    incubator/ooo/trunk/main/writerperfect/source/stream/makefile.mk
    incubator/ooo/trunk/main/writerperfect/source/wpdimp/makefile.mk
    incubator/ooo/trunk/main/writerperfect/util/makefile.mk

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Mon Nov 14 13:37:29 2011
@@ -1240,7 +1240,6 @@ if test "$enable_copyleft" != "yes"; the
 
    DISABLE_HUNSPELL="TRUE"
    DISABLE_HYPHEN="TRUE"
-   DISABLE_LIBWPD="TRUE"
    DISABLE_SAXON="TRUE"
 
    BUILD_EPM="NO"
@@ -1251,7 +1250,6 @@ else
 
    DISABLE_HUNSPELL=
    DISABLE_HYPHEN=
-   DISABLE_LIBWPD=
    DISABLE_SAXON=
 
    AC_MSG_RESULT([no])
@@ -1259,7 +1257,6 @@ else
 fi
 AC_SUBST(DISABLE_HUNSPELL)
 AC_SUBST(DISABLE_HYPHEN)
-AC_SUBST(DISABLE_LIBWPD)
 AC_SUBST(DISABLE_SAXON)
 AC_SUBST(BUILD_EPM)
 
@@ -3671,22 +3668,16 @@ 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
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPD=YES
     PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LIBWPD=NO
-    BUILD_TYPE="$BUILD_TYPE LIBWPD"
 fi
 AC_SUBST(SYSTEM_LIBWPD)
 AC_SUBST(LIBWPD_CFLAGS)
 AC_SUBST(LIBWPD_LIBS)
-fi
 
 dnl ===================================================================
 dnl Check for system cppunit

Modified: incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk?rev=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk (original)
+++ incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk Mon Nov 14 13:37:29
2011
@@ -17,7 +17,6 @@ T4_WRITER = \
     writer_MS_Word_97_Vorlage \
     writer_Rich_Text_Format \
     writer_StarOffice_XML_Writer \
-    writer_WordPerfect_Document \
     writer_T602_Document \
     writer_Text \
     writer_Text_encoded \
@@ -27,11 +26,15 @@ T4_WRITER = \
     writer8_template\
     writer8 \
     writer_MS_Word_2003_XML \
-	writer_MS_Word_2007_XML \
-	writer_MS_Word_2007_XML_Template
+    writer_MS_Word_2007_XML \
+    writer_MS_Word_2007_XML_Template
+
+.IF "$(SYSTEM_LIBWPD)" == "YES"
+T4_WRITER += writer_WordPerfect_Document
+.ENDIF
 
 # -----------------------------------------------
-# count = 39
+# count = 38
 F4_WRITER = \
 	HTML__StarWriter_ \
 	Lotus_1_2_3_1_0__DOS___StarWriter_ \
@@ -47,7 +50,6 @@ F4_WRITER = \
 	MS_Word_97_Vorlage \
 	Rich_Text_Format \
 	StarOffice_XML__Writer_ \
-	WordPerfect \
 	T602Document \
 	Text \
 	Text__encoded_ \
@@ -56,10 +58,15 @@ F4_WRITER = \
 	writer_pdf_Export\
 	writer8\
 	writer8_template \
-    MS_Word_2003_XML \
+	MS_Word_2003_XML \
 	MS_Word_2007_XML \
 	MS_Word_2007_XML_Template
 
+.IF "$(SYSTEM_LIBWPD)" == "YES"
+F4_WRITER += WordPerfect
+.ENDIF
+
+
 # -----------------------------------------------
 # count = 14
 F4_UI_WRITER = \

Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Mon Nov 14 13:37:29 2011
@@ -41,7 +41,6 @@ af3c3acf618de6108d65fcdc92b492e1-commons
 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
 ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
-cd5997284f4ba1e8dde5d1e5869fc342-libwpd-0.8.8.tar.gz
 d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
 d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
 e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt

Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Mon Nov 14 13:37:29 2011
@@ -206,7 +206,7 @@ my_components += \
     spell
 .END
 
-.IF "$(DISABLE_LIBWPD)" == ""
+.IF "$(SYSTEM_LIBWPD)" == "YES"
 my_components +=     wpft
 .END
 

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=1201697&r1=1201696&r2=1201697&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 Mon Nov 14 13:37:29 2011
@@ -873,7 +873,7 @@ End
 
 #endif
 
-#ifndef DISABLE_LIBWPD
+#ifdef SYSTEM_LIBWPD
 STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
 #endif
 

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=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk Mon Nov 14 13:37:29 2011
@@ -109,6 +109,10 @@ SCPDEFS+=-DENABLE_CAIRO
 SCPDEFS+=-DSYSTEM_LIBXML
 .ENDIF
 
+.IF "$(SYSTEM_LIBWPD)" == "YES"
+SCPDEFS+=-DSYSTEM_LIBWPD
+.ENDIF
+
 .IF "$(SYSTEM_LIBXSLT)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBXSLT
 .ELSE

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Mon Nov 14 13:37:29 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, $DISABLE_HUNSPELL, $DISABLE_HYPHEN, $DISABLE_LIBWPD,
+     $DISABLE_SAXON, $DISABLE_HUNSPELL, $DISABLE_HYPHEN,
      $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
 #
 #-------------------------------------------
@@ -1771,8 +1771,6 @@ if ( $platform =~ m/cygwin/ )
 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" );

Modified: incubator/ooo/trunk/main/sw/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/prj/build.lst?rev=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/prj/build.lst (original)
+++ incubator/ooo/trunk/main/sw/prj/build.lst Mon Nov 14 13:37:29 2011
@@ -1,2 +1,2 @@
-sw      sw      :    filter L10N:l10n connectivity LIBWPD:writerperfect vbahelper svx stoc
writerfilter LIBXSLT:libxslt NULL
+sw      sw      :    filter L10N:l10n connectivity vbahelper svx stoc writerfilter LIBXSLT:libxslt
NULL
 sw sw\prj nmake - all sw_prj   NULL

Modified: incubator/ooo/trunk/main/writerperfect/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerperfect/prj/build.lst?rev=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerperfect/prj/build.lst (original)
+++ incubator/ooo/trunk/main/writerperfect/prj/build.lst Mon Nov 14 13:37:29 2011
@@ -1,4 +1,4 @@
-wp      writerperfect : LIBWPD:libwpd sot comphelper xmloff LIBXSLT:libxslt NULL
+wp      writerperfect : sot comphelper xmloff LIBXSLT:libxslt NULL
 wp	writerperfect			usr1	-	all	wp_mkout NULL
 wp	writerperfect\source\stream	nmake	-	all	wp_stream NULL
 wp	writerperfect\source\filter	nmake	-	all	wp_filter 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=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerperfect/source/filter/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerperfect/source/filter/makefile.mk Mon Nov 14 13:37:29 2011
@@ -6,7 +6,7 @@ ENABLE_EXCEPTIONS=true
 
 .INCLUDE :  settings.mk
 
-.IF "$(DISABLE_LIBWPD)" == ""
+.IF "$(SYSTEM_LIBWPD)" == "YES"
 
 .IF "$(SYSTEM_LIBWPD)" == "YES"
 INCPRE+=$(LIBWPD_CFLAGS) -I..
@@ -30,5 +30,5 @@ SLOFILES= \
 
 .ELSE
 all:
-	@echo "libwpd disabled"
+	@echo "no system libwpd is used..."
 .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=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerperfect/source/stream/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerperfect/source/stream/makefile.mk Mon Nov 14 13:37:29 2011
@@ -6,7 +6,7 @@ ENABLE_EXCEPTIONS=true
 
 .INCLUDE :  settings.mk
 
-.IF "$(DISABLE_LIBWPD)" == ""
+.IF "$(SYSTEM_LIBWPD)" == "YES"
 
 .IF "$(SYSTEM_LIBWPD)" == "YES"
 INCPRE+=$(LIBWPD_CFLAGS)
@@ -21,5 +21,5 @@ SLOFILES= $(SLO)$/WPXSvStream.obj
 
 .ELSE
 all:
-	@echo "libwpd disabled"
+	@echo "no system libwpd is used..."
 .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=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerperfect/source/wpdimp/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerperfect/source/wpdimp/makefile.mk Mon Nov 14 13:37:29 2011
@@ -6,7 +6,7 @@ ENABLE_EXCEPTIONS=true
 
 .INCLUDE :  settings.mk
 
-.IF "$(DISABLE_LIBWPD)" == ""
+.IF "$(SYSTEM_LIBWPD)" == "YES"
 
 .IF "$(SYSTEM_LIBWPD)" == "YES"
 INCPRE+=$(LIBWPD_CFLAGS) -I..
@@ -24,5 +24,5 @@ SLOFILES= \
 
 .ELSE
 all:
-	@echo "libwpd disabled"
+	@echo "no system libwpd is used..."
 .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=1201697&r1=1201696&r2=1201697&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerperfect/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerperfect/util/makefile.mk Mon Nov 14 13:37:29 2011
@@ -4,7 +4,7 @@ TARGET=writerperfect
 
 .INCLUDE :  settings.mk
 
-.IF "$(DISABLE_LIBWPD)" == ""
+.IF "$(SYSTEM_LIBWPD)" == "YES"
 
 .IF "$(GUI)"=="UNX"
 .IF "$(SYSTEM_LIBWPD)" == "YES"
@@ -56,5 +56,5 @@ $(MISC)/wpft.component .ERRREMOVE : $(SO
 
 .ELSE
 all:
-	@echo "libwpd disabled"
+	@echo "no system libpwd is used..."
 .ENDIF



Mime
View raw message