summaryrefslogtreecommitdiff
path: root/pyuno
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-10-21 17:18:13 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-10-24 13:59:58 +0200
commitb786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch)
treea0adbba80933544e1912adeb29a8e79797b7fc1c /pyuno
parent3535ceeac6f1b4277279082998663feb84d05487 (diff)
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'pyuno')
-rw-r--r--pyuno/zipcore/python.cxx12
-rw-r--r--pyuno/zipcore/python.sh2
2 files changed, 3 insertions, 11 deletions
diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 775a0b738f58..cffee38e058b 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -147,20 +147,12 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
exit(EXIT_FAILURE);
}
wchar_t urepath[MAX_PATH];
- if (tools::buildPath(urepath, path, pathEnd, MY_STRING(L"..\\basis-link"))
+ if (tools::buildPath(urepath, path, pathEnd, MY_STRING(L"..\\ure-link"))
== NULL)
{
exit(EXIT_FAILURE);
}
- wchar_t * urepathEnd = urepathEnd = tools::resolveLink(urepath);
- if (urepathEnd == NULL ||
- (tools::buildPath(
- urepath, urepath, urepathEnd, MY_STRING(L"\\ure-link"))
- == NULL))
- {
- exit(EXIT_FAILURE);
- }
- urepathEnd = tools::resolveLink(urepath);
+ wchar_t * urepathEnd = tools::resolveLink(urepath);
if (urepathEnd == NULL) {
exit(EXIT_FAILURE);
}
diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index c6c2f4a3d749..22edea89108f 100644
--- a/pyuno/zipcore/python.sh
+++ b/pyuno/zipcore/python.sh
@@ -44,7 +44,7 @@ PATH=$sd_prog${PATH+:$PATH}
export PATH
# Set %%OOO_LIBRARY_PATH_VAR%% so that "import pyuno" finds libpyuno.so:
-%%OOO_LIBRARY_PATH_VAR%%=$sd_prog:$sd_prog/../basis-link/ure-link/lib${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
+%%OOO_LIBRARY_PATH_VAR%%=$sd_prog:$sd_prog/../ure-link/lib${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
export %%OOO_LIBRARY_PATH_VAR%%
# Set UNO_PATH so that "officehelper.bootstrap()" can find soffice executable: