diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:13:51 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:13:51 +0000 |
commit | 9d9f38eb80e9f42841f17562b8b1787287134009 (patch) | |
tree | 00794c289379ae1589e5591a91d131c1e74377eb /odk/setsdkenv_unix | |
parent | d7853f62de8779fadba387d73254131a5e8ada38 (diff) |
INTEGRATION: CWS jsc21 (1.10.132); FILE MERGED
2008/07/03 16:02:01 jsc 1.10.132.5: #88797# rework optional module, make standalone product
2008/05/23 11:38:04 jsc 1.10.132.4: #i88797# adapted for mac
2008/05/22 13:54:59 jsc 1.10.132.3: #i88797 use hostname to store config files, support of multiple envs
2008/05/22 07:07:55 jsc 1.10.132.2: #i88797# adapted to new structure
2008/04/30 11:34:24 jsc 1.10.132.1: #86121# update for 3 layer office
Diffstat (limited to 'odk/setsdkenv_unix')
-rw-r--r-- | odk/setsdkenv_unix | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix index ce7de3018707..c9ad0650d0c1 100644 --- a/odk/setsdkenv_unix +++ b/odk/setsdkenv_unix @@ -1,19 +1,29 @@ #! /bin/sh +OSTYPE=`uname -s` +HOSTNAME=`hostname` CURRENTDIR=`/bin/pwd` SDKTMPDIR=`dirname $0` -SDKDIRECTORY=`(cd $SDKTMPDIR && pwd && cd $CURRENTDIR) | head -n 1` -OO_SDK_NAME=`basename $SDKDIRECTORY` +OO_SDK_HOME=`(cd $SDKTMPDIR && pwd && cd $CURRENTDIR) | head -n 1` +OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail +2 | head -1 | cut -d"=" -f2 | cut -d"." -f1,2` +if [ "$OSTYPE" = "Darwin" ] +then + OO_SDK_NAME=`basename $OO_SDK_HOME` +else + OO_SDK_NAME=openoffice.org${OOVERSION}_sdk +fi + +export OO_SDK_HOME if [ "$1" = "--force-configure" ] then - if [ -r $HOME/$OO_SDK_NAME/setsdkenv_unix.sh ] + if [ -r $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh ] then - rm $HOME/$OO_SDK_NAME/setsdkenv_unix.sh + rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh fi - if [ -r $HOME/$OO_SDK_NAME/setsdkenv_unix.csh ] + if [ -r $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh ] then - rm $HOME/$OO_SDK_NAME/setsdkenv_unix.csh + rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh fi shift elif [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ -n "$1" ] @@ -32,9 +42,9 @@ then fi # source the prepared environment and start a new shell -if [ -r $HOME/$OO_SDK_NAME/setsdkenv_unix.sh ] +if [ -r $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh ] then - . $HOME/$OO_SDK_NAME/setsdkenv_unix.sh + . $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh else echo echo " ************************************************************************" @@ -44,13 +54,13 @@ else echo " *" echo " ************************************************************************" echo - perl $SDKDIRECTORY/configure.pl $SDKDIRECTORY + perl $OO_SDK_HOME/configure.pl $HOSTNAME $OO_SDK_HOME $OO_SDK_NAME - . $HOME/$OO_SDK_NAME/setsdkenv_unix.sh + . $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh fi "$SHELL" "$@" echo Shell terminated. -TERMHEAD=`hostname` +TERMHEAD=$HOSTNAME echo "]2;$TERMHEAD" |