[Libreoffice-commits] core.git: 2 commits - bin/distro-install-file-lists bin/run bridges/Jar_java_uno.mk configure.ac desktop/scripts desktop/unx external/curl external/icu external/liblangtag external/libxmlsec external/libxslt external/redland instsetoo_native/CustomTarget_setup.mk javaunohelper/Jar_juh.mk jurt/Jar_jurt.mk jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk jvmfwk/Module_jvmfwk.mk jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk jvmfwk/source l10ntools/source odk/config Repository.mk sal/Library_sal.mk scp2/inc scp2/source solenv/bin solenv/gbuild svx/source ure/Package_install.mk ure/source vcl/README
Stephan Bergmann
sbergman at redhat.com
Fri Nov 28 02:58:13 PST 2014
Repository.mk | 1
bin/distro-install-file-lists | 8 +--
bin/run | 2
bridges/Jar_java_uno.mk | 2
configure.ac | 6 +-
desktop/scripts/soffice.sh | 6 --
desktop/scripts/unoinfo.sh | 2
desktop/scripts/unopkg.sh | 12 +---
desktop/unx/source/start.c | 2
external/curl/ExternalProject_curl.mk | 2
external/icu/icu4c-rpath.patch | 7 +-
external/liblangtag/ExternalProject_langtag.mk | 4 -
external/libxmlsec/ExternalProject_xmlsec.mk | 2
external/libxslt/ExternalProject_xslt.mk | 2
external/redland/ExternalProject_raptor.mk | 2
external/redland/ExternalProject_rasqal.mk | 2
external/redland/ExternalProject_redland.mk | 2
instsetoo_native/CustomTarget_setup.mk | 6 +-
javaunohelper/Jar_juh.mk | 7 ++
jurt/Jar_jurt.mk | 2
jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk | 36 ++++++++++++++
jvmfwk/Module_jvmfwk.mk | 2
jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk | 16 ++++++
jvmfwk/source/fwkutil.hxx | 2
l10ntools/source/pocheck.cxx | 2
odk/config/setsdkenv_unix.sh.in | 2
sal/Library_sal.mk | 4 -
scp2/inc/macros.inc | 6 ++
scp2/source/ooo/ure.scp | 8 ---
solenv/bin/install-gdb-printers | 30 +++---------
solenv/gbuild/AutoInstall.mk | 2
solenv/gbuild/Pagein.mk | 6 --
solenv/gbuild/platform/solaris.mk | 12 ++--
solenv/gbuild/platform/unxgcc.mk | 12 ++--
svx/source/gengal/gengal.sh | 12 +---
ure/Package_install.mk | 4 -
ure/source/jvmfwk3.ini | 5 --
ure/source/jvmfwk3rc | 22 --------
ure/source/uretest/Makefile.pln | 62 +++++++++++++------------
ure/source/uretest/README | 2
vcl/README | 3 -
41 files changed, 164 insertions(+), 165 deletions(-)
New commits:
commit 45ca1bfc22f5d6857aeefc1e444f369cf6519805
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 28 11:48:22 2014 +0100
Fold URE: Linux ure/lib/* -> program/
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge
(and juh.jar had lacked adaption for Mac OS X).
Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
diff --git a/Repository.mk b/Repository.mk
index b124c91..2b9a179 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -803,6 +803,7 @@ endif
$(eval $(call gb_Helper_register_packages_for_install,ure,\
instsetoo_native_setup_ure \
+ jvmfwk_jvmfwk3_ini \
ure_install \
$(if $(ENABLE_JAVA),\
jvmfwk_javavendors \
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 73366f4..f011c0c 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -252,10 +252,10 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll
mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll.config
mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/policy.*.cli_.*.dll
- mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/cli_.*.dll
- mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/cli_.*.dll.config
- mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/policy.*.cli_.*.dll
- mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/libcli_.*.so
+ mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll
+ mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll.config
+ mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/policy.*.cli_.*.dll
+ mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/libcli_.*.so
add_used_directories mono_list.txt common_list.txt
# add the files from GAC if it was installed
test -f mono_gac && cat mono_gac >>mono_list.txt
diff --git a/bin/run b/bin/run
index dffa9cf..4fb369f 100755
--- a/bin/run
+++ b/bin/run
@@ -42,7 +42,7 @@ done
exedir="${dir}"/workdir/LinkTarget/Executable
export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${dir}"/instdir/ure/lib:"${dir}"/instdir/program
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${dir}"/instdir/program
echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
echo "setting search path to: ${LD_LIBRARY_PATH}"
diff --git a/bridges/Jar_java_uno.mk b/bridges/Jar_java_uno.mk
index 0bab303..a924375 100644
--- a/bridges/Jar_java_uno.mk
+++ b/bridges/Jar_java_uno.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Jar_add_manifest_classpath,java_uno,\
ridl.jar \
jurt.jar \
$(if $(filter MACOSX,$(OS)),../../Frameworks/, \
- $(if $(filter WNT,$(OS)),../bin/,../../lib/)) \
+ $(if $(filter WNT,$(OS)),../bin/,../../../program/)) \
))
$(eval $(call gb_Jar_add_sourcefiles,java_uno,\
diff --git a/configure.ac b/configure.ac
index 2d69742..2f9dcdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3057,8 +3057,8 @@ else
LIBO_SHARE_RESOURCE_FOLDER=program/resource
LIBO_SHARE_SHELL_FOLDER=program/shell
LIBO_URE_BIN_FOLDER=program
- LIBO_URE_ETC_FOLDER=ure/lib
- LIBO_URE_LIB_FOLDER=ure/lib
+ LIBO_URE_ETC_FOLDER=program
+ LIBO_URE_LIB_FOLDER=program
LIBO_URE_SHARE_FOLDER=ure/share
LIBO_URE_SHARE_JAVA_FOLDER=ure/share/java
fi
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 26fb776..b1ab4c9 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -130,9 +130,7 @@ fi
case "`uname -s`" in
NetBSD|OpenBSD|FreeBSD|DragonFly)
# this is a temporary hack until we can live with the default search paths
- sd_prog1="$sd_prog"
- sd_prog2="$sd_prog/../ure-link/lib"
- LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH
if [ -n "${JAVA_HOME}" ]; then
@@ -140,7 +138,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
fi
;;
AIX)
- LIBPATH=$sd_prog:$sd_prog/../ure-link/lib${LIBPATH:+:$LIBPATH}
+ LIBPATH=$sd_prog${LIBPATH:+:$LIBPATH}
export LIBPATH
;;
esac
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index 74a3333..edadbc0 100755
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -31,7 +31,7 @@ sd_prog=`pwd`
case $1 in
c++)
- printf '%s' "$sd_prog/../ure-link/lib"
+ printf '%s' "$sd_prog"
;;
java)
printf '0%s\0%s\0%s\0%s\0%s' \
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 3d244a4..f21e4d1 100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -36,9 +36,7 @@ cd "$sd_cwd"
# this is a temporary hack until we can live with the default search paths
case "`uname -s`" in
NetBSD|OpenBSD|FreeBSD|DragonFly)
- sd_prog1="$sd_prog"
- sd_prog2="$sd_prog/../ure-link/lib"
- LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH
if [ -n "${JAVA_HOME}" ]; then
@@ -46,9 +44,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
fi
;;
AIX)
- sd_prog1="$sd_prog"
- sd_prog2="$sd_prog/../ure-link/lib"
- LIBPATH=$sd_prog1:$sd_prog2${LIBPATH:+:${LIBPATH}}
+ LIBPATH=$sd_prog${LIBPATH:+:${LIBPATH}}
export LIBPATH
;;
esac
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 1a0a0a3..8f94771 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
ifneq ($(OS),WNT)
curl_CPPFLAGS :=
-curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)
+curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)
ifneq ($(OS),ANDROID)
ifneq ($(SYSBASE),)
diff --git a/external/icu/icu4c-rpath.patch b/external/icu/icu4c-rpath.patch
index dd4e2e7..ba1a825 100644
--- a/external/icu/icu4c-rpath.patch
+++ b/external/icu/icu4c-rpath.patch
@@ -21,14 +21,13 @@
@echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE)
--- misc/icu/source/config/mh-linux 2010-09-29 20:37:36.000000000 +0200
+++ misc/build/icu/source/config/mh-linux 2011-03-15 10:56:26.653056004 +0100
-@@ -20,6 +20,11 @@
+@@ -20,6 +20,10 @@
LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
LD_RPATH_PRE = -Wl,-rpath,
-+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
-+## (incl. the C++ runtime libs potentially found in the URE lib dir):
++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH:
+ENABLE_RPATH=YES
-+RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'
++RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
+
## These are the library specific LDFLAGS
LDFLAGSICUDT=-nodefaultlibs -nostdlib
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
index 15c78a9..c6b195d 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -28,8 +28,8 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
LIBXML2_LIBS="$(if $(filter WNTMSC,$(OS)$(COM)),-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
- $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
- $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
+ $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN) \
+ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN) \
$(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
&& $(if $(filter WNTMSC,$(OS)$(COM)),\
REAL_CC="$(shell cygpath -w $(lastword $(filter-out -%,$(CC))))" \
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index e6bdf4f..33b0712 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
- LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \
+ LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)) \
&& $(MAKE) \
)
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index 4c4967e..9b4632e 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
./configure --without-crypto --without-python \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
- LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
+ LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN" -Wl$(COMMA)-noinhibit-exec) \
$(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
index 0c2916f..6e5c894 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/external/redland/ExternalProject_raptor.mk
@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
CFLAGS="$(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
$(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \
LDFLAGS=" \
- $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
+ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \
$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
./configure --disable-gtk-doc \
diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
index e67a302..a936e9f 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/external/redland/ExternalProject_rasqal.mk
@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(call gb_ExternalProject_run,build,\
CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
LDFLAGS=" \
- $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
+ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \
$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
PKG_CONFIG="" \
diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
index 4668dcb..6002cd0 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
$(call gb_ExternalProject_run,build,\
CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
LDFLAGS=" \
- $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
+ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \
$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
PKG_CONFIG="" \
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index b34a516..052a51e 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -120,10 +120,10 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
( \
echo '[Bootstrap]' \
&& echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter MACOSX,$(OS)),/../../../Frameworks)' \
- && echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out WNT,$(OS)),/$(if $(filter MACOSX,$(OS)),..,share))/java' \
+ && echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out MACOSX WNT,$(OS)),/ure-link)$(if $(filter-out WNT,$(OS)),/$(if $(filter MACOSX,$(OS)),..,share))/java' \
&& echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \
- && echo 'UNO_TYPES=$${ORIGIN}/../$(if $(filter-out WNT,$(OS)),share/)misc/types.rdb $${URE_MORE_TYPES}' \
- && echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \
+ && echo 'UNO_TYPES=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/types.rdb $${URE_MORE_TYPES}' \
+ && echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \
) > $@
.PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version)
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index 32f7449..7405ac7 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/javaunohelper/Jar_juh.mk
@@ -16,7 +16,12 @@ $(eval $(call gb_Jar_use_jars,juh,\
$(eval $(call gb_Jar_set_packageroot,juh,com))
-$(eval $(call gb_Jar_add_manifest_classpath,juh,ridl.jar jurt.jar ../../lib/ ../bin/))
+$(eval $(call gb_Jar_add_manifest_classpath,juh, \
+ jurt.jar \
+ ridl.jar \
+ $(if $(filter MACOSX,$(OS)),../../Frameworks/, \
+ $(if $(filter WNT,$(OS)),../bin/,../../../program/)) \
+))
$(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest))
diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index aed0d05..c67eeb7 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Jar_add_manifest_classpath,jurt, \
ridl.jar \
unoloader.jar \
$(if $(filter MACOSX,$(OS)),../../Frameworks/, \
- $(if $(filter WNT,$(OS)),../bin/,../../lib/)) \
+ $(if $(filter WNT,$(OS)),../bin/,../../../program/)) \
))
$(eval $(call gb_Jar_add_sourcefiles,jurt,\
diff --git a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
new file mode 100644
index 0000000..739112a
--- /dev/null
+++ b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jvmfwk3_ini))
+
+$(eval $(call gb_CustomTarget_register_targets,jvmfwk/jvmfwk3_ini, \
+ $(call gb_Helper_get_rcfile,jvmfwk3) \
+))
+
+$(call gb_CustomTarget_get_workdir,jvmfwk/jvmfwk3_ini)/$(call gb_Helper_get_rcfile,jvmfwk3): \
+ $(SRCDIR)/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( printf '[Bootstrap]\n' && \
+ printf 'UNO_JAVA_JFW_VENDOR_SETTINGS=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/javavendors.xml\n' && \
+ printf 'UNO_JAVA_JFW_SHARED_DATA=$${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}\n' && \
+ printf 'UNO_JAVA_JFW_USER_DATA=$${URE_OVERRIDE_JAVA_JFW_USER_DATA}\n' && \
+ printf 'UNO_JAVA_JFW_CLASSPATH_URLS=$${URE_MORE_JAVA_CLASSPATH_URLS}\n' \
+ ) > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index 5ec28e5..396ed21 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -13,8 +13,10 @@ ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_Module_add_targets,jvmfwk,\
CustomTarget_jreproperties \
+ CustomTarget_jvmfwk_jvmfwk3_ini \
Library_jvmfwk \
Package_jreproperties \
+ Package_jvmfwk_jvmfwk3_ini \
Package_rcfiles \
))
diff --git a/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk b/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk
new file mode 100644
index 0000000..51a933c
--- /dev/null
+++ b/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,jvmfwk_jvmfwk3_ini,$(call gb_CustomTarget_get_workdir,jvmfwk/jvmfwk3_ini)))
+
+$(eval $(call gb_Package_add_files,jvmfwk_jvmfwk3_ini,$(LIBO_URE_ETC_FOLDER), \
+ $(call gb_Helper_get_rcfile,jvmfwk3) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 9bef1f2..71479d2 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -52,7 +52,7 @@ struct Bootstrap :
buf.append(getLibraryLocation());
#ifdef MACOSX
// For some reason the jvmfwk3rc file is traditionally in
- // "ure/lib", i.e. in LIBO_URE_ETC_FOLDER
+ // LIBO_URE_ETC_FOLDER
buf.appendAscii( "/../" LIBO_URE_ETC_FOLDER );
#endif
buf.appendAscii(SAL_CONFIGFILE("/jvmfwk3"));
diff --git a/l10ntools/source/pocheck.cxx b/l10ntools/source/pocheck.cxx
index a1836ca..bdd3ad8 100644
--- a/l10ntools/source/pocheck.cxx
+++ b/l10ntools/source/pocheck.cxx
@@ -456,7 +456,7 @@ int main()
OString aLanguages(getenv("ALL_LANGS"));
if( aLanguages.isEmpty() )
{
- std::cerr << "Usage: LD_LIBRARY_PATH=instdir/ure/lib make cmd cmd=workdir/LinkTarget/Executable/pocheck\n";
+ std::cerr << "Usage: bin/run pocheck\n";
return 1;
}
for(sal_Int32 i = 1;;++i) // skip en-US
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index dbca766..833ba6d 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -33,10 +33,6 @@ $(eval $(call gb_Library_add_defs,sal,\
-DSRCDIR="\"$(SRCDIR)\"" \
))
-# need the "ure-link" symlink to exist in INSTDIR so it's possible to link sal
-# FIXME: this creates cyclic dependency between ure and sal modules
-$(eval $(call gb_Library_use_package,sal,ure_install))
-
$(eval $(call gb_Library_use_libraries,sal,\
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 0f21cdf..514c315 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -80,7 +80,7 @@
#define GID_DIR_URE_BIN gid_Dir_Ure_Bin
#endif
#define GID_DIR_URE_JAVA gid_Dir_Ure_Java
- #define GID_DIR_URE_LIB gid_Dir_Ure_Lib
+ #define GID_DIR_URE_LIB gid_Brand_Dir_Program
#define GID_DIR_URE_SHARE gid_Dir_Ure_Share
#endif
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 4c250b9..819ac0f 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -41,13 +41,6 @@ End
#endif
#if !defined WNT
-Directory gid_Dir_Ure_Lib
- ParentID = gid_Dir_Common_Ure;
- DosName = "lib";
-End
-#endif
-
-#if !defined WNT
Directory gid_Dir_Ure_Share
ParentID = gid_Dir_Common_Ure;
DosName = "share";
@@ -346,7 +339,6 @@ Module gid_Module_Root_Ure_Hidden
Default = YES;
Styles = (HIDDEN_ROOT);
Dirs = (gid_Dir_Ure_Bin,
- gid_Dir_Ure_Lib,
gid_Dir_Ure_Misc,
gid_Dir_Ure_Share,
gid_Dir_Ure_Java,
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 3787bec..c0a85f8 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -33,8 +33,6 @@ Options:
is.
-c Create the autoloader's dir if it does not exist. This option only
makes sense if both -a and -i are used.
--f Do not create subdirs in the autoloader's dir. This option is only
- used during build.
-h Show this help text.
-i dir The dir where libreoffice is installed. Defaults to whatever -a is.
-p dir The dir where pretty printers are placed.
@@ -54,16 +52,12 @@ EOT
}
make_autoload() {
- local dir="${DESTDIR}${autoloaddir}"
- ${flat} || dir="${dir}/$2"
- local lib="${dir}/$3"
+ local lib="${DESTDIR}${autoloaddir}/$2/$3"
local merged="$4"
- if ! ${flat}; then
- local resolved="$(readlink "${DESTDIR}${installdir}/$2/$3")"
- [ -n "$resolved" ] && lib=$resolved
- dir="${lib%/*}"
- fi
+ local resolved="$(readlink "${DESTDIR}${installdir}/$2/$3")"
+ [ -n "$resolved" ] && lib=$resolved
+ local dir="${lib%/*}"
if ${create}; then
mkdir -p "${dir}" || die "cannot create dir '${dir}'"
@@ -89,18 +83,12 @@ pythondir="${GDBDIR}"
# Create autoload dir if it does not exist. This only makes sense when
# installing into system gdb dir, so $autoloaddir must be absolute path.
create=false
-# This option is only here to enable using the script during build of
-# solenv/gdb . We must (or, better, want to :) avoid using the
-# installation subpaths (like ure-link), because all libs in solver
-# are in the same dir.
-flat=false
# b de g jklmno qrstuvwxyzABCDEFGHIJK MNOPQRSTUVWXYZ0123456789
while getopts :a:cfhi:p:L opt; do
case ${opt} in
a) autoloaddir="${OPTARG}" ;;
c) create=true ;;
- f) flat=true ;;
h) usage; exit ;;
i) installdir="${OPTARG}" ;;
p) pythondir="${OPTARG}" ;;
@@ -138,16 +126,16 @@ fi
if [[ -n "${MERGELIBS}" ]]; then
make_autoload merged program libmergedlo."$DYLIB" merge svl tl basegfx `[[ ${MERGELIBS} == "ALL" ]] && echo sw`
if [[ ${MERGELIBS} == "ALL" ]]; then
- make_autoload urelibs ure/lib liburelibs."$DYLIB" merge cppu sal
+ make_autoload urelibs program liburelibs."$DYLIB" merge cppu sal
else
- make_autoload cppu ure/lib libuno_cppu."$DYLIB".3
- make_autoload sal ure/lib libuno_sal."$DYLIB".3
+ make_autoload cppu program libuno_cppu."$DYLIB".3
+ make_autoload sal program libuno_sal."$DYLIB".3
make_autoload sw program libswlo."$DYLIB"
fi
else
make_autoload basegfx program libbasegfxlo."$DYLIB"
- make_autoload cppu ure/lib libuno_cppu."$DYLIB".3
- make_autoload sal ure/lib libuno_sal."$DYLIB".3
+ make_autoload cppu program libuno_cppu."$DYLIB".3
+ make_autoload sal program libuno_sal."$DYLIB".3
make_autoload svl program libsvllo."$DYLIB"
make_autoload sw program libswlo."$DYLIB"
make_autoload tl program libtllo."$DYLIB"
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 7a2ac8d..282b02a 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -58,7 +58,7 @@ else
$(file >>$@,$(foreach lib,$(gb_Library_MODULE_$*),$(call gb_AutoInstall__gen_lib,$(lib))))
endif
$(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
- echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../ure-link/lib/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;)
+ echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../program/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;)
$(foreach exe,$(gb_Executable_MODULE_$*),\
echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst .,_,$(subst -,_,$(exe))),$(call gb_Executable_get_filename,$(exe)))" >> $@;)
$(foreach jar,$(gb_Jar_MODULE_$*),\
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 2c20e29..ee133cb 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -7,13 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-gb_Pagein_UREPATH := ../ure-link/lib/
-
gb_Pagein__is_library = $(filter $(1),$(gb_Library_KNOWNLIBS))
-gb_Pagein__get_libdir = $(if $(filter URELIB,$(call gb_Library_get_layer,$(1))),$(call gb_Pagein_UREPATH))
-
-gb_Pagein__make_library_path = $(call gb_Pagein__get_libdir,$(1))$(call gb_Library_get_runtime_filename,$(1))
+gb_Pagein__make_library_path = $(call gb_Library_get_runtime_filename,$(1))
gb_Pagein__make_path = \
$(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)),$(1))
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index b68c68e..78698db 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -103,9 +103,9 @@ endef
gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
- UREBIN:\dORIGIN/../ure-link/lib \
- OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
- SDKBIN:\dORIGIN/../../ure-link/lib \
+ UREBIN:\dORIGIN \
+ OOO:\dORIGIN \
+ SDKBIN:\dORIGIN/../../program \
OXT: \
NONE:\dORIGIN/../Library \
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
-Wl$(COMMA)-zrecord \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
-o $(1) \
- $(if $(SOVERSIONSCRIPT),&& ln -sf ../../ure-link/lib/$(notdir $(1)) $(ILIBTARGET)))
+ $(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1)) $(ILIBTARGET)))
$(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\
$(READELF) -d $(1) | grep SONAME > $(WORKDIR)/LinkTarget/$(2).exports.tmp; \
$(NM) --dynamic --extern-only --defined-only --format=posix $(1) \
@@ -215,7 +215,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
define gb_Library__get_rpath
-$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' -L$(INSTDIR)/ure/lib -L$(INSTDIR)/program))
+$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' -L$(INSTDIR)/program))
endef
define gb_Library_get_rpath
@@ -245,7 +245,7 @@ gb_Executable_LAYER := \
define gb_Executable__get_rpath
-$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') -L$(INSTDIR)/ure/lib -L$(INSTDIR)/program)
+$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') -L$(INSTDIR)/program)
endef
define gb_Executable_get_rpath
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 25487cb..bf10e99 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -98,9 +98,9 @@ endef
gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
- UREBIN:\dORIGIN/../ure-link/lib \
- OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
- SDKBIN:\dORIGIN/../../ure-link/lib \
+ UREBIN:\dORIGIN \
+ OOO:\dORIGIN \
+ SDKBIN:\dORIGIN/../../program \
OXT: \
NONE:\dORIGIN/../Library \
@@ -142,7 +142,7 @@ $(call gb_Helper_abbreviate_dirs,\
-Wl$(COMMA)--no-as-needed \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
-o $(1) \
- $(if $(SOVERSIONSCRIPT),&& ln -sf ../../ure-link/lib/$(notdir $(1)) $(ILIBTARGET)))
+ $(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1)) $(ILIBTARGET)))
$(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\
$(READELF) -d $(1) | grep SONAME > $(WORKDIR)/LinkTarget/$(2).exports.tmp; \
$(NM) --dynamic --extern-only --defined-only --format=posix $(1) \
@@ -209,7 +209,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
define gb_Library__get_rpath
-$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' -Wl,-rpath-link,$(INSTDIR)/ure/lib -Wl,-rpath-link,$(INSTDIR)/program))
+$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' -Wl,-rpath-link,$(INSTDIR)/program))
endef
define gb_Library_get_rpath
@@ -239,7 +239,7 @@ gb_Executable_LAYER := \
define gb_Executable__get_rpath
-$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') -Wl,-rpath-link,$(INSTDIR)/ure/lib -Wl,-rpath-link,$(INSTDIR)/program)
+$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') -Wl,-rpath-link,$(INSTDIR)/program)
endef
define gb_Executable_get_rpath
diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
index 9b34285..7535e25 100755
--- a/svx/source/gengal/gengal.sh
+++ b/svx/source/gengal/gengal.sh
@@ -36,9 +36,7 @@ cd "$sd_cwd"
# this is a temporary hack until we can live with the default search paths
case "`uname -s`" in
NetBSD|OpenBSD|FreeBSD|DragonFly)
- sd_prog1="$sd_prog"
- sd_prog2="$sd_prog/../ure-link/lib"
- LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH
if [ -n "${JAVA_HOME}" ]; then
@@ -46,9 +44,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
fi
;;
AIX)
- sd_prog1="$sd_prog"
- sd_prog2="$sd_prog/../ure-link/lib"
- LIBPATH=$sd_prog1:$sd_prog2${LIBPATH:+:${LIBPATH}}
+ LIBPATH=$sd_prog${LIBPATH:+:${LIBPATH}}
export LIBPATH
;;
esac
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 7250777..7571e56 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -21,8 +21,4 @@ else
$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link,ure))
endif
-$(eval $(call gb_Package_add_files,ure_install,$(LIBO_URE_ETC_FOLDER),\
- $(call gb_Helper_get_rcfile,jvmfwk3) \
-))
-
# vim:set noet sw=4 ts=4:
diff --git a/ure/source/jvmfwk3.ini b/ure/source/jvmfwk3.ini
deleted file mode 100644
index 18a2bb5..0000000
--- a/ure/source/jvmfwk3.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Bootstrap]
-UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../misc/javavendors.xml
-UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}
-UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA}
-UNO_JAVA_JFW_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS}
diff --git a/ure/source/jvmfwk3rc b/ure/source/jvmfwk3rc
deleted file mode 100644
index 01b21ce..0000000
--- a/ure/source/jvmfwk3rc
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-[Bootstrap]
-UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../share/misc/javavendors.xml
-UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}
-UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA}
-UNO_JAVA_JFW_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS}
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index f239ab9..a5b8ae9 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -55,7 +55,7 @@ test-javanative: out.pln/runner.jar out.pln/javanative.jar \
out.pln/types.rdb out.pln/services.rdb
URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \
- $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib java \
+ $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/program java \
-jar out.pln/runner.jar file://$(URE_HOME)/ure-link/share/java/ \
file://$(PWD)/out.pln/javanative.jar
@@ -121,14 +121,14 @@ out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \
out.pln/cpputypes.cppumaker.flag: | out.pln
- LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/cppumaker \
+ LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/cppumaker \
-O./out.pln/include/cpputypes \
'-Tcom.sun.star.beans.Introspection;com.sun.star.beans.theIntrospection;com.sun.star.bridge.BridgeFactory;com.sun.star.bridge.UnoUrlResolver;com.sun.star.connection.Acceptor;com.sun.star.connection.Connector;com.sun.star.io.Pipe;com.sun.star.io.TextInputStream;com.sun.star.io.TextOutputStream;com.sun.star.java.JavaVirtualMachine;com.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.loader.Java;com.sun.star.loader.SharedLibrary;com.sun.star.reflection.ProxyFactory;com.sun.star.registry.ImplementationRegistration;com.sun.star.registry.SimpleRegistry;com.sun.star.registry.XRegistryKey;com.sun.star.script.Converter;com.sun.star.script.Invocation;com.sun.star.security.AccessController;com.sun.star.security.Policy;com.sun.star.uno.Deploym
entException;com.sun.star.uno.Exception;com.sun.star.uno.NamingService;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.uri.ExternalUriReferenceTranslator;com.sun.star.uri.UriReferenceFactory;com.sun.star.uri.VndSunStarPkgUrlReferenceFactory;com.sun.star.util.theMacroExpander' \
$(URE_HOME)/ure-link/share/misc/types.rdb
touch $@
out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln
- LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/cppumaker \
+ LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/cppumaker \
-O./out.pln/include/types $< \
-X$(URE_HOME)/ure-link/share/misc/types.rdb
touch $@
@@ -247,7 +247,7 @@ out.pln/types.mf: types.mf.template | out.pln
out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class
rm -rf out.pln/class/types
- LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/javamaker \
+ LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/javamaker \
-O./out.pln/class/types $< \
-X$(URE_HOME)/ure-link/share/misc/types.rdb
touch $@
@@ -257,7 +257,7 @@ out.pln/types.rdb: out.pln/types.urd | out.pln
$(URE_HOME)/program/regmerge $@ /UCR $<
out.pln/types.urd: types.idl | out.pln
- LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/idlc -O$(@D) \
+ LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/idlc -O$(@D) \
-I$(SDK_HOME)/idl -cid -we $<
@@ -267,16 +267,16 @@ out.pln/services.rdb: services.rdb.in | out.pln/cpptest.uno.so \
out.pln/lib/libuno_cppu.so: | out.pln/lib
- ln -fs $(URE_HOME)/ure-link/lib/libuno_cppu.so.3 $@
+ ln -fs $(URE_HOME)/program/libuno_cppu.so.3 $@
out.pln/lib/libuno_cppuhelpergcc3.so: | out.pln/lib
- ln -fs $(URE_HOME)/ure-link/lib/libuno_cppuhelpergcc3.so.3 $@
+ ln -fs $(URE_HOME)/program/libuno_cppuhelpergcc3.so.3 $@
out.pln/lib/libuno_sal.so: | out.pln/lib
- ln -fs $(URE_HOME)/ure-link/lib/libuno_sal.so.3 $@
+ ln -fs $(URE_HOME)/program/libuno_sal.so.3 $@
out.pln/lib/libuno_salhelpergcc3.so: | out.pln/lib
- ln -fs $(URE_HOME)/ure-link/lib/libuno_salhelpergcc3.so.3 $@
+ ln -fs $(URE_HOME)/program/libuno_salhelpergcc3.so.3 $@
out.pln:
diff --git a/vcl/README b/vcl/README
index 65113a6..04a8e4ad1 100644
--- a/vcl/README
+++ b/vcl/README
@@ -186,5 +186,4 @@ touch vcl/source/gdi/pdfwriter* && make vcl dbglevel=3
To de-compress the contents of a PDF file written by a release build or
other programs, use the "pdfunzip" tool:
-LD_LIBRARY_PATH=$PWD/instdir/ure/lib workdir/LinkTarget/Executable/pdfunzip input.pdf output.pdf
-
+bin/run pdfunzip input.pdf output.pdf
commit eef94c1655605ce890f182e31f3cc64ee3748625
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Nov 25 10:51:23 2014 +0100
Fold URE: Linux ure/bin/* -> program/
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
diff --git a/configure.ac b/configure.ac
index 27d6bd6..2d69742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3056,7 +3056,7 @@ else
LIBO_SHARE_PRESETS_FOLDER=presets
LIBO_SHARE_RESOURCE_FOLDER=program/resource
LIBO_SHARE_SHELL_FOLDER=program/shell
- LIBO_URE_BIN_FOLDER=ure/bin
+ LIBO_URE_BIN_FOLDER=program
LIBO_URE_ETC_FOLDER=ure/lib
LIBO_URE_LIB_FOLDER=ure/lib
LIBO_URE_SHARE_FOLDER=ure/share
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index d16d226..3d244a4 100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -65,8 +65,8 @@ do
done
# extend the ld_library_path for java: javaldx checks the sofficerc for us
-if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then
- my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS \
+if [ -x "$sd_prog/javaldx" ] ; then
+ my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
sd_platform=`uname -s`
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 5fb0dc3..9e5f7f1 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -704,7 +704,7 @@ exec_javaldx (Args *args)
rtl_uString_newFromAscii( &pApp, "file://" );
rtl_uString_newConcat( &pApp, pApp, args->pAppPath );
pTmp = NULL;
- rtl_uString_newFromAscii( &pTmp, "../ure-link/bin/javaldx" );
+ rtl_uString_newFromAscii( &pTmp, "javaldx" );
rtl_uString_newConcat( &pApp, pApp, pTmp );
rtl_uString_release( pTmp );
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index c1b96fb..83e074e 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -112,7 +112,7 @@ case ${sdk_platform} in
OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/Resources/java
;;
*)
- OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin
+ OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
;;
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d8c7370..0f21cdf 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -74,7 +74,11 @@
#define GID_BRAND_DIR_ETC gid_Brand_Dir_Program
#define GID_DIR_PY gid_Brand_Dir_Program
#define GID_DIR_URE gid_Dir_Common_Ure
+#if defined UNX
+ #define GID_DIR_URE_BIN gid_Brand_Dir_Program
+#else
#define GID_DIR_URE_BIN gid_Dir_Ure_Bin
+#endif
#define GID_DIR_URE_JAVA gid_Dir_Ure_Java
#define GID_DIR_URE_LIB gid_Dir_Ure_Lib
#define GID_DIR_URE_SHARE gid_Dir_Ure_Share
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 9da2e26..4c250b9 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -33,10 +33,12 @@ Directory gid_Dir_Common_Ure
Styles = (UREDIRECTORY);
End
+#if defined WNT
Directory gid_Dir_Ure_Bin
ParentID = gid_Dir_Common_Ure;
DosName = "bin";
End
+#endif
#if !defined WNT
Directory gid_Dir_Ure_Lib
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 0f0ff13..b68c68e 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -103,7 +103,7 @@ endef
gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
- UREBIN:\dORIGIN/../lib:\dORIGIN \
+ UREBIN:\dORIGIN/../ure-link/lib \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
OXT: \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 562d535..25487cb 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -98,7 +98,7 @@ endef
gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
- UREBIN:\dORIGIN/../lib:\dORIGIN \
+ UREBIN:\dORIGIN/../ure-link/lib \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
OXT: \
diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
index 0ac61cf..9b34285 100755
--- a/svx/source/gengal/gengal.sh
+++ b/svx/source/gengal/gengal.sh
@@ -65,8 +65,8 @@ do
done
# extend the ld_library_path for java: javaldx checks the sofficerc for us
-if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then
- my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS \
+if [ -x "$sd_prog/javaldx" ] ; then
+ my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
sd_platform=`uname -s`
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 38888d6..f239ab9 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -20,11 +20,11 @@
#SDK_HOME := /opt/openoffice.org/basis3.1/sdk
# The following variables can be set, if necessary (see README):
-#URE_HOME := /opt/openoffice.org/ure
+#URE_HOME := /opt/openoffice.org
#GCCS_COMPAT := LD_PRELOAD=/lib/libgcc_s.so.1
-URE_HOME ?= /opt/openoffice.org/ure
+URE_HOME ?= /opt/openoffice.org
.DELETE_ON_ERROR:
@@ -34,18 +34,18 @@ check: test-regview test-cpptest test-javatest test-javanative test-clientserver
.PHONY: test-regview
test-regview: out.pln/types.rdb
- $(URE_HOME)/bin/regview $< > /dev/null
+ $(URE_HOME)/program/regview $< > /dev/null
.PHONY: test-cpptest
test-cpptest: out.pln/cppmain.uno.so out.pln/types.rdb out.pln/services.rdb
- $(GCCS_COMPAT) $(URE_HOME)/bin/uno \
+ $(GCCS_COMPAT) $(URE_HOME)/program/uno \
-c test.cpp.cppmain.Component -l file://$(PWD)/$< \
-env:URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
-env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb
.PHONY: test-javatest
test-javatest: out.pln/javamain.uno.jar out.pln/types.rdb out.pln/services.rdb
- $(GCCS_COMPAT) $(URE_HOME)/bin/uno \
+ $(GCCS_COMPAT) $(URE_HOME)/program/uno \
-c test.java.javamain.Component -l file://$(PWD)/$< \
-env:URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
-env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb
@@ -55,20 +55,21 @@ test-javanative: out.pln/runner.jar out.pln/javanative.jar \
out.pln/types.rdb out.pln/services.rdb
URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \
- $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/lib java \
- -jar out.pln/runner.jar file://$(URE_HOME)/share/java/ \
+ $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib java \
+ -jar out.pln/runner.jar file://$(URE_HOME)/ure-link/share/java/ \
file://$(PWD)/out.pln/javanative.jar
.PHONY: test-clientserver
test-clientserver: out.pln/cppserver.uno.so out.pln/types.rdb \
out.pln/services.rdb out.pln/runner.jar out.pln/javaclient.jar
- $(GCCS_COMPAT) $(URE_HOME)/bin/uno -c test.cpp.cppserver.Component \
+ $(GCCS_COMPAT) $(URE_HOME)/program/uno -c test.cpp.cppserver.Component \
-l file://$(PWD)/out.pln/cppserver.uno.so \
-env:URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
-env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \
-u 'uno:pipe,name=ure_test;urp;server' --singleaccept &
sleep 5 && \
- java -jar out.pln/runner.jar file://$(URE_HOME)/share/java/ \
+ java -jar out.pln/runner.jar \
+ file://$(URE_HOME)/ure-link/share/java/ \
file://$(PWD)/out.pln/javaclient.jar \
'uno:pipe,name=ure_test;urp;server'
@@ -120,15 +121,16 @@ out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \
out.pln/cpputypes.cppumaker.flag: | out.pln
- LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
+ LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/cppumaker \
-O./out.pln/include/cpputypes \
'-Tcom.sun.star.beans.Introspection;com.sun.star.beans.theIntrospection;com.sun.star.bridge.BridgeFactory;com.sun.star.bridge.UnoUrlResolver;com.sun.star.connection.Acceptor;com.sun.star.connection.Connector;com.sun.star.io.Pipe;com.sun.star.io.TextInputStream;com.sun.star.io.TextOutputStream;com.sun.star.java.JavaVirtualMachine;com.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.loader.Java;com.sun.star.loader.SharedLibrary;com.sun.star.reflection.ProxyFactory;com.sun.star.registry.ImplementationRegistration;com.sun.star.registry.SimpleRegistry;com.sun.star.registry.XRegistryKey;com.sun.star.script.Converter;com.sun.star.script.Invocation;com.sun.star.security.AccessController;com.sun.star.security.Policy;com.sun.star.uno.Deploym
entException;com.sun.star.uno.Exception;com.sun.star.uno.NamingService;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.uri.ExternalUriReferenceTranslator;com.sun.star.uri.UriReferenceFactory;com.sun.star.uri.VndSunStarPkgUrlReferenceFactory;com.sun.star.util.theMacroExpander' \
- $(URE_HOME)/share/misc/types.rdb
+ $(URE_HOME)/ure-link/share/misc/types.rdb
touch $@
out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln
- LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
- -O./out.pln/include/types $< -X$(URE_HOME)/share/misc/types.rdb
+ LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/cppumaker \
+ -O./out.pln/include/types $< \
+ -X$(URE_HOME)/ure-link/share/misc/types.rdb
touch $@
@@ -146,7 +148,7 @@ out.pln/class/javamain/test/java/javamain/JavaMain.class: JavaMain.java \
rm -rf out.pln/class/javamain
mkdir out.pln/class/javamain
javac -classpath \
- $(URE_HOME)/share/java/jurt.jar:$(URE_HOME)/share/java/ridl.jar:out.pln/tester.jar \
+ $(URE_HOME)/ure-link/share/java/jurt.jar:$(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/tester.jar \
-sourcepath . -d out.pln/class/javamain $<
@@ -156,14 +158,14 @@ out.pln/runner.jar: out.pln/class/runner/test/java/runner/Runner.class \
out.pln/runner.mf: runner.mf.template | out.pln
sed -e \
- 's~^Class-Path:$$~& file://$(URE_HOME)/share/java/unoloader.jar~' \
+ 's~^Class-Path:$$~& file://$(URE_HOME)/ure-link/share/java/unoloader.jar~' \
-e 's~^UNO-Type-Path:$$~& ~' $< > $@
out.pln/class/runner/test/java/runner/Runner.class: Runner.java | out.pln/class
rm -rf out.pln/class/runner
mkdir out.pln/class/runner
- javac -classpath $(URE_HOME)/share/java/unoloader.jar -sourcepath . \
- -d out.pln/class/runner $<
+ javac -classpath $(URE_HOME)/ure-link/share/java/unoloader.jar \
+ -sourcepath . -d out.pln/class/runner $<
out.pln/tester.jar: out.pln/class/tester/test/java/tester/Tester.class \
@@ -178,7 +180,8 @@ out.pln/class/tester/test/java/tester/Tester.class: Tester.java \
out.pln/types.jar | out.pln/class
rm -rf out.pln/class/tester
mkdir out.pln/class/tester
- javac -classpath $(URE_HOME)/share/java/ridl.jar:out.pln/types.jar \
+ javac -classpath \
+ $(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/types.jar \
-sourcepath . -d out.pln/class/tester $<
@@ -196,7 +199,7 @@ out.pln/class/javatest/test/java/javatest/JavaTest.class: JavaTest.java \
rm -rf out.pln/class/javatest
mkdir out.pln/class/javatest
javac -classpath \
- $(URE_HOME)/share/java/jurt.jar:$(URE_HOME)/share/java/ridl.jar:out.pln/types.jar \
+ $(URE_HOME)/ure-link/share/java/jurt.jar:$(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/types.jar \
-sourcepath . -d out.pln/class/javatest $<
@@ -214,7 +217,7 @@ out.pln/class/javanative/test/java/javanative/JavaNative.class: \
rm -rf out.pln/class/javanative
mkdir out.pln/class/javanative
javac -classpath \
- $(URE_HOME)/share/java/juh.jar:$(URE_HOME)/share/java/ridl.jar:out.pln/tester.jar \
+ $(URE_HOME)/ure-link/share/java/juh.jar:$(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/tester.jar \
-sourcepath . -d out.pln/class/javanative $<
@@ -232,7 +235,7 @@ out.pln/class/javaclient/test/java/javaclient/JavaClient.class: \
rm -rf out.pln/class/javaclient
mkdir out.pln/class/javaclient
javac -classpath \
- $(URE_HOME)/share/java/juh.jar:$(URE_HOME)/share/java/ridl.jar:out.pln/types.jar \
+ $(URE_HOME)/ure-link/share/java/juh.jar:$(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/types.jar \
-sourcepath . -d out.pln/class/javaclient $<
@@ -244,16 +247,17 @@ out.pln/types.mf: types.mf.template | out.pln
out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class
rm -rf out.pln/class/types
- LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/javamaker \
- -O./out.pln/class/types $< -X$(URE_HOME)/share/misc/types.rdb
+ LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/javamaker \
+ -O./out.pln/class/types $< \
+ -X$(URE_HOME)/ure-link/share/misc/types.rdb
touch $@
out.pln/types.rdb: out.pln/types.urd | out.pln
- $(URE_HOME)/bin/regmerge $@ /UCR $<
+ $(URE_HOME)/program/regmerge $@ /UCR $<
out.pln/types.urd: types.idl | out.pln
- LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/idlc -O$(@D) \
+ LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/idlc -O$(@D) \
-I$(SDK_HOME)/idl -cid -we $<
@@ -263,16 +267,16 @@ out.pln/services.rdb: services.rdb.in | out.pln/cpptest.uno.so \
out.pln/lib/libuno_cppu.so: | out.pln/lib
- ln -fs $(URE_HOME)/lib/libuno_cppu.so.3 $@
+ ln -fs $(URE_HOME)/ure-link/lib/libuno_cppu.so.3 $@
out.pln/lib/libuno_cppuhelpergcc3.so: | out.pln/lib
- ln -fs $(URE_HOME)/lib/libuno_cppuhelpergcc3.so.3 $@
+ ln -fs $(URE_HOME)/ure-link/lib/libuno_cppuhelpergcc3.so.3 $@
out.pln/lib/libuno_sal.so: | out.pln/lib
- ln -fs $(URE_HOME)/lib/libuno_sal.so.3 $@
+ ln -fs $(URE_HOME)/ure-link/lib/libuno_sal.so.3 $@
out.pln/lib/libuno_salhelpergcc3.so: | out.pln/lib
- ln -fs $(URE_HOME)/lib/libuno_salhelpergcc3.so.3 $@
+ ln -fs $(URE_HOME)/ure-link/lib/libuno_salhelpergcc3.so.3 $@
out.pln:
diff --git a/ure/source/uretest/README b/ure/source/uretest/README
index 18b74c8..2c611a8 100644
--- a/ure/source/uretest/README
+++ b/ure/source/uretest/README
@@ -52,7 +52,7 @@ contains the java, javac, and jar executables. For the minimum version
requirements, see the SDK Installation Guide ($SDK_HOME/docs/install.html).
- URE_HOME (optional)
-Overwrites the default URE location, that is, /opt/openoffice.org/ure.
+Overwrites the default URE location, that is, /opt/openoffice.org.
- GCCS_COMPAT (optional)
Fixes incompatibility issues between the GCC that was used to build the URE and
More information about the Libreoffice-commits
mailing list