summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop/Pagein_common.mk2
-rwxr-xr-xdesktop/unx/source/start.c6
-rw-r--r--l10ntools/layout/makefile.mk2
-rw-r--r--l10ntools/source/help/makefile.mk2
-rw-r--r--l10ntools/source/makefile.mk5
-rwxr-xr-xscp2/inc/macros.inc4
-rw-r--r--scp2/source/ooo/file_ooo.scp10
-rw-r--r--shell/source/tools/lngconvex/makefile.mk2
-rwxr-xr-xsolenv/bin/linkoo5
-rw-r--r--solenv/bin/macosx-change-install-names.pl5
-rw-r--r--solenv/gbuild/Library.mk7
-rw-r--r--solenv/gbuild/platform/ios.mk4
-rw-r--r--solenv/gbuild/platform/macosx.mk9
-rw-r--r--solenv/gbuild/platform/solaris.mk8
-rw-r--r--solenv/gbuild/platform/unxgcc.mk8
-rw-r--r--solenv/gbuild/platform/windows.mk5
-rw-r--r--solenv/gbuild/platform/winmingw.mk4
-rw-r--r--solenv/inc/settings.mk4
18 files changed, 33 insertions, 59 deletions
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 3b0330c396df..a9d46ebe494e 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -61,7 +61,7 @@ $(eval $(call desktop_Pagein_add_libs_with_dir,common,\
cppuhelper \
cppu \
sal \
- ,../ure-link/lib \
+ ,../basis-link/ure-link/lib \
))
$(eval $(call desktop_Pagein_add_libs,common,\
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 6ca688d04f4f..e50a233e4289 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -743,17 +743,17 @@ system_checks( void )
extern int pagein_execute (int argc, char **argv);
#ifndef MACOSX
-#define REL_PATH "../basis-link/program/"
static char *build_pagein_path (Args *args, const char *pagein_name)
{
char *path;
rtl_String *app_path;
app_path = ustr_to_str (args->pAppPath);
- path = malloc (app_path->length + strlen (pagein_name) + sizeof (REL_PATH) + 1);
+ path = malloc (
+ RTL_CONSTASCII_LENGTH("@") + app_path->length + strlen (pagein_name) +
+ 1);
strcpy (path, "@");
strcpy (path + 1, rtl_string_getStr (app_path));
- strcat (path, REL_PATH);
strcat (path, pagein_name);
rtl_string_release( app_path );
diff --git a/l10ntools/layout/makefile.mk b/l10ntools/layout/makefile.mk
index 8da90e22c8f7..1643c0d048d7 100644
--- a/l10ntools/layout/makefile.mk
+++ b/l10ntools/layout/makefile.mk
@@ -57,7 +57,7 @@ OBJFILES =\
$(OBJ)/xmlparse.obj
APP1OBJS = $(OBJFILES)
-
+APP1RPATH = NONE
APP1STDLIBS =\
$(COMPHELPERLIB) \
$(TOOLSLIB)\
diff --git a/l10ntools/source/help/makefile.mk b/l10ntools/source/help/makefile.mk
index efd05888b3b5..bab01b8f9a66 100644
--- a/l10ntools/source/help/makefile.mk
+++ b/l10ntools/source/help/makefile.mk
@@ -76,7 +76,7 @@ APP1TARGET= $(TARGET)
APP1OBJS=\
$(OBJ)$/HelpLinker.obj \
$(OBJ)$/HelpCompiler.obj
-
+APP1RPATH = NONE
APP1STDLIBS+=$(SALLIB) $(BERKELEYLIB) $(XSLTLIB) $(EXPATASCII3RDLIB)
SHL1TARGET =$(LIBBASENAME)$(DLLPOSTFIX)
diff --git a/l10ntools/source/makefile.mk b/l10ntools/source/makefile.mk
index 0f3dc6618c68..69110078bdca 100644
--- a/l10ntools/source/makefile.mk
+++ b/l10ntools/source/makefile.mk
@@ -75,6 +75,7 @@ APP1VERSIONMAP=exports.map
# extractor and merger for *.src and *.hrc
APP1TARGET= transex3
APP1OBJS= $(OBJ)$/src_yy_wrapper.obj
+APP1RPATH= NONE
APP1STDLIBS+= \
$(TOOLSLIB) \
$(COMPHELPERLIB) \
@@ -104,6 +105,7 @@ APP3STDLIBS+= \
# tag checker for *.gsi
APP5TARGET= gsicheck
APP5OBJS= $(OBJ)$/gsicheck.obj $(OBJ)$/tagtest.obj
+APP5RPATH= NONE
APP5STDLIBS+= \
$(TOOLSLIB) \
$(COMPHELPERLIB) \
@@ -112,6 +114,7 @@ APP5STDLIBS+= \
# extractor and merger for *.cfg
APP6TARGET= cfgex
APP6OBJS= $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj
+APP6RPATH= NONE
APP6STDLIBS+= \
$(TOOLSLIB) \
$(COMPHELPERLIB) \
@@ -131,7 +134,7 @@ APP9TARGET= localize_sl
EXCEPTIONSFILES= \
$(OBJ)$/localize.obj
APP9OBJS= $(OBJ)$/localize.obj $(OBJ)$/srciter.obj $(OBJ)$/export2.obj $(OBJ)$/file.obj $(OBJ)$/directory.obj
-
+APP9RPATH= NONE
APP9STDLIBS+= \
$(TOOLSLIB) \
$(COMPHELPERLIB) \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 8b96b8852394..1b8f2a77df7d 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -85,11 +85,7 @@
#define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip))
#define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
-#if defined WNT
#define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
-#else
-#define SCP2_OOO_BIN_DIR gid_Dir_Program
-#endif
#define BIN_FILE_BODY \
UnixRights = 755
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 2fcbfdcac6b8..f5b30d9b4dae 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1275,35 +1275,35 @@ End
File gid_File_Txt_Pagein_Calc
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-calc";
End
File gid_File_Txt_Pagein_Common
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-common";
End
File gid_File_Txt_Pagein_Draw
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-draw";
End
File gid_File_Txt_Pagein_Impress
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-impress";
End
File gid_File_Txt_Pagein_Writer
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-writer";
End
diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk
index f7f229772f8f..bf711520209f 100644
--- a/shell/source/tools/lngconvex/makefile.mk
+++ b/shell/source/tools/lngconvex/makefile.mk
@@ -53,7 +53,7 @@ CFLAGS+=-Ob0 -D_NTSDK
APP1TARGET=$(TARGET)
APP1OBJS=$(OBJ)$/$(TARGET).obj\
$(OBJ)$/cmdline.obj
-
+APP1RPATH = NONE
APP1STDLIBS= $(SALLIB)\
$(TOOLSLIB)\
$(I18NISOLANGLIB)
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index fa2e0c64b995..2a43dfd5df50 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -80,7 +80,8 @@ my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
my $dllre = '\.so$';
my %replaceable = (
- $program_dir => "($dllre|\\.rdb)",
+ $brand_program_dir => "$dllre",
+ $program_dir => "\\.rdb",
$ure_lib_dir => "($dllre|\\.so\\.3\$)",
$program_dir . '/resource' => '\.res$',
$program_dir . '/classes' => '\.jar$',
@@ -338,7 +339,7 @@ sub link_pagein_files()
{
print "pagein case:";
my $src = "$OOO_BUILD/solver/$TARGET/bin";
- my $dest = "$OOO_INSTALL/" . $program_dir;
+ my $dest = "$OOO_INSTALL/" . $brand_program_dir;
for my $c ('calc', 'draw', 'impress', 'writer', 'common') {
do_link ($src, $dest, "pagein-$c", "pagein-$c");
}
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 343f9538c57f..1374be010894 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -33,15 +33,14 @@ sub action($$$)
my %action =
('app/UREBIN/URELIB' => '@executable_path/../lib',
'app/OOO/URELIB' => '@executable_path/../ure-link/lib',
- 'app/OOO/OOO' => '@executable_path',
'app/SDK/URELIB' => '@executable_path/../../ure-link/lib',
'app/BRAND/URELIB' => '@executable_path/../basis-link/ure-link/lib',
- 'app/BRAND/OOO' => '@executable_path/../basis-link/program',
+ 'app/BRAND/OOO' => '@executable_path',
'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__',
'shl/URELIB/URELIB' => '@loader_path',
- 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib',
+ 'shl/OOO/URELIB' => '@loader_path/../basis-link/ure-link/lib',
'shl/OOO/OOO' => '@loader_path',
'shl/LOADER/LOADER' => '@loader_path',
'shl/OXT/URELIB' => '@executable_path/urelibs',
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index db6d961ef27e..dd6c1ccf1dae 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -33,7 +33,6 @@
# gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib
# gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library
# defined by platform
-# gb_Library_COMPONENTPREFIXES
# gb_Library_DEFS
# gb_Library_DLLFILENAMES
# gb_Library_FILENAMES
@@ -93,9 +92,13 @@ gb_Library__get_componentprefix = \
gb_Library__get_layer_componentprefix = \
$(patsubst $(1):%,%,$(or \
- $(filter $(1):%,$(gb_Library_COMPONENTPREFIXES)), \
+ $(filter $(1):%,$(gb_Library__COMPONENTPREFIXES)), \
$(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)')))
+gb_Library__COMPONENTPREFIXES := \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+ OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
+ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
define gb_Library__forward_to_Linktarget
gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Library_get_linktargetname,$$(1)),$$(2),$$(3))
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index f9c903c06d71..e9653eda5d1f 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -426,10 +426,6 @@ endef
# ComponentTarget
gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-gb_Library_COMPONENTPREFIXES := \
- OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
- URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
- NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index aa560a3a0296..01ff9d0613a2 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -273,10 +273,11 @@ gb_LinkTarget__RPATHS := \
OOO:@__________________________________________________OOO/ \
BRAND: \
SDKBIN: \
- NONE: \
+ NONE:@__VIA_LIBRARY_PATH__@ \
define gb_LinkTarget__get_installname
-$(if $(2),-install_name '$(2)$(1)',)
+$(if $(2),-install_name '$(2)$(1)',$(error
+ cannot determine -install_name for $(2)))
endef
gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
@@ -514,10 +515,6 @@ endef
# ComponentTarget
gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_Library_COMPONENTPREFIXES := \
- OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
- URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
- NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index bab6eef60f55..313dae8153c2 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -189,8 +189,8 @@ endef
gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
UREBIN:\dORIGIN/../lib:\dORIGIN \
- OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
- BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
+ OOO:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
+ BRAND:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
NONE:\dORIGIN/../lib:\dORIGIN \
@@ -397,10 +397,6 @@ endef
# ComponentTarget
gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_Library_COMPONENTPREFIXES := \
- OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
- URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
- NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 06a75a2ae007..22e3835c7d59 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -277,8 +277,8 @@ endef
gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
UREBIN:\dORIGIN/../lib:\dORIGIN \
- OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
- BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
+ OOO:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
+ BRAND:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
NONE:\dORIGIN/../lib:\dORIGIN \
@@ -483,10 +483,6 @@ endef
# ComponentTarget
gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-gb_Library_COMPONENTPREFIXES := \
- OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
- URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
- NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 3dd705748f22..3ada7c3a0984 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -745,11 +745,6 @@ endif
# See comment for svidl.exe
gb_XSLTPROCPRECOMMAND :=
-gb_Library_COMPONENTPREFIXES := \
- OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
- URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
- NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-
# UnoApiTarget
gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 934588a218bf..3b4b856fee2d 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -667,10 +667,6 @@ endif
# ComponentTarget
gb_XSLTPROCPRECOMMAND := $(gb_Helper_set_ld_path)
-gb_Library_COMPONENTPREFIXES := \
- OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
- URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
- NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 0b534297120d..661861b9b8b7 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1386,11 +1386,7 @@ CPPUNIT_CFLAGS =
COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/
COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/
-.IF "$(OS)" == "WNT"
COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
-.ELSE
-COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/
-.END
COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/
COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule:
COMPONENTPREFIX_INBUILD_NATIVE = \
generated by cgit (git 2.34.1) at 2025-01-15 16:27:40 +0000