Update from master repository (DEV300_m82).

6 files changed, 15 insertions, 11 deletions

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 5e26b604ad41..231857195f37 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -531,6 +531,7 @@ BEGIN
     $wrapcmd = "";
 
     if ( $plat =~ /linux/i ) { $islinux = 1; }
+    if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
     if ( $plat =~ /solaris/i ) { $issolaris = 1; }
     if ( $plat =~ /darwin/i ) { $ismacosx = 1; }
 
diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm
index 55da94a211d2..a0a50dc11958 100644
--- a/solenv/bin/modules/pre2par/globals.pm
+++ b/solenv/bin/modules/pre2par/globals.pm
@@ -60,6 +60,7 @@ BEGIN
     $issolaris = 0;
 
     if ( $plat =~ /linux/i ) { $islinux = 1; }
+    if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
     if ( $plat =~ /solaris/i ) { $issolaris = 1; }
 
 }
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 885a126a6845..d04a87c595e2 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,7 +8,7 @@ common
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
 			BUILD_SPECIAL TRUE
-			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
+			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
 			common_build TRUE
 			COMMON_OUTDIR common
 			CONFIG_PROJECT config_office
@@ -2892,7 +2892,7 @@ wntmsci12
 			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
+			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
@@ -2915,7 +2915,7 @@ wntmsci12
 			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/V6.1
+			PSDK %COMPATH%$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
@@ -2966,6 +2966,7 @@ wntmsci12
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
 			BUILD_X64 TRUE
+			CHECK_LUCENCE_INDEXER_OUTPUT TRUE
 		}
 		common0
 		{
@@ -2990,7 +2991,7 @@ wntmsci12
 			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
 			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
             PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
+			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
 			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
@@ -3234,7 +3235,7 @@ wntmsci13
 			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
+			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
@@ -3257,7 +3258,7 @@ wntmsci13
 			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/V6.1
+			PSDK %COMPATH%$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
@@ -3332,7 +3333,7 @@ wntmsci13
 			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
 			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
             PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
+			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
 			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
 			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index 54eda38b47f9..937c345e2de8 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -47,6 +47,7 @@ common
         BUILD_X64
 		CLASSPATH
 		CALL_CDECL
+		CHECK_LUCENCE_INDEXER_OUTPUT
 		COMEX
 		common_build
 		COMMON_OUTDIR
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 35f9f02ac2d6..4c69817791e8 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m80(Build:9507)
-BUILD=9507
-LAST_MINOR=m80
+RSCREVISION=300m82(Build:9510)
+BUILD=9510
+LAST_MINOR=m82
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 457041378f85..63c4d0cef28c 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -156,7 +156,7 @@ $(SLO)/precompiled_ex.% .PHONY:
 
 $(SLO)/%.obj : %.cxx
     @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" )
+.IF "$(ENABLE_PCH)"!=""
 # just a helper var	
     @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
 # cleanup first