[Libreoffice-commits] core.git: RepositoryExternal.mk scp2/source

[Michael Stahl]

 RepositoryExternal.mk                |    2 +-
 scp2/source/ooo/file_library_ooo.scp |   20 +++-----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

New commits:
commit ae8e579515fff84cbef1ccc2da78fa769fb079ec
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 10 12:07:31 2014 +0100

    scp2: fix windows build
    
    913bf64b0bf1330a5055c26770faedf2ad7fc3c5 had some issues with redland
    stuff that is built as Library on windows, and the libxslt package is
    actually called "xslt" for unknown reasons; unfortunately the buildbot
    did not actually try to create an installation set so it was not
    detected.
    
    Change-Id: I0437f09228f62b21036a6c26e3d17029d1aab79e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 98736fc..721eb9d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -986,7 +986,7 @@ endef
 ifneq ($(OS),ANDROID)
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	raptor2 \
 	rasqal \
 	rdf \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index f9aa5c4..c90e28a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -275,23 +275,7 @@ File gid_File_Lib_Xslt
     LIB_FILE_BODY;
     Styles = (FILELIST);
     Dir = FILELIST_DIR;
-    Name = "libxslt.filelist";
-End
-File gid_File_Lib_eXslt
-    PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX));
-    #else
-       Name = STRING(CONCAT4(libexslt,UNXSUFFIX,.,0));
-    #endif
-  #else
-   #ifdef _gcc3
-    Name = "libexslt-0.dll";
-   #else
-    Name = "libexslt.dll";
-   #endif
-  #endif
+    Name = "xslt.filelist";
 End
 #endif
 
@@ -369,6 +353,7 @@ End
 #endif
 
 #ifndef SYSTEM_REDLAND
+#ifndef WNT
 File gid_File_Lib_Raptor
     LIB_FILE_BODY;
     Styles = (FILELIST);
@@ -389,5 +374,6 @@ File gid_File_Lib_Rdf
     Dir = FILELIST_DIR;
     Name = "redland.filelist";
 End
+#endif // WNT
 #endif // SYSTEM_REDLAND