summaryrefslogtreecommitdiff
path: root/pyuno/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-09-18 15:03:50 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-22 11:08:31 +0200
commit70c35265f517ef372cb739d4cc64499abf57a838 (patch)
tree0bab65cbe9bde238d965a151dd14b3e9d7d031ca /pyuno/source
parentc0c7df91469d3306baa6708b0a8ab4eadc0e9097 (diff)
gbuild: remove libraries from OUTDIR and WORKDIR
Refactor everything to find and link libraries directly in INSTDIR. - add gb_LinkTarget_get_linksearchpath_for_layer, and use it to set up -L paths for T_LDFLAGS in such a way that only allowed libraries can be linked against; i.e. it's not possible to link URE linktargets against OOO or not-installed libraries - gb_Library_get_target is now same as the gb_LinkTarget_get_target (TODO: this needs cleanup) - since a pattern rule won't work for linking libraries in INSTDIR, add a separate per-file rule for every INSTDIR lib - pattern rule can't find link target in the clean target any more so add a LINKTARGET variable - disable gb_Library_add_auxtarget, no auxtargets need to be copied - tweak the call to gb_Library_Library_platform to pass in a path in sdk/lib for the versioned URE libs - fix the Library clean target - add LAYER parameter to gb_LinkTarget_LinkTarget - adjust platform link commands - MSVC link command now uses explicit -manifestfile and -pdb parameters to keep misc. files out of INSTDIR - remove gb_Helper_OUTDIR_FOR_BUILDLIBDIR - adjust Extension, CppunitTest, JunitTest, PythonTest, Gallery, various CustomTargets to search INSTDIR - remove SDK library symlinks and import libs from odk/Package_lib - on Mac OS X, put .dylib symlinks into sdk/lib even though those are not packaged and would be created by the SDK configury; we need these to be somewhere for linking anyway - add a (unfortunately cyclic) dependency on Package ure_install to sal Change-Id: I70d88742f8c8232ad7b9521416275c67b64fe6cf
Diffstat (limited to 'pyuno/source')
-rw-r--r--pyuno/source/module/pyuno_module.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index fc6868ab70a4..d9d510a8086b 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -346,15 +346,13 @@ static PyObject* initPoniesMode(
xContext->getServiceManager(),
com::sun::star::uno::UNO_QUERY_THROW);
if (!xMSF.is()) { abort(); }
- char *const outdir = getenv("OUTDIR");
- if (!outdir) { abort(); }
- OString const libname = (OString(OString(outdir, strlen(outdir)) +
+ char *const testlib = getenv("TEST_LIB");
+ if (!testlib) { abort(); }
+ OString const libname = OString(testlib, strlen(testlib))
#ifdef _WIN32
- "/bin/")).replaceAll(OString('/'), OString('\\'))
-#else
- "/lib/"))
+ .replaceAll(OString('/'), OString('\\'))
#endif
- + SAL_MODULENAME("test");
+ ;
oslModule const mod( osl_loadModuleAscii(libname.getStr(),
SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL) );
if (!mod) { abort(); }