[Libreoffice-commits] core.git: 2 commits - pyuno/source RepositoryFixes.mk scp2/source

[Michael Stahl]

 RepositoryFixes.mk                   |    2 +-
 pyuno/source/module/pyuno_module.cxx |   10 +++++++---
 scp2/source/python/file_python.scp   |    4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 288c8b9d59024897e88b55b9001f9922998d1302
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Apr 20 00:52:48 2013 +0200

    adapt path for test.dll for WNT
    
    Change-Id: I4d7cb081805213f55ae69c4ade8638bbfc06f0c4

diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 9662958..06632c8 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -342,9 +342,13 @@ static PyObject* initPoniesMode(
         if (!xMSF.is()) { abort(); }
         char *const outdir = getenv("OUTDIR");
         if (!outdir) { abort(); }
-        OStringBuffer libname(outdir);
-        libname.append("/lib/");
-        libname.append(SAL_MODULENAME("test"));
+        OString const libname = (OString(OString(outdir, strlen(outdir)) +
+#ifdef _WIN32
+                "/bin/")).replaceAll(OString('/'), OString('\\'))
+#else
+                "/lib/"))
+#endif
+                + SAL_MODULENAME("test");
         oslModule const mod( osl_loadModuleAscii(libname.getStr(),
                                 SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL) );
         if (!mod) { abort(); }
commit 849f87db1da8659bcc79b472c9411d7ceae26ede
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Apr 20 00:51:21 2013 +0200

    pyuno.pyd must be called pyuno_d.pyd with MSVC debug runtimes
    
    Change-Id: I8ed937739d94bfc6316d9cb158870362a0b8b996

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 1ee9955..175f9cb 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -66,7 +66,7 @@ gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_DLLFILENAMES))
 
 # libpyuno_wrapper.dll => pyuno.pyd
-gb_Library_DLLFILENAMES := $(patsubst pyuno:pyuno.dll,pyuno:pyuno.pyd,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst pyuno:pyuno.dll,pyuno:pyuno$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd,$(gb_Library_DLLFILENAMES))
 
 gb_StaticLibrary_FILENAMES := $(patsubst png:png%,png:libpng%,$(gb_StaticLibrary_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index c502986..5dba2c7 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -48,7 +48,11 @@ File gid_File_Lib_Pyuno
   #ifdef UNX
     Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
   #else
+  #ifdef MSVC_PKG_DEBUG_RUNTIME
+    Name = "pyuno_d.pyd";
+  #else
     Name = "pyuno.pyd";
+  #endif // MSVC_PKG_DEBUG_RUNTIME
   #endif
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);