Repository.mk | 15 +++++++++------
solenv/bin/macosx-change-install-names.pl | 1 -
solenv/gbuild/platform/macosx.mk | 2 +-
unotest/source/python/org/libreoffice/unotest.py | 8 +++++---
4 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit fd0ecb1897cfe0e5083cd1525f3600bcd8c516fc
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Apr 26 11:20:34 2013 +0200
Make informative output more obvious
Change-Id: I9088da9fd2eb1b3ea6be6fda85e058abe8d57286
diff --git a/unotest/source/python/org/libreoffice/unotest.py
b/unotest/source/python/org/libreoffice/unotest.py
index a135baa..5862484 100644
--- a/unotest/source/python/org/libreoffice/unotest.py
+++ b/unotest/source/python/org/libreoffice/unotest.py
@@ -18,15 +18,17 @@ try:
import uno
except ImportError:
print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
- print("PYTHONPATH=/installation/opt/program")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
+ print("to something like:")
+ print(" PYTHONPATH=/installation/opt/program")
+ print(" URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
raise
try:
from com.sun.star.document import XDocumentEventListener
except ImportError:
print("UNO API class not found: try to set URE_BOOTSTRAP variable")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
+ print("to something like:")
+ print(" URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
raise
### utilities ###
commit e8807620d2bcc6bd8bc9b08d00e5836031936e56
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Apr 26 11:11:49 2013 +0200
Binding OOO layer libs to NONE layer ones is bogus
Change-Id: I7470ab98cf68e1fd426983ce185c8fd2d73003e3
diff --git a/solenv/bin/macosx-change-install-names.pl
b/solenv/bin/macosx-change-install-names.pl
index 8bd42b3..a6c3eb7 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -67,7 +67,6 @@ sub action($$$)
'shl/OOO/OOO' => '@loader_path',
'shl/OXT/URELIB' => '@executable_path/urelibs',
'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
- 'shl/OOO/NONE' => '@__VIA_LIBRARY_PATH__',
'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__');
my ($type, $loc1, $loc2) = @_;
commit 3d229daa139da5cc6b5a3a79d40db0e690768e86
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Apr 26 11:08:49 2013 +0200
Test libs are layer "NONE"
...as they are used during the build, rather than included into
installation sets.
Change-Id: I67029c1cefacf3e4936ce916d17f7940ebebceaf
diff --git a/Repository.mk b/Repository.mk
index 054d9a3..6a0e297 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -417,6 +417,15 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+ smoketest \
+ subsequenttest \
+ test \
+ unobootstrapprotector \
+ unoexceptionprotector \
+ unotest \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \
affine_uno \
$(if $(SOLAR_JAVA),java_uno) \
@@ -508,10 +517,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
recentfile \
scriptframe \
sdbc2 \
- smoketest \
srtrs1 \
- subsequenttest \
- test \
textconv_dict \
tvhlp1 \
ucpdav1 \
@@ -519,10 +525,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
ucpchelp1 \
ucphier1 \
ucppkg1 \
- unobootstrapprotector \
- unoexceptionprotector \
unopkgapp \
- unotest \
updchk \
xmlsecurity \
xsec_fw \
commit 9921ec873667531b0166e72adea07a5d644c1c7b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Apr 26 11:15:04 2013 +0200
Bad "NONE" layer path prefix
Change-Id: I8f6859e172d272887166203919c5a4538c61b6cc
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 46ef8a8..b155901 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -107,7 +107,7 @@ gb_LinkTarget__RPATHS := \
OOO:@__________________________________________________OOO/ \
SDKBIN: \
OXT: \
- NONE:@__VIA_LIBRARY_PATH__@ \
+ NONE:@__________________________________________________NONE/ \
# $(call gb_LinkTarget__get_installname,libfilename,soversion,layerprefix)
define gb_LinkTarget__get_installname
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
