GNOME.org
 

ooo-build r12998 - in trunk: . patches/dev300

Author: rengelhard
Date: Mon Jun 30 18:08:29 2008
New Revision: 12998
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12998&view=rev

Log:
2008-06-30  Rene Engelhard  <rene debian org>

        * patches/dev300/apply: OLDEST_SUPPORTED=dev300-m21,beb300-m0
        * patches/dev300/apply,
          patches/dev300/vba-3-layer-missingtypes.diff,
          patches/dev300/fix-system-hunspell.diff,
          patches/dev300/speed-configmgr-misc-m19.diff: remove everything
          < dev300-m21
        * patches/dev300/apply: update for beb300-m1
        * patches/dev300/apply,
          patches/dev300/debian-system-lucene.diff,
          patches/dev300/system-lucene.diff: add system-lucene stuff for
          >= m22
        * configure.in: default to dev300-m21


Added:
   trunk/patches/dev300/debian-system-lucene.diff
   trunk/patches/dev300/system-lucene.diff
Removed:
   trunk/patches/dev300/fix-system-hunspell.diff
   trunk/patches/dev300/speed-configmgr-misc-m19.diff
   trunk/patches/dev300/vba-3-layer-missingtypes.diff
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/dev300/apply

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jun 30 18:08:29 2008
@@ -3,7 +3,7 @@
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=dev300-m19
+DEFAULT_TAG=dev300-m21
 # For the upstream packages it is like:
 # DEFAULT_TAG=OOH680_m12
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jun 30 18:08:29 2008
@@ -7,7 +7,7 @@
 
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting
 
-OLDEST_SUPPORTED=dev300-m19
+OLDEST_SUPPORTED=dev300-m21,beb300-m0
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -228,14 +228,9 @@
 # Make the historically very verbose build quieter, helps us see warnings.
 quiet-build.diff, i#84497, michael
 
-[ TemporaryHacks < dev300-m20 ]
-# further performance tweaks to configmgr
-speed-configmgr-misc-m19.diff, i#84751, michael
-[ TemporaryHacks >= dev300-m20 ]
 # further performance tweaks to configmgr
 speed-configmgr-misc.diff, i#84751, michael
 
-[ TemporaryHacks ]
 # gcc OOMs here otherwise (x86_64)
 writerfilter-qnametostr-NOOPTFILES.diff
 
@@ -256,7 +251,6 @@
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths.diff, i#90430, jholesov
 
-[ TemporaryHacks >= dev300-m20 ]
 # no idea why that (sometimes?) does not get called anymore
 ac-objext-hack.diff
 
@@ -492,11 +486,6 @@
 
 localize-pl-cygwin-paths.diff, tml
 
-[ Fixes < dev300-m20 ]
-# vba types are not available, causes all sort strangeness
-vba-3-layer-missingtypes.diff, i#88739, noelpwer
-
-[ Fixes ]
 # init a bool member in SbUnoObject's ctor initializer.
 basic-initialize-member.diff, i#88930, kohei
 
@@ -939,17 +928,16 @@
 # omit './' in paths
 solenv-installer-cleaner-paths.diff, pmladek
 
-[ BuildBits >= dev300-m20 ]
-# fix reportdesign build
-buildfix-system-jfreereport.diff, i#90952, rengelha
-
 # fix evo2 driver build
 buildfix-connectivity-evoab2.diff, i#91025, pmladek
 
-[ BuildBits < dev300-m20 ]
-# fix build with system-hunspell
-fix-system-hunspell.diff, i#87604
+[ BuildBits < beb300-m1 ]
+# fix reportdesign build
+buildfix-system-jfreereport.diff, i#90952, rengelha
 
+[ BuildBits >= dev300-m22 ]
+# system lucene
+system-lucene.diff
 
 [ Gcc43 ]
 # gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
@@ -2038,6 +2026,7 @@
 [ DebianBaseOnly ]
 debian-system-jfreereport.diff
 debian-system-apache-commons.diff
+#debian-system-lucene.diff
 # FIXME: does this need more for DEV300s new external modules?
 configures-explicit-arch.diff
 

Added: trunk/patches/dev300/debian-system-lucene.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/debian-system-lucene.diff	Mon Jun 30 18:08:29 2008
@@ -0,0 +1,11 @@
+Index: MANIFEST.MF
+===================================================================
+RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/MANIFEST.MF,v
+retrieving revision 1.2
+diff -u -u -r1.2 MANIFEST.MF
+--- xmlhelp/source/com/sun/star/help/MANIFEST.MF	24 Jun 2008 16:19:03 -0000	1.2
++++ xmlhelp/source/com/sun/star/help/MANIFEST.MF	27 Jun 2008 21:05:05 -0000
+@@ -1,2 +1,2 @@
+ RegistrationClassName: com.sun.star.help.HelpSearch
+-Class-Path: lucene-core-2.3.jar
++Class-Path: file:///usr/share/java/lucene-core.jar

Added: trunk/patches/dev300/system-lucene.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/system-lucene.diff	Mon Jun 30 18:08:29 2008
@@ -0,0 +1,167 @@
+Index: prj/build.lst
+===================================================================
+RCS file: /cvs/util/xmlhelp/prj/build.lst,v
+retrieving revision 1.17
+diff -u -u -r1.17 build.lst
+--- xmlhelp/prj/build.lst	24 Jun 2008 16:17:30 -0000	1.17
++++ xmlhelp/prj/build.lst	27 Jun 2008 20:20:55 -0000
+@@ -1,4 +1,4 @@
+-xh	xmlhelp	:	ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools lucene NULL
++xh	xmlhelp	:	ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene NULL
+ xh	xmlhelp									usr1	-	all	xh_mkout NULL
+ xh	xmlhelp\inc								nmake	-	all	xh_inc NULL
+ xh	xmlhelp\source\treeview					nmake	-	all	xh_treeview xh_inc NULL
+Index: source/com/sun/star/help/makefile.mk
+===================================================================
+RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
+retrieving revision 1.36
+diff -u -u -r1.36 makefile.mk
+--- xmlhelp/source/com/sun/star/help/makefile.mk	24 Jun 2008 16:19:16 -0000	1.36
++++ xmlhelp/source/com/sun/star/help/makefile.mk	27 Jun 2008 20:20:55 -0000
+@@ -100,7 +100,12 @@
+ 	$(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class			        \
+ 	$(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class
+ 
+-JARFILES  = lucene-core-2.3.jar ridl.jar jurt.jar unoil.jar juh.jar
++JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar
++.IF "$(SYSTEM_LUCENE)" == "YES"
++JARFILES += lucene-core-2.3.jar
++.ELSE
++XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
++.ENDIF
+ JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
+   
+ JARTARGET	   = LuceneHelpWrapper.jar
+? unxlngx6.pro
+Index: source/ooo/file_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
+retrieving revision 1.249
+diff -u -u -r1.249 file_ooo.scp
+--- scp2/source/ooo/file_ooo.scp	24 Jun 2008 16:25:44 -0000	1.249
++++ scp2/source/ooo/file_ooo.scp	27 Jun 2008 20:29:52 -0000
+@@ -476,8 +476,10 @@
+ #endif
+ 
+ #ifdef SOLAR_JAVA
++#ifndef SYSTEM_LUCENE
+ STD_JAR_FILE( gid_File_Jar_Lucene, lucene-core-2.3 )
+ #endif
++#endif
+ 
+ #ifdef SOLAR_JAVA
+ UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
+--- scp2/source/ooo/makefile.mk	30 Jun 2008 15:24:20 -0000	1.70
++++ scp2/source/ooo/makefile.mk	30 Jun 2008 17:46:41 -0000
+@@ -179,6 +179,10 @@
+ SCPDEFS+=-DENABLE_CAIRO
+ .ENDIF
+ 
++.IF "$(SYSTEM_LUCENE)" == "YES"
++SCPDEFS+=-DSYSTEM_LUCENE
++.ENDIF
++
+ .IF "$(SYSTEM_ICU)" == "YES"
+ SCPDEFS+=-DSYSTEM_ICU
+ .ELSE
+Index: configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.272
+diff -u -u -r1.272 configure.in
+--- config_office/configure.in	24 Jun 2008 11:59:33 -0000	1.272
++++ config_office/configure.in	27 Jun 2008 20:31:29 -0000
+@@ -339,6 +339,13 @@
+ AC_ARG_WITH(system-db,
+ [  --with-system-db        Use berkeley db already on system
+ ],,)
++AC_ARG_WITH(system-lucene,
++[  --with-system-lucene    Use hsqldb already on system
++],,)
++AC_ARG_WITH(lucene-core-jar,
++[  --with-lucene-core-jar=JARFILE   Specify path to jarfile manually ],
++[ LUCENE_CORE_JAR="$withval"
++])
+ AC_ARG_WITH(system-hsqldb,
+ [  --with-system-hsqldb    Use hsqldb already on system
+ ],,)
+@@ -3660,6 +3675,27 @@
+ AC_SUBST(DB_JAR)
+ 
+ dnl ===================================================================
++dnl Check for system lucene
++dnl ===================================================================
++AC_MSG_CHECKING([which lucene to use])
++if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
++       test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
++        AC_MSG_RESULT([external])
++        SYSTEM_LUCENE=YES
++        if test -z $LUCENE_CORE_JAR; then
++               LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
++        fi
++        AC_CHECK_FILE($LUCENE_CORE_JAR, [],
++               [AC_MSG_ERROR(lucene-core.jar not found.)], [])
++else
++    AC_MSG_RESULT([internal])
++    SYSTEM_LUCENE=NO
++    BUILD_TYPE="$BUILD_TYPE LUCENE"
++fi
++AC_SUBST(SYSTEM_LUCENE)
++AC_SUBST(LUCENE_CORE_JAR)
++
++dnl ===================================================================
+ dnl Check for system hsqldb
+ dnl ===================================================================
+ AC_MSG_CHECKING([which hsqldb to use])
+Index: set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.190
+diff -u -u -r1.190 set_soenv.in
+--- config_office/set_soenv.in	13 Jun 2008 14:11:11 -0000	1.190
++++ config_office/set_soenv.in	27 Jun 2008 20:31:29 -0000
+@@ -1969,6 +1969,8 @@
+ ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
+ ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
+ ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
++ToFile( "SYSTEM_LUCENE",     "@SYSTEM_LUCENE@",    "e" );
++ToFile( "LUCENE_CORE_JAR",   "@LUCENE_CORE_JAR@",  "e" );
+ ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
+ ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
+ ToFile( "SYSTEM_XML_APIS",   "@SYSTEM_XML_APIS@",  "e" );
+Index: sdev300.ini
+===================================================================
+RCS file: /cvs/tools/solenv/config/sdev300.ini,v
+retrieving revision 1.35
+diff -u -u -r1.35 sdev300.ini
+--- solenv/config/sdev300.ini	26 Jun 2008 11:21:33 -0000	1.35
++++ solenv/config/sdev300.ini	27 Jun 2008 20:35:10 -0000
+@@ -91,7 +91,7 @@
+ 		{
+ 			BIG_SVX TRUE
+ 			BMP_WRITES_FLAG TRUE
+-            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF
++            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF LUCENE
+ 			RES_ENUS TRUE
+ 			RES_GER TRUE
+ 			NO_REC_RES TRUE
+Index: settings.pmk
+===================================================================
+RCS file: /cvs/documentation/helpcontent2/settings.pmk,v
+retrieving revision 1.10
+diff -u -u -r1.10 settings.pmk
+--- helpcontent2/settings.pmk	24 Jun 2008 16:16:09 -0000	1.10
++++ helpcontent2/settings.pmk	28 Jun 2008 00:37:39 -0000
+@@ -1,6 +1,11 @@
+ .INCLUDE : $(INCCOM)$/aux_langs.mk
+ 
+-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
++my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
++.IF "$(SYSTEM_LUCENE)" == "YES"
++my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
++.ELSE
++my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
++.ENDIF
+  
+ .IF "$(SYSTEM_DB)" != "YES"
+ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]