diff options
| -rw-r--r-- | odk/CustomTarget_odkcommon.mk | 2 | ||||
| -rw-r--r-- | odk/config/configure.pl | 9 | ||||
| -rwxr-xr-x | odk/config/setsdkenv_unix | 5 | ||||
| -rw-r--r-- | odk/config/setsdkenv_unix.csh.in | 289 | ||||
| -rw-r--r-- | odk/docs/install.html | 11 | ||||
| -rw-r--r-- | odk/util/check.pl | 4 |
6 files changed, 7 insertions, 313 deletions
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index 935f3ea4bab9..9ba2d6e44a99 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -33,7 +33,7 @@ else odk_CONFIGLIST := configure.pl \ setsdkenv_unix \ setsdkenv_unix.sh.in \ - setsdkenv_unix.csh.in + endif define odk_config diff --git a/odk/config/configure.pl b/odk/config/configure.pl index 8cd2a54978dd..9a460c89066b 100644 --- a/odk/config/configure.pl +++ b/odk/config/configure.pl @@ -514,12 +514,9 @@ else $main::SDK_AUTO_DEPLOYMENT = "NO"; } -prepareScriptFile("setsdkenv_unix.sh.in", "setsdkenv_unix.sh", 1); +prepareScriptFile("setsdkenv_unix.sh.in", "setsdkenv_unix.sh"); chmod 0644, "$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.sh"; -prepareScriptFile("setsdkenv_unix.csh.in", "setsdkenv_unix.csh", 2); -chmod 0644, "$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.csh"; - print "\n"; print " ************************************************************************\n"; print " * ... your SDK environment has been prepared.\n"; @@ -527,7 +524,6 @@ print " * For each time you want to use this configured SDK environment, you\n"; print " * have to run the \"setsdkenv_unix\" script file!\n"; print " * Alternatively can you source one of the scripts\n"; print " * \"$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.sh\"\n"; -print " * \"$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.csh\"\n"; print " * to get an environment without starting a new shell.\n"; print " ************************************************************************\n\n"; @@ -776,9 +772,6 @@ sub prepareScriptFile() { my $inputFile = shift; my $outputFile = shift; - # shell mode 1 = sh - # 2 = csh - my $shellMode = shift; if ( ! -d "$main::OO_SDK_CONFIG_HOME/$main::hostname" ) { diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix index 08972af3c647..38ab22292b2b 100755 --- a/odk/config/setsdkenv_unix +++ b/odk/config/setsdkenv_unix @@ -38,10 +38,6 @@ then then rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh fi - if [ -r $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh ] - then - rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh - fi shift elif [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ -n "$1" ] then @@ -52,7 +48,6 @@ then echo " --force-configure : force a new configuration of your SDK environment." echo " Alternatively can you edit your SDK environment scripts directly:" echo " $HOME/$OO_SDK_NAME/setsdkenv_unix.sh" - echo " $HOME/$OO_SDK_NAME/setsdkenv_unix.csh" echo " -h, --help : print this help and exit" echo exit 1 diff --git a/odk/config/setsdkenv_unix.csh.in b/odk/config/setsdkenv_unix.csh.in deleted file mode 100644 index bdd5ede21f53..000000000000 --- a/odk/config/setsdkenv_unix.csh.in +++ /dev/null @@ -1,289 +0,0 @@ -#! /bin/csh -# -# 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 . -# - -# This script sets all enviroment variables, which are necessary for building -# the examples of the Office Development Kit. -# The Script was developed for the operating systems Solaris, Linux and MacOS. - -# The SDK name -setenv OO_SDK_NAME @OO_SDK_NAME@ - -# Installation directory of the Software Development Kit. -# Example: setenv OO_SDK_HOME /opt/libreoffice/basis3.4/sdk -setenv OO_SDK_HOME '@OO_SDK_HOME@' - -# Office installation directory. -# Example: set OFFICE_HOME=/opt/libreoffice -setenv OFFICE_HOME '@OFFICE_HOME@' - -# URE installation directory. -# Example: setenv OO_SDK_URE_HOME /opt/libreoffice/ure -setenv OO_SDK_URE_HOME '@OO_SDK_URE_HOME@' - -# Directory of the make command. -# Example: setenv OO_SDK_MAKE_HOME /usr/bin -setenv OO_SDK_MAKE_HOME @OO_SDK_MAKE_HOME@ - -# Directory of the zip command. -# Example: setenv OO_SDK_ZIP_HOME /usr/bin -setenv OO_SDK_ZIP_HOME @OO_SDK_ZIP_HOME@ - -# Directory of the C++ compiler. -# Example: setenv OO_SDK_CPP_HOME /usr/bin -setenv OO_SDK_CPP_HOME @OO_SDK_CPP_HOME@ - -# Solaris only -setenv OO_SDK_CC_55_OR_HIGHER @OO_SDK_CC_55_OR_HIGHER@ - -# Directory of the Java SDK. -# Example: setenv OO_SDK_JAVA_HOME "/usr/jdk/jdk1.6.0_10" -setenv OO_SDK_JAVA_HOME @OO_SDK_JAVA_HOME@ - -# Special output directory -# Example: setenv OO_SDK_OUTPUT_DIR "$HOME" -setenv OO_SDK_OUTPUT_DIR @OO_SDK_OUTPUT_DIR@ - -# Environment variable to enable auto deployment of example components -# Example: set SDK_AUTO_DEPLOYMENT=YES -setenv SDK_AUTO_DEPLOYMENT @SDK_AUTO_DEPLOYMENT@ - -# Get the operating system. -set sdk_platform=`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4` - -# Set the directory name. -set programdir=program -set javadir=bin -switch (${sdk_platform}) - case "darwin*": - set programdir="Contents/MacOS" - set javacdir=Commands - breaksw -endsw - - -# Set office program path. -if ( "${OFFICE_HOME}" != "" ) then - setenv OFFICE_PROGRAM_PATH "${OFFICE_HOME}/${programdir}" -endif - - -# Set UNO path, necessary to ensure that the cpp examples using the -# new UNO bootstrap mechanism use the configured office installation. -if ( ${?OFFICE_PROGRAM_PATH} ) then - setenv UNO_PATH "${OFFICE_PROGRAM_PATH}" -endif - -if ( "${OO_SDK_URE_HOME}" != "" ) then - setenv OO_SDK_URE_BIN_DIR "${OO_SDK_URE_HOME}/bin" - setenv OO_SDK_URE_LIB_DIR "${OO_SDK_URE_HOME}/lib" - setenv OO_SDK_URE_JAVA_DIR "${OO_SDK_URE_HOME}/share/java" -else - setenv OO_SDK_URE_BIN_DIR "${OFFICE_PROGRAM_PATH}" - setenv OO_SDK_URE_LIB_DIR "${OFFICE_PROGRAM_PATH}" - setenv OO_SDK_URE_JAVA_DIR "${OFFICE_PROGRAM_PATH}/classes" -endif - -# Set SDK example output directory -setenv OO_SDK_OUT ${OO_SDK_HOME} -if ( $?OO_SDK_OUTPUT_DIR ) then - setenv OO_SDK_OUT ${OO_SDK_OUTPUT_DIR}/${OO_SDK_NAME} -endif - -# check platform and set appropriate variables -switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) - case "solaris*": - if ( `${OO_SDK_HOME}/config.guess | cut -d"-" -f1` == "sparc" ) then - set directoryname=solsparc - set platform=Solaris Sparc - else - set directoryname=solintel - set platform=Solaris Intel - endif - set comid=C52 - set pltfrm=sunpro - set soext=so - set exampleout=SOLARISexample.out - - # set LD_LIBRARY_PATH - if ( $?LD_LIBRARY_PATH == 0) then - setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:. - else - setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} - endif - breaksw - - case "linux-gnu": - set directoryname=linux - set comid=gcc3 - set pltfrm=gcc - set soext=so - set exampleout=LINUXexample.out - set platform=Linux - - # set LD_LIBRARY_PATH - if ( $?LD_LIBRARY_PATH == 0) then - setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:. - else - setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} - endif - breaksw - - case "darwin*": - set directoryname=macosx - set comid=gcc3 - set pltfrm=gcc - set soext=dylib - set exampleout=MACOSXexample.out - set platform=MacOSX - - # set DYLD_LIBRARY_PATH - if ( $?DYLD_LIBRARY_PATH == 0) then - setenv DYLD_LIBRARY_PATH ${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:. - else - setenv DYLD_LIBRARY_PATH ${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH} - endif - breaksw - - case "freebsd*": - set directoryname=freebsd - set comid=gcc3 - set pltfrm=gcc - set soext=so - set exampleout=FREEBSDexample.out - set platform=FreeBSD - - # set LD_LIBRARY_PATH - if ( $?LD_LIBRARY_PATH == 0) then - setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:. - else - setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} - endif - - if ( -e "/sbin/sysctl" ) then - set OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - set OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - endif - - if ( ${OSVERSION} < 500016 ) then - setenv PTHREAD_CFLAGS -D_THREAD_SAFE - setenv PTHREAD_LIBS -pthread - else if ( ${OSVERSION} < 502102 ) then - setenv PTHREAD_CFLAGS -D_THREAD_SAFE - setenv PTHREAD_LIBS -lc_r - else - setenv PTHREAD_LIBS -pthread - endif - breaksw -endsw - -# set PATH -if ( $?PATH == 0) then - setenv PATH ${OO_SDK_ZIP_HOME}:${OO_SDK_MAKE_HOME}:${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}:${OO_SDK_URE_BIN_DIR}:. -else - setenv PATH ${OO_SDK_ZIP_HOME}:${OO_SDK_MAKE_HOME}:${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}:${OO_SDK_URE_BIN_DIR}:.:${PATH} -endif - -# Set CLASSPATH -if ( ${?OFFICE_PROGRAM_PATH} ) then - if ( ${?CLASSPATH} == 0 ) then - setenv CLASSPATH "${OFFICE_PROGRAM_PATH}/classes/unoil.jar" - else - setenv CLASSPATH "${OFFICE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}" - endif -endif -if ( $?CLASSPATH == 0) then - setenv CLASSPATH "${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar" -else - setenv CLASSPATH "${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${CLASSPATH}" -endif - -if ( $?OO_SDK_CPP_HOME == 0) then - setenv PATH ${OO_SDK_CPP_HOME}:${PATH} -endif - -if ( $?OO_SDK_JAVA_HOME == 0) then - setenv PATH ${OO_SDK_JAVA_HOME}:${PATH} -endif - - -if ( "${platform}" == "MacOSX" ) then -# For URE, prepare symbolic links for libraries: -# Only necessary on MacOSX, on other Unix systems the links are already prepared -# in the SDK installation. - -# cleanup potential old links first - rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.so" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" - - if ( "${OO_SDK_URE_HOME}" != "" ) then - mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" - endif -endif - - -echo -echo " ************************************************************************" -echo " *" -echo " * SDK environment is prepared for ${platform}" -echo " *" -echo " * SDK = ${OO_SDK_HOME}" -echo " * Office = ${OFFICE_HOME}" -echo " * URE = ${OO_SDK_URE_HOME}" -echo " * Make = ${OO_SDK_MAKE_HOME}" -echo " * Zip = ${OO_SDK_ZIP_HOME}" -if ( $?OO_SDK_CPP_HOME == 0) then -echo " * C++ Compiler = " -else -echo " * C++ Compiler = ${OO_SDK_CPP_HOME}" -endif -if ( $?OO_SDK_JAVA_HOME == 0) then -echo " * Java = " -else -echo " * Java = ${OO_SDK_JAVA_HOME}" -endif -if ( $?OO_SDK_OUTPUT_DIR == 0) then -echo " * Special Output directory = " -else -echo " * SDK Output directory = ${OO_SDK_OUT}" -endif -echo " * Auto deployment = ${SDK_AUTO_DEPLOYMENT}" -echo " *" -echo " ************************************************************************" - -unset sdkdir -unset directoryname -unset comid -unset exampleout -unset platform - -echo "]2;Shell prepared with the SDK environment" diff --git a/odk/docs/install.html b/odk/docs/install.html index 3594ac0c56eb..7f44cb183fb7 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -141,10 +141,10 @@ <td colspan="2"> <p>The SDK provides an implicit configuration mechanism, which configures the SDK build environment to your personal needs the first - time you use the SDK environment. This configuration step creates one or - two new setsdkenv_XXX scripts in the user's home directory:</P> + time you use the SDK environment. This configuration step creates one + new setsdkenv_XXX script in the user's home directory:</P> <ul> - <li><b>$HOME/$OO_SDK_NAME/setsdkenv_unix.sh</b> and <b>$HOME/$OO_SDK_NAME/setsdkenv_unix.csh</b> -> for Unix + <li><b>$HOME/$OO_SDK_NAME/setsdkenv_unix.sh</b> -> for Unix <li><b>C:\Documents and Settings\<username>\Application Data\%OO_SDK_NAME%\setsdkenv_windows.bat</b></a> -> for Windows2000/XP or later </ul> <p>The automatically started configure script (Unix and Windows2000/XP) @@ -244,9 +244,8 @@ <p>You must run the <b>setsdkenv_XXX</b> script every time you want to use the configured SDK environment. The settings are local for the current shell on Windows or the new started shell on UNIX. On UNIX you - can now source one of the prepared environment - script files ("setsdkenv_unix.sh" or - "setsdkenv_unix.csh" dependending on the shell you use) to prepare + can now source the prepared environment + script file ("setsdkenv_unix.sh") to prepare your current shell instead of starting a new shell.</p> </td> </tr> diff --git a/odk/util/check.pl b/odk/util/check.pl index e138302c7fc2..5c57cbc98257 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -138,10 +138,6 @@ if (-d "$StartDir") { print "\nERROR: \"$StartDir/setsdkenv_unix.sh.in\" is missing\n"; $return++; } - if (! -e "$StartDir/setsdkenv_unix.csh.in") { - print "\nERROR: \"$StartDir/setsdkenv_unix.csh.in\" is missing\n"; - $return++; - } } print "\n"; |