strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add AIX to desktop

Browse source
This commit is contained in:
Caolán McNamara 2010-10-13 13:17:31 +01:00
parent 4464655f41
commit 53baa03a40
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
desktop/scripts/soffice.sh
View file

@ -121,8 +121,17 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
sd_platform=`uname -s`
case $sd_platform in
AIX)
LIBPATH=$my_path${LIBPATH:+:$LIBPATH}
export LIBPATH
;;
*)
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
;;
esac
fi
fi

13
desktop/scripts/unopkg.sh
View file

@ -57,8 +57,17 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
sd_platform=`uname -s`
case $sd_platform in
AIX)
LIBPATH=$my_path${LIBPATH:+:$LIBPATH}
export LIBPATH
;;
*)
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
;;
esac
fi
fi

3
desktop/source/deployment/misc/dp_platform.cxx
View file

@ -70,6 +70,7 @@
#define PLATFORM_OS2_X86 "os2_x86"
#define PLATFORM_AIX_POWERPC "aix_powerpc"
@ -184,6 +185,8 @@ namespace
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_OS2_X86)))
ret = checkOSandCPU(OUSTR("OS2"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_AIX_POWERPC)))
ret = checkOSandCPU(OUSTR("AIX"), OUSTR("PowerPC"));
else
{
OSL_ENSURE(0, "Extension Manager: The extension supports an unknown platform. "