Tue Jan 3 23:51:22 PST 2012

basctl/AllLangResTarget_basctl.mk          |    2 -
 dbaccess/AllLangResTarget_dbu.mk           |    2 -
 dbaccess/AllLangResTarget_dbui.mk          |    2 -
 extensions/AllLangResTarget_san.mk         |   44 --------------------------
 extensions/AllLangResTarget_scn.mk         |   49 +++++++++++++++++++++++++++++
 extensions/Library_OOoSpotlightImporter.mk |    3 +
 extensions/Module_extensions.mk            |    2 -
 reportdesign/AllLangResTarget_rpt.mk       |    2 -
 reportdesign/AllLangResTarget_rptui.mk     |    2 -
 sc/AllLangResTarget_sc.mk                  |    2 -
 scp2/source/ooo/file_resource_ooo.scp      |    2 -
 sd/AllLangResTarget_sd.mk                  |    2 -
 solenv/gbuild/platform/macosx.mk           |    1 
 starmath/AllLangResTarget_sm.mk            |    2 -
 sw/AllLangResTarget_sw.mk                  |    2 -
 tail_build/prj/build.lst                   |    2 -
 16 files changed, 64 insertions(+), 57 deletions(-)

New commits:
commit 381bed81e43d7fdd541115e0ab4213b0609e7ac0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jan 4 01:50:57 2012 -0600

    Hack to get OOoSpotlightImporter building: FIXME this is prolly not correct

diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk
index 639b381..f8a4c3c 100644
--- a/extensions/Library_OOoSpotlightImporter.mk
+++ b/extensions/Library_OOoSpotlightImporter.mk
@@ -44,8 +44,9 @@ $(eval $(call gb_Library_add_ldflags,OOoSpotlightImporter,\
 	-framework CoreFoundation \
 	-framework Foundation \
 	-framework CoreServices \
-	-bundle \
 ))
+#	-bundle \
+
 
 $(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib))
 
commit ca6959e676984befb58b5510e9bdccc6d5fc4a7e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jan 4 01:33:58 2012 -0600

    add PLAINLIBS_NONE in the LAYER

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index ef82a82..bd92908 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -284,6 +284,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \
 	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
commit 1c6f4e6ff73034cf312662c4bda31bccd36c966b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jan 4 01:48:49 2012 -0600

    fix dep to svx/globlmn.hrc inside of tail_build

diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index 7e588d1..fee9fc0 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -54,6 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\
 	basctl/source/dlged/managelang.src \
 ))
 
-$(call gb_SrsTarget_get_target,basctl/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,basctl/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 15b6806..177bfa3 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -90,6 +90,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\
     dbaccess/source/ui/inc/toolbox_tmpl.hrc \
 ))
 
-$(call gb_SrsTarget_get_target,dbaccess/dbu) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,dbaccess/dbu) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index 7478fc2..f17c96c 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -92,6 +92,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbui,\
     dbaccess/source/ui/inc/toolbox_tmpl.hrc \
 ))
 
-$(call gb_SrsTarget_get_target,dbaccess/dbui) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,dbaccess/dbui) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index 76baa19..71e2116 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -45,6 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
     reportdesign/source/core/resource/strings.src \
 ))
 
-$(call gb_SrsTarget_get_target,reportdesign/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,reportdesign/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index 23edf34..18674e0 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -54,6 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\
 	reportdesign/source/ui/report/report.src \
 ))
 
-$(call gb_SrsTarget_get_target,reportdesign/rptui) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,reportdesign/rptui) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index ce5915b..5722899 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -105,6 +105,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
     sc/source/core/src/compiler.src \
 ))
 
-$(call gb_SrsTarget_get_target,sc/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,sc/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 25eab89..fd2225b 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -107,6 +107,6 @@ $(eval $(call gb_SrsTarget_add_templates,sd/res,\
     sd/source/ui/app/toolbox2_tmpl.src \
 ))
 
-$(call gb_SrsTarget_get_target,sd/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,sd/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
index a1f31a4..3cfda79 100644
--- a/starmath/AllLangResTarget_sm.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -48,6 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sm/res,\
 	starmath/source/toolbox.src \
 ))
 
-$(call gb_SrsTarget_get_target,sm/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,sm/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 43386be..5bb50ab 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -188,6 +188,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/wrtsh/wrtsh.src \
 ))
 
-$(call gb_SrsTarget_get_target,sw/res) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,sw/res) :| $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
commit ec7c098a28b900110413ab97ab522686d94c3d40
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jan 4 01:31:26 2012 -0600

    afms is a dep of tail_build by virtue of ps_print now being in tail_build

diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index f1ef4f8..0c1f24d 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit a8bdde191c83b3cbdd7647a46ed0701d573f886c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jan 4 01:30:44 2012 -0600

    fix sanedlg.hrc dep issue due to gbuildification of extensions

diff --git a/extensions/AllLangResTarget_san.mk b/extensions/AllLangResTarget_san.mk
deleted file mode 100644
index 2301f6c..0000000
--- a/extensions/AllLangResTarget_san.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl at redhat.com> (initial developer) ]
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,san))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,san,extensions/source/scanner))
-
-$(eval $(call gb_AllLangResTarget_add_srs,san,\
-	scn/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,scn/res))
-
-$(eval $(call gb_SrsTarget_add_files,scn/res,\
-	extensions/source/scanner/grid.src \
-	extensions/source/scanner/sanedlg.src \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/AllLangResTarget_scn.mk b/extensions/AllLangResTarget_scn.mk
new file mode 100644
index 0000000..8b8dde4
--- /dev/null
+++ b/extensions/AllLangResTarget_scn.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl at redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,scn))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,scn,extensions/source/scanner))
+
+$(eval $(call gb_AllLangResTarget_add_srs,scn,\
+	scn/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,scn/res))
+
+$(eval $(call gb_SrsTarget_set_include,scn/res,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/source/scanner \
+))
+
+$(eval $(call gb_SrsTarget_add_files,scn/res,\
+	extensions/source/scanner/grid.src \
+	extensions/source/scanner/sanedlg.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 348b95e..62caaf6 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	AllLangResTarget_bib \
 	AllLangResTarget_dbp \
 	AllLangResTarget_pcr \
-	AllLangResTarget_san \
+	AllLangResTarget_scn \
 	AllLangResTarget_upd \
 	AllLangResTarget_updchk \
 	Configuration_updchk \
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 6a23a9f..311dd9f 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -68,7 +68,7 @@ STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
 
 #ifdef UNX
 
-STD_RES_FILE( gid_File_Res_San, san )
+STD_RES_FILE( gid_File_Res_San, scn )
 
 #endif
 
