Tue Apr 9 00:47:10 PDT 2013

Library_merged.mk                              |    2 +-
 RepositoryExternal.mk                          |   16 ++++++++--------
 helpcompiler/Executable_helpindexer.mk         |    2 +-
 helpcompiler/Executable_helplinker.mk          |    2 +-
 helpcompiler/Library_helplinker.mk             |    2 +-
 l10ntools/Executable_helpex.mk                 |    2 +-
 pyuno/source/module/pyuno_module.cxx           |    2 +-
 sax/Library_expwrap.mk                         |    2 +-
 sax/Library_fastsax.mk                         |    2 +-
 shell/Library_ooofilt.mk                       |    2 +-
 shell/Library_ooofilt_x64.mk                   |    2 +-
 shell/Library_propertyhdl.mk                   |    2 +-
 shell/Library_propertyhdl_x64.mk               |    2 +-
 shell/Library_recentfile.mk                    |    2 +-
 shell/Library_shlxthdl.mk                      |    2 +-
 shell/Library_shlxthdl_x64.mk                  |    2 +-
 shell/StaticLibrary_shlxthandler_common.mk     |    2 +-
 shell/StaticLibrary_shlxthandler_common_x64.mk |    2 +-
 shell/StaticLibrary_xmlparser.mk               |    2 +-
 shell/StaticLibrary_xmlparser_x64.mk           |    2 +-
 vcl/Library_vcl.mk                             |    2 +-
 xmlhelp/Library_tvhlp1.mk                      |    2 +-
 xmlhelp/Library_ucpchelp1.mk                   |    2 +-
 23 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 542cf6d9eaa7d3a9875e0cd258c883a69577040f
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 9 09:41:35 2013 +0200

    unbreak windows tinderbox
    
    Change-Id: Ic777267cb86acdb62b53a7b324e1423b7c6b67c5

diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 62851c4..4403e1a 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -344,7 +344,7 @@ static PyObject* initPoniesMode(
         if (!outdir) { abort(); }
         OStringBuffer libname(outdir);
         libname.append("/lib/");
-        libname.append(SAL_DLLPREFIX "test" SAL_DLLEXTENSION);
+        libname.append(SAL_MODULENAME("test"));
         oslModule const mod( osl_loadModuleAscii(libname.getStr(),
                                 SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL) );
         if (!mod) { abort(); }
commit 51149806f890e8181c016713cff30bc0c9c06450
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 9 09:22:20 2013 +0200

    rename expat external to 'expat'
    
    expat_utf16 is long gone, so there is no need to fool around with
    expat_utf8.
    
    Change-Id: I0dd4a5c4d78805e98913e645cc83d2ab634bcb89

diff --git a/Library_merged.mk b/Library_merged.mk
index ec83497..5b501d5 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_use_externals,merged,\
 	cppunit \
 	cups \
 	curl \
-	expat_utf8 \
+	expat \
 	hunspell \
 	hyphen \
 	icui18n \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 374fef4..d4e4426 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -406,8 +406,8 @@ endif # SYSTEM_MYTHES
 
 ifeq ($(SYSTEM_EXPAT),YES)
 
-define gb_LinkTarget__use_expat
-$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
+define gb_LinkTarget__use_expat_impl
+$(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
 
 $(call gb_LinkTarget_add_defs,$(1),\
 	-DSYSTEM_EXPAT \
@@ -426,8 +426,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	expat_x64 \
 ))
 
-define gb_LinkTarget__use_expat
-$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
+define gb_LinkTarget__use_expat_impl
+$(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
 
 $(call gb_LinkTarget_set_include,$(1),\
     -I$(OUTDIR)/inc/external/expat \
@@ -452,13 +452,13 @@ endef
 
 endif # SYSTEM_EXPAT
 
-define gb_LinkTarget__use_expat_utf8
-$(call gb_LinkTarget__use_expat,$(1),expat)
+define gb_LinkTarget__use_expat
+$(call gb_LinkTarget__use_expat_impl,$(1),expat)
 
 endef
 
-define gb_LinkTarget__use_expat_utf8_x64
-$(call gb_LinkTarget__use_expat,$(1),expat_x64)
+define gb_LinkTarget__use_expat_x64
+$(call gb_LinkTarget__use_expat_impl,$(1),expat_x64)
 
 endef
 
diff --git a/helpcompiler/Executable_helpindexer.mk b/helpcompiler/Executable_helpindexer.mk
index 08faae7..8b723e2 100644
--- a/helpcompiler/Executable_helpindexer.mk
+++ b/helpcompiler/Executable_helpindexer.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Executable_use_libraries,HelpIndexer,\
 ))
 
 $(eval $(call gb_Executable_use_externals,HelpIndexer,\
-    expat_utf8 \
+    expat \
     libxslt \
     libxml2 \
     clucene \
diff --git a/helpcompiler/Executable_helplinker.mk b/helpcompiler/Executable_helplinker.mk
index 1ab99a3..07bc9ac 100644
--- a/helpcompiler/Executable_helplinker.mk
+++ b/helpcompiler/Executable_helplinker.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Executable_use_libraries,HelpLinker,\
 
 $(eval $(call gb_Executable_use_externals,HelpLinker,\
     boost_headers \
-    expat_utf8 \
+    expat \
     libxslt \
     libxml2 \
     clucene \
diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk
index 9a6a989..e3bbf82 100644
--- a/helpcompiler/Library_helplinker.mk
+++ b/helpcompiler/Library_helplinker.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_internal_api,helplinker,\
 
 $(eval $(call gb_Library_use_externals,helplinker,\
     boost_headers \
-    expat_utf8 \
+    expat \
     libxslt \
     libxml2 \
     clucene \
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
index 5aa2af2..85dcae6 100644
--- a/l10ntools/Executable_helpex.mk
+++ b/l10ntools/Executable_helpex.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Executable_use_libraries,helpex,\
 ))
 
 $(eval $(call gb_Executable_use_externals,helpex,\
-	expat_utf8 \
+	expat \
 	boost_headers \
 	icu_headers \
     libxml2 \
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index cdd9afac..67eeb77 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_set_include,expwrap,\
 $(eval $(call gb_Library_use_sdk_api,expwrap))
 
 $(eval $(call gb_Library_use_externals,expwrap,\
-    expat_utf8 \
+    expat \
 ))
 
 $(eval $(call gb_Library_use_libraries,expwrap,\
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 02c0f7c..6fa858e 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Library_use_sdk_api,fastsax))
 
 $(eval $(call gb_Library_use_externals,fastsax,\
 	boost_headers \
-	expat_utf8 \
+	expat \
 	zlib \
 ))
 
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index bde227f..11adea1 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
 ))
 
 $(eval $(call gb_Library_use_externals,ooofilt,\
-	expat_utf8 \
+	expat \
 	zlib \
 ))
 
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 68fada4..f08dd74 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
 ))
 
 $(eval $(call gb_Library_use_externals,ooofilt_x64,\
-	expat_utf8_x64 \
+	expat_x64 \
 	zlib_x64 \
 ))
 
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 93d3982..2d03c66 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
 ))
 
 $(eval $(call gb_Library_use_externals,propertyhdl,\
-	expat_utf8 \
+	expat \
 	zlib \
 ))
 
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index 41aa8eb..3c8c973 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
 ))
 
 $(eval $(call gb_Library_use_externals,propertyhdl_x64,\
-	expat_utf8_x64 \
+	expat_x64 \
 	zlib_x64 \
 ))
 
diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk
index 70f57a1..303d535 100644
--- a/shell/Library_recentfile.mk
+++ b/shell/Library_recentfile.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,recentfile,\
 ))
 
 $(eval $(call gb_Library_use_externals,recentfile,\
-	expat_utf8 \
+	expat \
 ))
 
 $(eval $(call gb_Library_use_libraries,recentfile,\
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 07aa300..a171437 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
 ))
 
 $(eval $(call gb_Library_use_externals,shlxthdl,\
-	expat_utf8 \
+	expat \
 	zlib \
 ))
 
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index e41bbb7..c9d06f9 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
 ))
 
 $(eval $(call gb_Library_use_externals,shlxthdl_x64,\
-	expat_utf8_x64 \
+	expat_x64 \
 	zlib_x64 \
 ))
 
diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk
index 5d5f7bd..d16f71d 100644
--- a/shell/StaticLibrary_shlxthandler_common.mk
+++ b/shell/StaticLibrary_shlxthandler_common.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\
-	expat_utf8 \
+	expat \
 	zlib \
 ))
 
diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk
index 427de02..0e08415 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\
-	expat_utf8_x64 \
+	expat_x64 \
 	zlib_x64 \
 ))
 
diff --git a/shell/StaticLibrary_xmlparser.mk b/shell/StaticLibrary_xmlparser.mk
index d329c00..17b743d 100644
--- a/shell/StaticLibrary_xmlparser.mk
+++ b/shell/StaticLibrary_xmlparser.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser,\
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\
-	expat_utf8 \
+	expat \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser,\
diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk
index 244c310..185818d 100644
--- a/shell/StaticLibrary_xmlparser_x64.mk
+++ b/shell/StaticLibrary_xmlparser_x64.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\
-	expat_utf8_x64 \
+	expat_x64 \
 ))
 
 $(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shell_xmlparser_x64,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 0abe61e..17d1ef6 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -595,7 +595,7 @@ $(eval $(call gb_Library_use_static_libraries,vcl,\
 $(eval $(call gb_Library_use_externals,vcl,\
 	fontconfig \
 	freetype \
-	expat_utf8 \
+	expat \
 ))
 endif
 
diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk
index cb0aeec..b2624e9 100644
--- a/xmlhelp/Library_tvhlp1.mk
+++ b/xmlhelp/Library_tvhlp1.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_use_sdk_api,tvhlp1))
 
 $(eval $(call gb_Library_use_externals,tvhlp1,\
 	boost_headers \
-	expat_utf8 \
+	expat \
 ))
 
 $(eval $(call gb_Library_use_libraries,tvhlp1,\
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index ecadcca..6ff8f1a 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_sdk_api,ucpchelp1))
 $(eval $(call gb_Library_use_externals,ucpchelp1,\
 	boost_headers \
 	clucene \
-	expat_utf8 \
+	expat \
 	libxml2 \
 	libxslt \
 ))
