[Libreoffice-commits] .: 2 commits - scp2/source shell/source solenv/inc
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Thu Oct 6 13:55:31 PDT 2011
scp2/source/ooo/file_ooo.scp | 14 +++++++-------
shell/source/cmdmail/cmdmailsuppl.cxx | 2 +-
shell/source/unix/exec/shellexec.cxx | 6 +++---
shell/source/unix/misc/makefile.mk | 2 ++
shell/source/win32/simplemail/makefile.mk | 2 +-
shell/source/win32/simplemail/smplmailclient.cxx | 2 +-
solenv/inc/unxaigppc.mk | 5 ++---
solenv/inc/unxgcc.mk | 4 ++--
solenv/inc/unxsoli4.mk | 4 ++--
solenv/inc/unxsols4.mk | 4 ++--
solenv/inc/unxsolu4.mk | 4 ++--
11 files changed, 25 insertions(+), 24 deletions(-)
New commits:
commit d550bc3f450dd2d3aa33398eb31bc1163a181c43
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Oct 6 21:29:44 2011 +0200
Undo basis/brand split: move some auxiliary executables from basis to brand.
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d43104d..37e1f9d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -139,7 +139,7 @@ End
File gid_File_Bin_Open_Url
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "open-url";
Styles = (PACKED);
End
@@ -150,28 +150,28 @@ End
File gid_File_Bin_Gnome_Open_Url
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "gnome-open-url";
Styles = (PACKED);
End
File gid_File_Bin_Gnome_Open_Url_Bin
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "gnome-open-url.bin";
Styles = (PACKED);
End
File gid_File_Bin_Kde_Open_Url
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "kde-open-url";
Styles = (PACKED);
End
File gid_File_Bin_Cde_Open_Url
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "cde-open-url";
Styles = (PACKED);
End
@@ -182,7 +182,7 @@ End
File gid_File_Bin_Uri_Encode
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "uri-encode";
Styles = (PACKED);
End
@@ -191,7 +191,7 @@ End
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
#ifdef UNX
Name = "senddoc";
Styles = (PACKED);
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index ec623c0..548b90c 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -153,7 +153,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
OStringBuffer aBuffer;
aBuffer.append("\"");
- OUString aProgramURL(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/senddoc"));
+ OUString aProgramURL(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/senddoc"));
rtl::Bootstrap::expandMacros(aProgramURL);
OUString aProgram;
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 4af7c7b..40a2fa3 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -159,7 +159,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
#ifdef MACOSX
aBuffer.append("open");
#else
- // The url launchers are expected to be in the $OOO_BASE_DIR/program
+ // The url launchers are expected to be in the $BRAND_BASE_DIR/program
// directory:
com::sun::star::uno::Reference< com::sun::star::util::XMacroExpander >
exp;
@@ -182,11 +182,11 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
try {
aProgramURL = exp->expandMacros(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/")));
+ RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/")));
} catch (com::sun::star::lang::IllegalArgumentException &)
{
throw SystemShellExecuteException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Could not expand $OOO_BASE_DIR path")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Could not expand $BRAND_BASE_DIR path")),
static_cast < XSystemShellExecute * > (this), ENOENT );
}
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index be4660d..3f1b64e 100644
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -51,6 +51,7 @@ APP1TARGET = gnome-open-url.bin
APP1OBJS = \
$(OBJ)$/gnome-open-url.obj
APP1LIBS =
+APP1RPATH = BRAND
.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && \
"$(OS)"!="DRAGONFLY"
APP1STDLIBS=-ldl
@@ -59,6 +60,7 @@ APP1STDLIBS=-ldl
APP2TARGET = uri-encode
APP2OBJS = $(OBJ)$/uri-encode.obj
APP2LIBS =
+APP2RPATH = BRAND
APP2STDLIBS =
OBJFILES = $(APP1OBJS) $(APP2OBJS)
diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk
index abd35e4..3e8b15f 100644
--- a/shell/source/win32/simplemail/makefile.mk
+++ b/shell/source/win32/simplemail/makefile.mk
@@ -70,7 +70,7 @@ APP1TARGET=senddoc
APP1OBJS=$(OBJFILES)
APP1STDLIBS=$(KERNEL32LIB)\
$(SALLIB)
-
+APP1RPATH = BRAND
APP1DEF=$(MISC)$/$(APP1TARGET).def
# --- Targets ------------------------------------------------------
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index 52707b3..2d27049 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -112,7 +112,7 @@ namespace /* private */
{
senddocUrl = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "$OOO_BASE_DIR/program/senddoc.exe"));
+ "$BRAND_BASE_DIR/program/senddoc.exe"));
rtl::Bootstrap::expandMacros(senddocUrl); //TODO: detect failure
}
return senddocUrl;
commit 243ead838369b030579f501ce1f77689ce822f06
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Oct 6 21:28:15 2011 +0200
Undo basis/brand split: move dynamic libraries from basis to brand.
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
index d474ee2..1eb280e 100644
--- a/solenv/inc/unxaigppc.mk
+++ b/solenv/inc/unxaigppc.mk
@@ -38,14 +38,13 @@ CDEFS+=-D_THREAD_SAFE
COLON=":"
URELIBDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/lib))
UREBINDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/bin))
-BASISPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/program))
BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/program))
LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_BRAND:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_BRAND:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
LINKFLAGSAPPGUI:=
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 028e954..45f6901 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -169,9 +169,9 @@ LINKFLAGSDEFS*=-Wl,-z,defs
LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
# flag -Wl,-z,noexecstack sets the NX bit on the stack
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index c21c362..aacf1d9 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -130,9 +130,9 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS)
LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index b609951..c1d7aed 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -136,9 +136,9 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS)
LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index ab276cb..e330b7f 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -131,8 +131,8 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS)
LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
More information about the Libreoffice-commits
mailing list