TDE
/
tdesdk
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesdk
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KDEHOME and KDEDIR

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 07483f1bc9
commit 2ac22d35c3
13 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File

2
doc/kcachegrind/index.docbook
Unescape View File

@ -802,7 +802,7 @@ So, for example, for main(), you will always have a inclusive cost of almost 100
<answer> <answer>
<para> <para>
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 <command>configure --prefix=/opt/trinity; make install</command>. 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 <command>configure --prefix=/opt/trinity; make install</command>.
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.
</para> </para>
</answer> </answer>
</qandaentry> </qandaentry>

34
doc/scripts/tdesvn-build/index.docbook
Unescape View File

@ -254,32 +254,32 @@ Open or create the <filename>.bash_profile</filename> file in the home directory
and add to the end of the file: and add to the end of the file:
<programlisting> <programlisting>
KDEDIR=(path to kdedir) TDEDIR=(path to kdedir)
KDEDIRS=$KDEDIR TDEDIRS=$TDEDIR
PATH=$KDEDIR/bin:$QTDIR/bin:$PATH PATH=$TDEDIR/bin:$QTDIR/bin:$PATH
LD_LIBRARY_PATH=$KDEDIR/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=$TDEDIR/lib:$LD_LIBRARY_PATH
export KDEDIRS PATH LD_LIBRARY_PATH export TDEDIRS PATH LD_LIBRARY_PATH
</programlisting> </programlisting>
If you are building the qt-copy module, add instead: If you are building the qt-copy module, add instead:
<programlisting> <programlisting>
QTDIR=(path to qtdir) QTDIR=(path to qtdir)
KDEDIR=(path to kdedir) TDEDIR=(path to kdedir)
KDEDIRS=$KDEDIR TDEDIRS=$TDEDIR
PATH=$KDEDIR/bin:$QTDIR/bin:$PATH PATH=$TDEDIR/bin:$QTDIR/bin:$PATH
MANPATH=$QTDIR/doc/man:$MANPATH MANPATH=$QTDIR/doc/man:$MANPATH
LD_LIBRARY_PATH=$KDEDIR/lib:$QTDIR/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib:$LD_LIBRARY_PATH
export QTDIR KDEDIRS PATH MANPATH LD_LIBRARY_PATH export QTDIR TDEDIRS PATH MANPATH LD_LIBRARY_PATH
</programlisting> </programlisting>
</para> </para>
<para> <para>
If you are not using a dedicated user, set a different <envar>$KDEHOME</envar> for your If you are not using a dedicated user, set a different <envar>$TDEHOME</envar> for your
new environment in your <filename>.bash_profile</filename>: new environment in your <filename>.bash_profile</filename>:
<programlisting> <programlisting>
export KDEHOME="${HOME}/.kde-svn" export TDEHOME="${HOME}/.kde-svn"
# Create it if needed # Create it if needed
[ ! -e ~/.kde-svn ] &amp;&amp; mkdir ~/.kde-svn [ ! -e ~/.kde-svn ] &amp;&amp; mkdir ~/.kde-svn
@ -293,7 +293,7 @@ you may have to set the xdg environment variables in your <filename>.bash_profil
<programlisting> <programlisting>
XDG_CONFIG_DIRS="/etc/xdg" 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 export XDG_CONFIG_DIRS XDG_DATA_DIRS
</programlisting> </programlisting>
@ -311,7 +311,7 @@ depending on the distribution) from the home directory, or create it if necessar
line: line:
<programlisting> <programlisting>
exec ${KDEDIR}/bin/starttde exec ${TDEDIR}/bin/starttde
</programlisting> </programlisting>
</para> </para>
@ -420,7 +420,7 @@ source tree, you can force a rebuild of a module by creating a file called
<listitem><para> <listitem><para>
You can specify various environment values to be used during the build, You can specify various environment values to be used during the build,
including <envar>KDEDIR</envar>, <envar>QTDIR</envar>, <envar>DO_NOT_COMPILE</envar>, including <envar>TDEDIR</envar>, <envar>QTDIR</envar>, <envar>DO_NOT_COMPILE</envar>,
and <envar>CXXFLAGS</envar>. and <envar>CXXFLAGS</envar>.
</para></listitem> </para></listitem>
@ -623,7 +623,7 @@ do any harm to enable it. The default is to enable the patches.</entry>
You can't override this setting in a module option. The default value is You can't override this setting in a module option. The default value is
<filename class="directory">/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin</filename>. This environment <filename class="directory">/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin</filename>. This environment
variable should include the colon-separated paths of your development variable should include the colon-separated paths of your development
toolchain. The paths <filename class="directory">$KDEDIR/bin</filename> and toolchain. The paths <filename class="directory">$TDEDIR/bin</filename> and
<filename class="directory">$QTDIR/bin</filename> are automatically added. You <filename class="directory">$QTDIR/bin</filename> are automatically added. You
may use the tilde (~) for any paths you add using this option.</para> may use the tilde (~) for any paths you add using this option.</para>
</entry> </entry>
@ -828,7 +828,7 @@ linkend="conf-make-install-prefix">make-install-prefix</link> option as well.</e
<entry>Can't be overridden</entry> <entry>Can't be overridden</entry>
<entry>Set this option to set the environment variable LD_LIBRARY_PATH while <entry>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 building. You can't override this setting in a module option. The default
value is blank, but the paths <filename class="directory">$KDEDIR/lib</filename> and value is blank, but the paths <filename class="directory">$TDEDIR/lib</filename> and
<filename class="directory">$QTDIR/lib</filename> are automatically <filename class="directory">$QTDIR/lib</filename> are automatically
added. You may use the tilde (~) for any paths you add using this option. added. You may use the tilde (~) for any paths you add using this option.
</entry> </entry>

2
kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
Unescape View File

@ -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 old version, the new one will be removed. "
"If you choose the new version, the old database files will be left alone " "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 " "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).</p>"), "again (the old files are at $TDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).</p>"),
i18n ("Old Database Found"), i18n ("Old Database Found"),
i18n ("Use &Old Database"), i18n ("Use &Old Database"),
i18n ("Use &New Database")) == i18n ("Use &New Database")) ==

4
kompare/tests/subversion/contextm.diff
Unescape View File

@ -52,8 +52,8 @@ Index: README
! !
! 1. configure, build. Then go into the Vimpart subdirectory. ! 1. configure, build. Then go into the Vimpart subdirectory.
! !
! 2. Include the current Vimpart directory in your KDEDIRS: ! 2. Include the current Vimpart directory in your TDEDIRS:
! export KDEDIRS=`pwd`:$KDEDIR ! export TDEDIRS=`pwd`:$TDEDIR
! !
! 3. Symlink .libs to lib ! 3. Symlink .libs to lib
! ln -s .libs lib ! ln -s .libs lib

4
kompare/tests/subversion/normalm.diff
Unescape View File

@ -46,8 +46,8 @@ Index: README
< <
< 1. configure, build. Then go into the Vimpart subdirectory. < 1. configure, build. Then go into the Vimpart subdirectory.
< <
< 2. Include the current Vimpart directory in your KDEDIRS: < 2. Include the current Vimpart directory in your TDEDIRS:
< export KDEDIRS=`pwd`:$KDEDIR < export TDEDIRS=`pwd`:$TDEDIR
< <
< 3. Symlink .libs to lib < 3. Symlink .libs to lib
< ln -s .libs lib < ln -s .libs lib

4
kompare/tests/subversion/unifiedm.diff
Unescape View File

@ -49,8 +49,8 @@ Index: README
- -
-1. configure, build. Then go into the Vimpart subdirectory. -1. configure, build. Then go into the Vimpart subdirectory.
- -
-2. Include the current Vimpart directory in your KDEDIRS: -2. Include the current Vimpart directory in your TDEDIRS:
-export KDEDIRS=`pwd`:$KDEDIR -export TDEDIRS=`pwd`:$TDEDIR
- -
-3. Symlink .libs to lib -3. Symlink .libs to lib
-ln -s .libs lib -ln -s .libs lib

24
scripts/kde-build
Unescape View File

@ -43,7 +43,7 @@ err_configure_fail="3"
err_compile_fail="4" err_compile_fail="4"
# The installation of a module failed - this mostly happens if there's not # 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" err_install_fail="5"
@ -255,7 +255,7 @@ install_module() {
[ -n "$cmd_compress" ] && eval "$cmd_compress $logfile" [ -n "$cmd_compress" ] && eval "$cmd_compress $logfile"
fi fi
echo "$str_okay" echo "$str_okay"
echo "Module $module successfully installed in $KDEDIRS!" echo "Module $module successfully installed in $TDEDIRS!"
move_logfile "finished" move_logfile "finished"
else else
echo "$str_error" echo "$str_error"
@ -373,14 +373,14 @@ fi
QTDIR=`echo "$QTDIR" | sed -e "s,^\~/,$HOME/,"` QTDIR=`echo "$QTDIR" | sed -e "s,^\~/,$HOME/,"`
KDESRCDIR=`echo "$KDESRCDIR" | sed -e "s,^\~/,$HOME/,"` KDESRCDIR=`echo "$KDESRCDIR" | sed -e "s,^\~/,$HOME/,"`
KDEBUILDDIR=`echo "$KDEBUILDDIR" |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/,"` KDELOGDIR=`echo "$KDELOGDIR" |sed -e "s,^\~/,$HOME/,"`
# Make sure some paths are according to the rc file. Note that there are AFAIK # Make sure some paths are according to the rc file. Note that there are AFAIK
# UNIX flavors which don't support LD_LIBRARY_PATH # 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 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 "$USE_UNSERMAKE" ]; then
if [ -n "$MAKE" ]; then if [ -n "$MAKE" ]; then
@ -471,14 +471,14 @@ fi
# Clean the installation directory if selected. # Clean the installation directory if selected.
# #
if test "$INSTALLFROMSCRATCH" = yes && test -z "$specifiedModules" ; then if test "$INSTALLFROMSCRATCH" = yes && test -z "$specifiedModules" ; then
mkdir -p $KDEDIRS 2> /dev/null mkdir -p $TDEDIRS 2> /dev/null
if [ ! -w $KDEDIRS ]; then if [ ! -w $TDEDIRS ]; then
echo "Enter the root password to clean the installation directory." 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 " echo -n "Please enter root "
eval "$cmd_sudo rm -rf $KDEDIRS/*" eval "$cmd_sudo rm -rf $TDEDIRS/*"
else else
rm -rf $KDEDIRS/* rm -rf $TDEDIRS/*
fi fi
fi fi
@ -683,7 +683,7 @@ for module in $modules; do
cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR" cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR"
fi fi
if echo $CONFIGUREFLAGS | grep -v -- "--prefix=" 2>/dev/null >/dev/null; then 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 fi
[ "$NICECOMPILE" = yes ] && cmd_configure="nice $cmd_configure" [ "$NICECOMPILE" = yes ] && cmd_configure="nice $cmd_configure"
configure_skipped=0 configure_skipped=0
@ -802,7 +802,7 @@ for module in $modules; do
[ $critical -eq 0 ] && cmd_make_install="$cmd_make_install -k" [ $critical -eq 0 ] && cmd_make_install="$cmd_make_install -k"
[ "$NICECOMPILE" = yes ] && cmd_make_install="nice $cmd_make_install" [ "$NICECOMPILE" = yes ] && cmd_make_install="nice $cmd_make_install"
cmd_make_install="$cmd_make_install install" cmd_make_install="$cmd_make_install install"
if [ ! -w $KDEDIRS ]; then if [ ! -w $TDEDIRS ]; then
eval "$cmd_sudo \"$cmd_make_install\"" eval "$cmd_sudo \"$cmd_make_install\""
else else
install_module install_module

2
scripts/kde-buildrc
Unescape View File

@ -14,7 +14,7 @@ KDEBUILDDIR=""
# Where shall I put the binaries? # Where shall I put the binaries?
# #
KDEDIRS="/opt/kde" TDEDIRS="/opt/kde"
# Where is your Qt 3.3.x? # Where is your Qt 3.3.x?
# #

12
scripts/kde-devel-vim.vim
Unescape View File

@ -16,13 +16,13 @@ set path=.,/usr/include,/usr/local/include,
if $QTDIR != '' if $QTDIR != ''
let &path = &path . $QTDIR . '/include/,' let &path = &path . $QTDIR . '/include/,'
endif endif
if $KDEDIR != '' if $TDEDIR != ''
let &path = &path . $KDEDIR . '/include/,' let &path = &path . $TDEDIR . '/include/,'
let &path = &path . $KDEDIR . '/include/arts/,' let &path = &path . $TDEDIR . '/include/arts/,'
endif endif
if $KDEDIRS != '' if $TDEDIRS != ''
let &path = &path . substitute( $KDEDIRS, '\(:\|$\)', '/include,', 'g' ) let &path = &path . substitute( $TDEDIRS, '\(:\|$\)', '/include,', 'g' )
let &path = &path . substitute( $KDEDIRS, '\(:\|$\)', '/include/arts,', 'g' ) let &path = &path . substitute( $TDEDIRS, '\(:\|$\)', '/include/arts,', 'g' )
endif endif
set path+=, set path+=,

2
scripts/kdedoc
Unescape View File

@ -6,7 +6,7 @@
# You can edit this line to set the directory holding your KDE docs, or you # 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 # can use the environment variable KDEDOCS to avoid future conflicts with this
# file if the default changes. # 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 [ $# = 1 ]; then
if [ -e "$KDEDOCS/doxygen.css" ]; then if [ -e "$KDEDOCS/doxygen.css" ]; then

2
scripts/tdesvn-build
Unescape View File

@ -3461,7 +3461,7 @@ sub update_module_environment
setenv ('LD_LIBRARY_PATH', $libdir); setenv ('LD_LIBRARY_PATH', $libdir);
setenv ('PATH', $path); setenv ('PATH', $path);
setenv ('KDEDIR', $kdedir); setenv ('TDEDIR', $kdedir);
setenv ('QTDIR', $qtdir); setenv ('QTDIR', $qtdir);
# Qt has several defines of its own. Special case qt-copy for this # Qt has several defines of its own. Special case qt-copy for this

4
scripts/tdesvn-buildrc-sample
Unescape View File

@ -69,8 +69,8 @@ global
# #
# You can overwrite the installation directory for a given module using # You can overwrite the installation directory for a given module using
# the per-module "prefix" option. Note that when doing this you need to # 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, # set TDEDIRS, PATH and LD_LIBRARY_PATH to point to both directories,
# and that you should use separate test users or KDEHOME values to separate # 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. # 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 # If you would like install KDE to the system (DO NOT INSTALL *over* a prior

4
scripts/tdesvn-buildrc.xml
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd"> <!DOCTYPE language SYSTEM "language.dtd">
<!-- This goes into $KDEDIR/share/apps/katepart/syntax, or <!-- This goes into $TDEDIR/share/apps/katepart/syntax, or
it can go to $KDEHOME/share/apps/katepart/syntax it can go to $TDEHOME/share/apps/katepart/syntax
--> -->
<language name="tdesvn-buildrc" version="0.2" kateversion="2.4" section="Configuration" extensions=".tdesvn-buildrc;tdesvn-buildrc" author="Michael Pyne &lt;michael.pyne@kdemail.net&gt;" license="LGPL"> <language name="tdesvn-buildrc" version="0.2" kateversion="2.4" section="Configuration" extensions=".tdesvn-buildrc;tdesvn-buildrc" author="Michael Pyne &lt;michael.pyne@kdemail.net&gt;" license="LGPL">

Write Preview
Loading…
Cancel
Save