From 2ac22d35c349fada5aaad41fcb0dec15203834bb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Dec 2011 19:12:49 -0600 Subject: Rename KDEHOME and KDEDIR --- doc/kcachegrind/index.docbook | 2 +- doc/scripts/tdesvn-build/index.docbook | 34 +++++++++++----------- .../modules/dbsearchengine/KDBSearchEngine.cpp | 2 +- kompare/tests/subversion/contextm.diff | 4 +-- kompare/tests/subversion/normalm.diff | 4 +-- kompare/tests/subversion/unifiedm.diff | 4 +-- scripts/kde-build | 24 +++++++-------- scripts/kde-buildrc | 2 +- scripts/kde-devel-vim.vim | 12 ++++---- scripts/kdedoc | 2 +- scripts/tdesvn-build | 2 +- scripts/tdesvn-buildrc-sample | 4 +-- scripts/tdesvn-buildrc.xml | 4 +-- 13 files changed, 50 insertions(+), 50 deletions(-) diff --git a/doc/kcachegrind/index.docbook b/doc/kcachegrind/index.docbook index 434c89d7..85a19160 100644 --- a/doc/kcachegrind/index.docbook +++ b/doc/kcachegrind/index.docbook @@ -802,7 +802,7 @@ So, for example, for main(), you will always have a inclusive cost of almost 100 Obviously KCachegrind is wrongly installed on your system. It is recommended to compile it with the installation prefix to be your system wide KDE base directory like configure --prefix=/opt/trinity; make install. -If you choose another directory like $HOME/kde, you should set the environment variable KDEDIR to this directory before running KCachegrind. +If you choose another directory like $HOME/kde, you should set the environment variable TDEDIR to this directory before running KCachegrind. diff --git a/doc/scripts/tdesvn-build/index.docbook b/doc/scripts/tdesvn-build/index.docbook index da208d6f..e3026fcc 100644 --- a/doc/scripts/tdesvn-build/index.docbook +++ b/doc/scripts/tdesvn-build/index.docbook @@ -254,32 +254,32 @@ Open or create the .bash_profile file in the home directory and add to the end of the file: -KDEDIR=(path to kdedir) -KDEDIRS=$KDEDIR -PATH=$KDEDIR/bin:$QTDIR/bin:$PATH -LD_LIBRARY_PATH=$KDEDIR/lib:$LD_LIBRARY_PATH -export KDEDIRS PATH LD_LIBRARY_PATH +TDEDIR=(path to kdedir) +TDEDIRS=$TDEDIR +PATH=$TDEDIR/bin:$QTDIR/bin:$PATH +LD_LIBRARY_PATH=$TDEDIR/lib:$LD_LIBRARY_PATH +export TDEDIRS PATH LD_LIBRARY_PATH If you are building the qt-copy module, add instead: QTDIR=(path to qtdir) -KDEDIR=(path to kdedir) -KDEDIRS=$KDEDIR -PATH=$KDEDIR/bin:$QTDIR/bin:$PATH +TDEDIR=(path to kdedir) +TDEDIRS=$TDEDIR +PATH=$TDEDIR/bin:$QTDIR/bin:$PATH MANPATH=$QTDIR/doc/man:$MANPATH -LD_LIBRARY_PATH=$KDEDIR/lib:$QTDIR/lib:$LD_LIBRARY_PATH -export QTDIR KDEDIRS PATH MANPATH LD_LIBRARY_PATH +LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib:$LD_LIBRARY_PATH +export QTDIR TDEDIRS PATH MANPATH LD_LIBRARY_PATH -If you are not using a dedicated user, set a different $KDEHOME for your +If you are not using a dedicated user, set a different $TDEHOME for your new environment in your .bash_profile: -export KDEHOME="${HOME}/.kde-svn" +export TDEHOME="${HOME}/.kde-svn" # Create it if needed [ ! -e ~/.kde-svn ] && mkdir ~/.kde-svn @@ -293,7 +293,7 @@ you may have to set the xdg environment variables in your .bash_profil XDG_CONFIG_DIRS="/etc/xdg" -XDG_DATA_DIRS="${KDEDIR}/share:/usr/share" +XDG_DATA_DIRS="${TDEDIR}/share:/usr/share" export XDG_CONFIG_DIRS XDG_DATA_DIRS @@ -311,7 +311,7 @@ depending on the distribution) from the home directory, or create it if necessar line: -exec ${KDEDIR}/bin/starttde +exec ${TDEDIR}/bin/starttde @@ -420,7 +420,7 @@ source tree, you can force a rebuild of a module by creating a file called You can specify various environment values to be used during the build, -including KDEDIR, QTDIR, DO_NOT_COMPILE, +including TDEDIR, QTDIR, DO_NOT_COMPILE, and CXXFLAGS. @@ -623,7 +623,7 @@ do any harm to enable it. The default is to enable the patches. You can't override this setting in a module option. The default value is /bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin. This environment variable should include the colon-separated paths of your development -toolchain. The paths $KDEDIR/bin and +toolchain. The paths $TDEDIR/bin and $QTDIR/bin are automatically added. You may use the tilde (~) for any paths you add using this option. @@ -828,7 +828,7 @@ linkend="conf-make-install-prefix">make-install-prefix option as well.Can't be overridden Set this option to set the environment variable LD_LIBRARY_PATH while building. You can't override this setting in a module option. The default -value is blank, but the paths $KDEDIR/lib and +value is blank, but the paths $TDEDIR/lib and $QTDIR/lib are automatically added. You may use the tilde (~) for any paths you add using this option. diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 69d1acce..4c79bacd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -181,7 +181,7 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false) "If you choose the old version, the new one will be removed. " "If you choose the new version, the old database files will be left alone " "and you need to remove them manually. Otherwise this message will be displayed " - "again (the old files are at $KDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).

"), + "again (the old files are at $TDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).

"), i18n ("Old Database Found"), i18n ("Use &Old Database"), i18n ("Use &New Database")) == diff --git a/kompare/tests/subversion/contextm.diff b/kompare/tests/subversion/contextm.diff index fbb61263..507ed189 100644 --- a/kompare/tests/subversion/contextm.diff +++ b/kompare/tests/subversion/contextm.diff @@ -52,8 +52,8 @@ Index: README ! ! 1. configure, build. Then go into the Vimpart subdirectory. ! -! 2. Include the current Vimpart directory in your KDEDIRS: -! export KDEDIRS=`pwd`:$KDEDIR +! 2. Include the current Vimpart directory in your TDEDIRS: +! export TDEDIRS=`pwd`:$TDEDIR ! ! 3. Symlink .libs to lib ! ln -s .libs lib diff --git a/kompare/tests/subversion/normalm.diff b/kompare/tests/subversion/normalm.diff index f526a3b0..47404ae8 100644 --- a/kompare/tests/subversion/normalm.diff +++ b/kompare/tests/subversion/normalm.diff @@ -46,8 +46,8 @@ Index: README < < 1. configure, build. Then go into the Vimpart subdirectory. < -< 2. Include the current Vimpart directory in your KDEDIRS: -< export KDEDIRS=`pwd`:$KDEDIR +< 2. Include the current Vimpart directory in your TDEDIRS: +< export TDEDIRS=`pwd`:$TDEDIR < < 3. Symlink .libs to lib < ln -s .libs lib diff --git a/kompare/tests/subversion/unifiedm.diff b/kompare/tests/subversion/unifiedm.diff index 29a07705..267b1cb4 100644 --- a/kompare/tests/subversion/unifiedm.diff +++ b/kompare/tests/subversion/unifiedm.diff @@ -49,8 +49,8 @@ Index: README - -1. configure, build. Then go into the Vimpart subdirectory. - --2. Include the current Vimpart directory in your KDEDIRS: --export KDEDIRS=`pwd`:$KDEDIR +-2. Include the current Vimpart directory in your TDEDIRS: +-export TDEDIRS=`pwd`:$TDEDIR - -3. Symlink .libs to lib -ln -s .libs lib diff --git a/scripts/kde-build b/scripts/kde-build index 55cae0e5..de6f6c3b 100755 --- a/scripts/kde-build +++ b/scripts/kde-build @@ -43,7 +43,7 @@ err_configure_fail="3" err_compile_fail="4" # The installation of a module failed - this mostly happens if there's not -# enough free disk space on the partition which $KDEDIRS is mounted to. +# enough free disk space on the partition which $TDEDIRS is mounted to. # err_install_fail="5" @@ -255,7 +255,7 @@ install_module() { [ -n "$cmd_compress" ] && eval "$cmd_compress $logfile" fi echo "$str_okay" - echo "Module $module successfully installed in $KDEDIRS!" + echo "Module $module successfully installed in $TDEDIRS!" move_logfile "finished" else echo "$str_error" @@ -373,14 +373,14 @@ fi QTDIR=`echo "$QTDIR" | sed -e "s,^\~/,$HOME/,"` KDESRCDIR=`echo "$KDESRCDIR" | sed -e "s,^\~/,$HOME/,"` KDEBUILDDIR=`echo "$KDEBUILDDIR" |sed -e "s,^\~/,$HOME/,"` -KDEDIRS=`echo "$KDEDIRS" |sed -e "s,^\~/,$HOME/,"` +TDEDIRS=`echo "$TDEDIRS" |sed -e "s,^\~/,$HOME/,"` KDELOGDIR=`echo "$KDELOGDIR" |sed -e "s,^\~/,$HOME/,"` # Make sure some paths are according to the rc file. Note that there are AFAIK # UNIX flavors which don't support LD_LIBRARY_PATH -PATH=$QTDIR/bin:$KDEDIRS/bin:$PATH +PATH=$QTDIR/bin:$TDEDIRS/bin:$PATH MANPATH=$QTDIR/doc/man:$MANPATH -LD_LIBRARY_PATH=$KDEDIRS/lib:$QTDIR/lib:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=$TDEDIRS/lib:$QTDIR/lib:$LD_LIBRARY_PATH if [ -n "$USE_UNSERMAKE" ]; then if [ -n "$MAKE" ]; then @@ -471,14 +471,14 @@ fi # Clean the installation directory if selected. # if test "$INSTALLFROMSCRATCH" = yes && test -z "$specifiedModules" ; then - mkdir -p $KDEDIRS 2> /dev/null - if [ ! -w $KDEDIRS ]; then + mkdir -p $TDEDIRS 2> /dev/null + if [ ! -w $TDEDIRS ]; then echo "Enter the root password to clean the installation directory." - echo "WARNING: All files and directories in $KDEDIRS will be deleted!" + echo "WARNING: All files and directories in $TDEDIRS will be deleted!" echo -n "Please enter root " - eval "$cmd_sudo rm -rf $KDEDIRS/*" + eval "$cmd_sudo rm -rf $TDEDIRS/*" else - rm -rf $KDEDIRS/* + rm -rf $TDEDIRS/* fi fi @@ -683,7 +683,7 @@ for module in $modules; do cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR" fi if echo $CONFIGUREFLAGS | grep -v -- "--prefix=" 2>/dev/null >/dev/null; then - cmd_configure="$cmd_configure --prefix=$KDEDIRS" + cmd_configure="$cmd_configure --prefix=$TDEDIRS" fi [ "$NICECOMPILE" = yes ] && cmd_configure="nice $cmd_configure" configure_skipped=0 @@ -802,7 +802,7 @@ for module in $modules; do [ $critical -eq 0 ] && cmd_make_install="$cmd_make_install -k" [ "$NICECOMPILE" = yes ] && cmd_make_install="nice $cmd_make_install" cmd_make_install="$cmd_make_install install" - if [ ! -w $KDEDIRS ]; then + if [ ! -w $TDEDIRS ]; then eval "$cmd_sudo \"$cmd_make_install\"" else install_module diff --git a/scripts/kde-buildrc b/scripts/kde-buildrc index c6f13d44..24553e01 100644 --- a/scripts/kde-buildrc +++ b/scripts/kde-buildrc @@ -14,7 +14,7 @@ KDEBUILDDIR="" # Where shall I put the binaries? # -KDEDIRS="/opt/kde" +TDEDIRS="/opt/kde" # Where is your Qt 3.3.x? # diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 563ee41c..7b8961fe 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -16,13 +16,13 @@ set path=.,/usr/include,/usr/local/include, if $QTDIR != '' let &path = &path . $QTDIR . '/include/,' endif -if $KDEDIR != '' - let &path = &path . $KDEDIR . '/include/,' - let &path = &path . $KDEDIR . '/include/arts/,' +if $TDEDIR != '' + let &path = &path . $TDEDIR . '/include/,' + let &path = &path . $TDEDIR . '/include/arts/,' endif -if $KDEDIRS != '' - let &path = &path . substitute( $KDEDIRS, '\(:\|$\)', '/include,', 'g' ) - let &path = &path . substitute( $KDEDIRS, '\(:\|$\)', '/include/arts,', 'g' ) +if $TDEDIRS != '' + let &path = &path . substitute( $TDEDIRS, '\(:\|$\)', '/include,', 'g' ) + let &path = &path . substitute( $TDEDIRS, '\(:\|$\)', '/include/arts,', 'g' ) endif set path+=, diff --git a/scripts/kdedoc b/scripts/kdedoc index 0a8191d2..f61a8452 100755 --- a/scripts/kdedoc +++ b/scripts/kdedoc @@ -6,7 +6,7 @@ # You can edit this line to set the directory holding your KDE docs, or you # can use the environment variable KDEDOCS to avoid future conflicts with this # file if the default changes. -KDEDOCS=${KDEDOCS:-"$KDEDIR/share/doc/HTML/en/tdelibs-apidocs"} +KDEDOCS=${KDEDOCS:-"$TDEDIR/share/doc/HTML/en/tdelibs-apidocs"} if [ $# = 1 ]; then if [ -e "$KDEDOCS/doxygen.css" ]; then diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build index fb81ac67..99911ece 100755 --- a/scripts/tdesvn-build +++ b/scripts/tdesvn-build @@ -3461,7 +3461,7 @@ sub update_module_environment setenv ('LD_LIBRARY_PATH', $libdir); setenv ('PATH', $path); - setenv ('KDEDIR', $kdedir); + setenv ('TDEDIR', $kdedir); setenv ('QTDIR', $qtdir); # Qt has several defines of its own. Special case qt-copy for this diff --git a/scripts/tdesvn-buildrc-sample b/scripts/tdesvn-buildrc-sample index 2d8b9bac..f39ae662 100644 --- a/scripts/tdesvn-buildrc-sample +++ b/scripts/tdesvn-buildrc-sample @@ -69,8 +69,8 @@ global # # You can overwrite the installation directory for a given module using # the per-module "prefix" option. Note that when doing this you need to -# set KDEDIRS, PATH and LD_LIBRARY_PATH to point to both directories, -# and that you should use separate test users or KDEHOME values to separate +# set TDEDIRS, PATH and LD_LIBRARY_PATH to point to both directories, +# and that you should use separate test users or TDEHOME values to separate # the ksycoca databases. Only set prefix if you know what you're doing. # If you would like install KDE to the system (DO NOT INSTALL *over* a prior diff --git a/scripts/tdesvn-buildrc.xml b/scripts/tdesvn-buildrc.xml index d6b915b1..547950d3 100644 --- a/scripts/tdesvn-buildrc.xml +++ b/scripts/tdesvn-buildrc.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.1