Updating branch refs/heads/master
to feb032138df5af9683e058bc67ca226a654979f6 (commit)
from 0d2ff336b5e552ced926ba0ef06564ba2c48c7c5 (commit)
commit feb032138df5af9683e058bc67ca226a654979f6
Author: Paweł Forysiuk <[email protected]>
Date: Thu Apr 4 18:30:02 2013 +0200
Include gdb.exe in release builds and drop debug.bat
win32/makedist/makedist.midori | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/win32/makedist/makedist.midori b/win32/makedist/makedist.midori
index c363342..d20f9da 100755
--- a/win32/makedist/makedist.midori
+++ b/win32/makedist/makedist.midori
@@ -43,10 +43,6 @@ grep -q gtk-3.0 _build/config.log && GTK3_BUILD=1
version=`grep PACKAGE_VERSION _build/default/config.h | awk '{ print $3 $4; }'
| sed 's@(debug)@-debug@g'|sed 's@"@@g'`
if [ "$1" != "" ]; then
- if [ "$1" == "debug" ]; then
- DEBUG_BUILD=1
- shift
- fi
version_tag="$1"
fi
@@ -126,9 +122,11 @@ dll_recursive midori*.exe gspawn-*-helper*.exe
libhunspell*.dll > $temp_dir/mido
dll_recursive ../lib/gio/modules/*.dll >> $temp_dir/midori.exe.lst
dll_recursive iconv.dll >> $temp_dir/midori.exe.lst
dll_recursive ../lib/gstreamer-$GSTREAMER_API_VERSION/*.dll >>
$temp_dir/midori.exe.lst
+# we ship gdb now for -g and diagnostic button
+dll_recursive gdb.exe >> $temp_dir/midori.exe.lst
if [ "$DEBUG_BUILD" != "" ]; then
- dll_recursive gdb.exe GtkLauncher.exe >> $temp_dir/midori.exe.lst
+ dll_recursive GtkLauncher.exe >> $temp_dir/midori.exe.lst
fi
files=`ls | cat - $temp_dir/midori.exe.lst | sort | uniq -d`
@@ -209,17 +207,6 @@ if [ "$DEBUG_BUILD" == "" ];then
pushd $workdir > /dev/null
find -iname *.debug -exec rm {} \;
popd > /dev/null
-else
- #add some gdb helper scripts
- cat > $workdir/bin/backtrace.gdb << _EOF
-set logging on debug.log
-run
-thread apply all bt
-quit
-_EOF
-
-echo 'gdb.exe --command=backtrace.gdb midori.exe' > $workdir/bin/debug.bat
-
fi
# copy locales for gtk
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
