Attachment #423 for bug #860

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 860
Collapse All | Expand All

Lines 1-6 Link Here

(-)tdesdk/scheck/README (-1 / +1 lines)
1	Scheck - An interface style to highlight accel and style guide conflicts	1	Scheck - An interface style to highlight accel and style guide conflicts
2	When starting an application with "KDE_LANG=xx application --style check"	2	When starting an application with "TDE_LANG=xx application --style check"
3	scheck will, for text parts it checks, strip the "xx"s and display the ones	3	scheck will, for text parts it checks, strip the "xx"s and display the ones
4	missing them (missing i18n() calls/.desktop entries) with violet background.	4	missing them (missing i18n() calls/.desktop entries) with violet background.

Lines 882-888 Link Here

(-)tdesdk/scheck/scheck.cpp (-1 / +1 lines)
882	topLevelAccelManageTimer = new TQTimer(this);	882	topLevelAccelManageTimer = new TQTimer(this);
883	connect(topLevelAccelManageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAccelManage()));	883	connect(topLevelAccelManageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAccelManage()));
884	watcher = new StyleCheckTitleWatcher;	884	watcher = new StyleCheckTitleWatcher;
885	xxMode = (TQString(getenv("KDE_LANG"))=="xx");	885	xxMode = (TQString(getenv("TDE_LANG"))=="xx");
886	}	886	}

Lines 13-19 Link Here

(-)tdesdk/scripts/build-progress.sh (-1 / +1 lines)
13		13
14	cd $KDELOGDIR	14	cd $KDELOGDIR
15	while true; do	15	while true; do
16	dir=`ls -t \| head -n 1 \| xargs grep "Entering directory" \| tail -n 1 \| awk "{print \\$4}" \| sed "s'$KDESRCDIR/''g"`	16	dir=`ls -t \| head -n 1 \| xargs grep "Entering directory" \| tail -n 1 \| awk "{print \\$4}" \| sed "s'$TDESRCDIR/''g"`
17	set_title "Building $dir"	17	set_title "Building $dir"
18	clear	18	clear
19	grep --no-filename -i "time needed" build \| \	19	grep --no-filename -i "time needed" build \| \




#
err_install_fail="5"

# The $TDESRCDIR variable wasn't set or contains a non-existant directory.
#
err_inv_kdesrcdir="6"


  # command line.
  #
  cmd_update="svn"
  if test -d $TDESRCDIR/$module; then
    test -z "$SUBDIR" && { cmd_update="$cmd_update update" ; return; }
    cmd_update="$cmd_update switch -r HEAD"
  else

  if [ -n "$CHECKOUT_PARTIAL" -a "$1" = "toponly" ]; then # TODO
    cmd_update="$cmd_update -N"
  fi
  if test ! -d $TDESRCDIR/$module; then
    cmd_update="$cmd_update $module"
  fi
}


# Expand ~
QTDIR=`echo "$QTDIR" | sed -e "s,^\~/,$HOME/,"`
TDESRCDIR=`echo "$TDESRCDIR" | sed -e "s,^\~/,$HOME/,"`
KDEBUILDDIR=`echo "$KDEBUILDDIR" |sed -e "s,^\~/,$HOME/,"`
TDEDIRS=`echo "$TDEDIRS" |sed -e "s,^\~/,$HOME/,"`
KDELOGDIR=`echo "$KDELOGDIR" |sed -e "s,^\~/,$HOME/,"`

    modules="$critical_modules"
    # This generates in 'modules' a list of the modules which shall be updated.
    #
    potential_modules=`find $TDESRCDIR -type d -mindepth 1 \
        -maxdepth 1 -follow | sed -e "s@.*/?*@@"`
    for module in $potential_modules; do
      if [ -d $TDESRCDIR/$module/CVS -a -w $TDESRCDIR/$module ] \
          && !(echo $EXCLUDE | grep -q $module) \
          && !(echo $modules | grep -q $module) ; then
         modules="$modules $module"

  str_error="$str_error Check the logfile in $KDELOGDIR for further information."
fi

if [ ! -d "$TDESRCDIR" ]; then
  echo "ERROR: Invalid source directory specified!"; exit $err_inv_kdesrcdir
fi
if [ ! -d "$QTDIR" -o ! -d "$QTDIR/lib" -o ! -d "$QTDIR/bin" -o ! -d "$QTDIR/include" ]; then

    cmd_update_raw="$cmd_update -l $module"
  fi

  if test -d $TDESRCDIR/$module; then
    cd $TDESRCDIR/$module
  else 
    cd $TDESRCDIR 
  fi

  if ! log_cmd "$cmd_update_raw"; then

  critical=0
  for m in $critical_modules; do if [ $m = $module ]; then critical=1; fi; done

  if ! cd $TDESRCDIR/$module; then
    if [ $critical -eq 1 ]; then
      echo "ERROR: Could not change into directory $TDESRCDIR/$module!"
      exit $err_change_into_mod_dir
    else
      echo "WARNING: Could not change into directory $TDESRCDIR/$module."
      echo "WARNING: Skipping module $module."
      continue
    fi

  echo -n "  Configuring..."
  set_title "Configuring module $module..."
  if [ -n "$KDEBUILDDIR" ]; then
    cmd_configure="$TDESRCDIR/$module/configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR"
  else
    cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR"
  fi

      worked=0

      if [ -n "$KDEBUILDDIR" ]; then
        cd $TDESRCDIR/$module # get back to the supermarket
      fi
      rm Makefile.in
      make_makefile_cvs

  echo -n "  Compiling..."
  set_title "Compiling module $module..."
  use_compile_target=no
  [ -f $TDESRCDIR/$module/Makefile.am.in ] && [ -n "$MAKE_OPTS_COMPILE" ] && [ -n "$USE_UNSERMAKE" ] \
       && ! (echo $NO_UNSERMAKE_MODULES | grep $module > /dev/null 2>&1) \
       && use_compile_target=yes
  if [ "$use_compile_target" = yes ]; then





# Where are your KDE sources?
#
TDESRCDIR="$PWD"

# Where your KDE should be build, leave empty if built in TDESRCDIR
#
KDEBUILDDIR=""


# here in which the logfiles will be saved. If you want to disable logfile
# generation, leave this blank.
#
KDELOGDIR="$TDESRCDIR/log"

# Do you want the logfiles to be compressed? Set this variable to "yes" to
# make the script compress the logfiles using bzip2 (using gzip as a

#CHECKOUT_PARTIAL_KDEMULTIMEDIA=juk
#CHECKOUT_PARTIAL_KDEEXTRAGEAR_2="kile konversation"

# If there are any modules in $TDESRCDIR which you don't want to be updated,
# you can specify them in this space-seperated list, e.g. "qt-copy kde-common".
#
EXCLUDE=""


# Set it to the path for unsermake if you want to test it instead of
# automake.
# USE_UNSERMAKE="$TDESRCDIR/kdenonbeta/unsermake/unsermake"

# List modules here for which unsermake should not be used.
#

Return to bug 860

Lines 47-53 Link Here

(-)tdesdk/scripts/kde-build (-16 / +16 lines)
47	#	47	#
48	err_install_fail="5"	48	err_install_fail="5"
49		49
50	# The $KDESRCDIR variable wasn't set or contains a non-existant directory.	50	# The $TDESRCDIR variable wasn't set or contains a non-existant directory.
51	#	51	#
52	err_inv_kdesrcdir="6"	52	err_inv_kdesrcdir="6"
53		53
Lines 217-223 Link Here
217	# command line.	217	# command line.
218	#	218	#
219	cmd_update="svn"	219	cmd_update="svn"
220	if test -d $KDESRCDIR/$module; then	220	if test -d $TDESRCDIR/$module; then
221	test -z "$SUBDIR" && { cmd_update="$cmd_update update" ; return; }	221	test -z "$SUBDIR" && { cmd_update="$cmd_update update" ; return; }
222	cmd_update="$cmd_update switch -r HEAD"	222	cmd_update="$cmd_update switch -r HEAD"
223	else	223	else
Lines 236-242 Link Here
236	if [ -n "$CHECKOUT_PARTIAL" -a "$1" = "toponly" ]; then # TODO	236	if [ -n "$CHECKOUT_PARTIAL" -a "$1" = "toponly" ]; then # TODO
237	cmd_update="$cmd_update -N"	237	cmd_update="$cmd_update -N"
238	fi	238	fi
239	if test ! -d $KDESRCDIR/$module; then	239	if test ! -d $TDESRCDIR/$module; then
240	cmd_update="$cmd_update $module"	240	cmd_update="$cmd_update $module"
241	fi	241	fi
242	}	242	}
Lines 371-377 Link Here
371		371
372	# Expand ~	372	# Expand ~
373	QTDIR=`echo "$QTDIR" \| sed -e "s,^\~/,$HOME/,"`	373	QTDIR=`echo "$QTDIR" \| sed -e "s,^\~/,$HOME/,"`
374	KDESRCDIR=`echo "$KDESRCDIR" \| sed -e "s,^\~/,$HOME/,"`	374	TDESRCDIR=`echo "$TDESRCDIR" \| sed -e "s,^\~/,$HOME/,"`
375	KDEBUILDDIR=`echo "$KDEBUILDDIR" \|sed -e "s,^\~/,$HOME/,"`	375	KDEBUILDDIR=`echo "$KDEBUILDDIR" \|sed -e "s,^\~/,$HOME/,"`
376	TDEDIRS=`echo "$TDEDIRS" \|sed -e "s,^\~/,$HOME/,"`	376	TDEDIRS=`echo "$TDEDIRS" \|sed -e "s,^\~/,$HOME/,"`
377	KDELOGDIR=`echo "$KDELOGDIR" \|sed -e "s,^\~/,$HOME/,"`	377	KDELOGDIR=`echo "$KDELOGDIR" \|sed -e "s,^\~/,$HOME/,"`
Lines 409-418 Link Here
409	modules="$critical_modules"	409	modules="$critical_modules"
410	# This generates in 'modules' a list of the modules which shall be updated.	410	# This generates in 'modules' a list of the modules which shall be updated.
411	#	411	#
412	potential_modules=`find $KDESRCDIR -type d -mindepth 1 \	412	potential_modules=`find $TDESRCDIR -type d -mindepth 1 \
413	-maxdepth 1 -follow \| sed -e "s@./?@@"`	413	-maxdepth 1 -follow \| sed -e "s@./?@@"`
414	for module in $potential_modules; do	414	for module in $potential_modules; do
415	if [ -d $KDESRCDIR/$module/CVS -a -w $KDESRCDIR/$module ] \	415	if [ -d $TDESRCDIR/$module/CVS -a -w $TDESRCDIR/$module ] \
416	&& !(echo $EXCLUDE \| grep -q $module) \	416	&& !(echo $EXCLUDE \| grep -q $module) \
417	&& !(echo $modules \| grep -q $module) ; then	417	&& !(echo $modules \| grep -q $module) ; then
418	modules="$modules $module"	418	modules="$modules $module"
Lines 442-448 Link Here
442	str_error="$str_error Check the logfile in $KDELOGDIR for further information."	442	str_error="$str_error Check the logfile in $KDELOGDIR for further information."
443	fi	443	fi
444		444
445	if [ ! -d "$KDESRCDIR" ]; then	445	if [ ! -d "$TDESRCDIR" ]; then
446	echo "ERROR: Invalid source directory specified!"; exit $err_inv_kdesrcdir	446	echo "ERROR: Invalid source directory specified!"; exit $err_inv_kdesrcdir
447	fi	447	fi
448	if [ ! -d "$QTDIR" -o ! -d "$QTDIR/lib" -o ! -d "$QTDIR/bin" -o ! -d "$QTDIR/include" ]; then	448	if [ ! -d "$QTDIR" -o ! -d "$QTDIR/lib" -o ! -d "$QTDIR/bin" -o ! -d "$QTDIR/include" ]; then
Lines 573-582 Link Here
573	cmd_update_raw="$cmd_update -l $module"	573	cmd_update_raw="$cmd_update -l $module"
574	fi	574	fi
575		575
576	if test -d $KDESRCDIR/$module; then	576	if test -d $TDESRCDIR/$module; then
577	cd $KDESRCDIR/$module	577	cd $TDESRCDIR/$module
578	else	578	else
579	cd $KDESRCDIR	579	cd $TDESRCDIR
580	fi	580	fi
581		581
582	if ! log_cmd "$cmd_update_raw"; then	582	if ! log_cmd "$cmd_update_raw"; then
Lines 633-644 Link Here
633	critical=0	633	critical=0
634	for m in $critical_modules; do if [ $m = $module ]; then critical=1; fi; done	634	for m in $critical_modules; do if [ $m = $module ]; then critical=1; fi; done
635		635
636	if ! cd $KDESRCDIR/$module; then	636	if ! cd $TDESRCDIR/$module; then
637	if [ $critical -eq 1 ]; then	637	if [ $critical -eq 1 ]; then
638	echo "ERROR: Could not change into directory $KDESRCDIR/$module!"	638	echo "ERROR: Could not change into directory $TDESRCDIR/$module!"
639	exit $err_change_into_mod_dir	639	exit $err_change_into_mod_dir
640	else	640	else
641	echo "WARNING: Could not change into directory $KDESRCDIR/$module."	641	echo "WARNING: Could not change into directory $TDESRCDIR/$module."
642	echo "WARNING: Skipping module $module."	642	echo "WARNING: Skipping module $module."
643	continue	643	continue
644	fi	644	fi
Lines 678-684 Link Here
678	echo -n " Configuring..."	678	echo -n " Configuring..."
679	set_title "Configuring module $module..."	679	set_title "Configuring module $module..."
680	if [ -n "$KDEBUILDDIR" ]; then	680	if [ -n "$KDEBUILDDIR" ]; then
681	cmd_configure="$KDESRCDIR/$module/configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR"	681	cmd_configure="$TDESRCDIR/$module/configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR"
682	else	682	else
683	cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR"	683	cmd_configure="./configure $CONFIGUREFLAGS --with-qt-dir=$QTDIR"
684	fi	684	fi
Lines 725-731 Link Here
725	worked=0	725	worked=0
726		726
727	if [ -n "$KDEBUILDDIR" ]; then	727	if [ -n "$KDEBUILDDIR" ]; then
728	cd $KDESRCDIR/$module # get back to the supermarket	728	cd $TDESRCDIR/$module # get back to the supermarket
729	fi	729	fi
730	rm Makefile.in	730	rm Makefile.in
731	make_makefile_cvs	731	make_makefile_cvs
Lines 756-762 Link Here
756	echo -n " Compiling..."	756	echo -n " Compiling..."
757	set_title "Compiling module $module..."	757	set_title "Compiling module $module..."
758	use_compile_target=no	758	use_compile_target=no
759	[ -f $KDESRCDIR/$module/Makefile.am.in ] && [ -n "$MAKE_OPTS_COMPILE" ] && [ -n "$USE_UNSERMAKE" ] \	759	[ -f $TDESRCDIR/$module/Makefile.am.in ] && [ -n "$MAKE_OPTS_COMPILE" ] && [ -n "$USE_UNSERMAKE" ] \
760	&& ! (echo $NO_UNSERMAKE_MODULES \| grep $module > /dev/null 2>&1) \	760	&& ! (echo $NO_UNSERMAKE_MODULES \| grep $module > /dev/null 2>&1) \
761	&& use_compile_target=yes	761	&& use_compile_target=yes
762	if [ "$use_compile_target" = yes ]; then	762	if [ "$use_compile_target" = yes ]; then

Lines 6-14 Link Here

(-)tdesdk/scripts/kde-buildrc (-5 / +5 lines)
6		6
7	# Where are your KDE sources?	7	# Where are your KDE sources?
8	#	8	#
9	KDESRCDIR="$PWD"	9	TDESRCDIR="$PWD"
10		10
11	# Where your KDE should be build, leave empty if built in KDESRCDIR	11	# Where your KDE should be build, leave empty if built in TDESRCDIR
12	#	12	#
13	KDEBUILDDIR=""	13	KDEBUILDDIR=""
14		14
Lines 36-42 Link Here
36	# here in which the logfiles will be saved. If you want to disable logfile	36	# here in which the logfiles will be saved. If you want to disable logfile
37	# generation, leave this blank.	37	# generation, leave this blank.
38	#	38	#
39	KDELOGDIR="$KDESRCDIR/log"	39	KDELOGDIR="$TDESRCDIR/log"
40		40
41	# Do you want the logfiles to be compressed? Set this variable to "yes" to	41	# Do you want the logfiles to be compressed? Set this variable to "yes" to
42	# make the script compress the logfiles using bzip2 (using gzip as a	42	# make the script compress the logfiles using bzip2 (using gzip as a
Lines 122-128 Link Here
122	#CHECKOUT_PARTIAL_KDEMULTIMEDIA=juk	122	#CHECKOUT_PARTIAL_KDEMULTIMEDIA=juk
123	#CHECKOUT_PARTIAL_KDEEXTRAGEAR_2="kile konversation"	123	#CHECKOUT_PARTIAL_KDEEXTRAGEAR_2="kile konversation"
124		124
125	# If there are any modules in $KDESRCDIR which you don't want to be updated,	125	# If there are any modules in $TDESRCDIR which you don't want to be updated,
126	# you can specify them in this space-seperated list, e.g. "qt-copy kde-common".	126	# you can specify them in this space-seperated list, e.g. "qt-copy kde-common".
127	#	127	#
128	EXCLUDE=""	128	EXCLUDE=""
Lines 164-170 Link Here
164		164
165	# Set it to the path for unsermake if you want to test it instead of	165	# Set it to the path for unsermake if you want to test it instead of
166	# automake.	166	# automake.
167	# USE_UNSERMAKE="$KDESRCDIR/kdenonbeta/unsermake/unsermake"	167	# USE_UNSERMAKE="$TDESRCDIR/kdenonbeta/unsermake/unsermake"
168		168
169	# List modules here for which unsermake should not be used.	169	# List modules here for which unsermake should not be used.
170	#	170	#