Commit c145241b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove some obsolete code

parent 7104644b
...@@ -31,7 +31,6 @@ recognized flags are: ...@@ -31,7 +31,6 @@ recognized flags are:
--update-po update translation files --update-po update translation files
--update-includes generate various include files --update-includes generate various include files
--update-version generate src/misc/version.c --update-version generate src/misc/version.c
--update-glade generate and fix Glade code
--update-glade2 generate and fix Glade 2 code --update-glade2 generate and fix Glade 2 code
--update-flexml generate and fix flexml and flex code --update-flexml generate and fix flexml and flex code
--distclean "make distclean" on steroids --distclean "make distclean" on steroids
...@@ -82,9 +81,6 @@ case "$1" in ...@@ -82,9 +81,6 @@ case "$1" in
--update-flexml) --update-flexml)
action=flexml action=flexml
;; ;;
--update-glade|--fix-glade)
action=glade
;;
--update-glade2|--update-glade-2|--fix-glade2) --update-glade2|--update-glade-2|--fix-glade2)
action=glade2 action=glade2
;; ;;
...@@ -631,91 +627,35 @@ EOF ...@@ -631,91 +627,35 @@ EOF
exit 0 exit 0
fi fi
##
## Fix glade-generated files
##
if test "${action}" = "glade"
then
for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade
do
echo "generating code from $file"
glade -w $file || exit 1
done
for file in modules/gui/gtk/gnome_interface.c modules/gui/gtk/gtk_interface.c modules/gui/familiar/interface.c
do
echo "fixing $file"
if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1
then
rm -f $file.$$.bak
cat > $file.$$.bak << EOF
/* This file was created automatically by glade and fixed by bootstrap */
#include <vlc/vlc.h>
EOF
sed -e 1,7d \
-e 's#_(\(".:..:.."\))#\1#' \
-e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \
-e 's#_("---")#"---"#' \
-e 's#_("--")#"--"#' \
-e 's#_(\("/dev/[^"]*"\))#"\1"#' \
-e 's#_(\("./."\))#\1#' \
< $file >> $file.$$.bak
mv -f $file.$$.bak $file
fi
done
for file in modules/gui/gtk/gtk_support.h modules/gui/familiar/support.h
do
echo "fixing $file"
if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1
then
rm -f $file.$$.bak
sed -e 's/DO NOT EDIT.*/Created by glade, fixed by bootstrap/' \
-e 's,<config.h>,<vlc/vlc.h>,' \
-e 's,#if.*ENABLE_NLS.*,#if 0 /* Disabled by bootstrap */,' \
-e 's,#else,/* & */,' \
< $file > $file.$$.bak
mv -f $file.$$.bak $file
fi
done
exit 0
fi
## ##
## Fix glade2-generated files ## Fix glade2-generated files
## ##
if test "${action}" = "glade2" if test "${action}" = "glade2"
then then
for file in modules/gui/gtk2/gnome2.glade modules/gui/gtk2/gtk2.glade modules/gui/pda/pda.glade file="modules/gui/pda/pda.glade"
do echo "generating code from $file"
echo "generating code from $file" glade-2 -w "$file" || exit 1
glade-2 -w $file || exit 1
done
for file in modules/gui/pda/pda_interface.c file="modules/gui/pda/pda_interface.c"
do echo "fixing $file"
echo "fixing $file" if grep "DO NOT EDIT THIS FILE" "$file" >/dev/null 2>&1
if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 then
then rm -f -- "$file.$$.bak"
rm -f $file.$$.bak cat > "$file.$$.bak" << EOF
cat > $file.$$.bak << EOF
/* This file was created automatically by glade2 and fixed by bootstrap */ /* This file was created automatically by glade2 and fixed by bootstrap */
#include <vlc/vlc.h> #include <vlc/vlc.h>
EOF EOF
sed -e 1,7d \ sed -e 1,7d \
-e 's#_(\(".:..:.."\))#\1#' \ -e 's#_(\(".:..:.."\))#\1#' \
-e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \ -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \
-e 's#_("---")#"---"#' \ -e 's#_("---")#"---"#' \
-e 's#_("--")#"--"#' \ -e 's#_("--")#"--"#' \
-e 's#_(\("/dev/[^"]*"\))#\1#' \ -e 's#_(\("/dev/[^"]*"\))#\1#' \
-e 's#_(\("./."\))#\1#' \ -e 's#_(\("./."\))#\1#' \
< $file >> $file.$$.bak < "$file" >> "$file.$$.bak"
mv -f $file.$$.bak $file mv -f "$file.$$.bak" "$file"
fi fi
done
exit 0 exit 0
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment