Changeset c145241b31ecc37e07e4f3d00c4436e7a5736f77

Show
Ignore:
Timestamp:
10/20/06 17:58:06 (2 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1161359886 +0000
git-parent:

[7104644b7773a705d94c1f1c651aeb2decd8cf10]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1161359886 +0000
Message:

Remove some obsolete code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • toolbox

    r7104644 rc145241  
    3232  --update-includes       generate various include files 
    3333  --update-version        generate src/misc/version.c 
    34   --update-glade          generate and fix Glade code 
    3534  --update-glade2         generate and fix Glade 2 code 
    3635  --update-flexml         generate and fix flexml and flex code 
    …… 
    8281  --update-flexml) 
    8382    action=flexml 
    84     ;; 
    85   --update-glade|--fix-glade) 
    86     action=glade 
    8783    ;; 
    8884  --update-glade2|--update-glade-2|--fix-glade2) 
    …… 
    634630 
    635631## 
    636 ##  Fix glade-generated files 
    637 ## 
    638 if test "${action}" = "glade" 
    639 then 
    640   for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade 
    641   do 
    642     echo "generating code from $file" 
    643     glade -w $file || exit 1 
    644   done 
    645  
    646   for file in modules/gui/gtk/gnome_interface.c modules/gui/gtk/gtk_interface.c modules/gui/familiar/interface.c 
    647   do 
    648     echo "fixing $file" 
    649     if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 
    650     then 
    651       rm -f $file.$$.bak 
    652       cat > $file.$$.bak << EOF 
    653 /* This file was created automatically by glade and fixed by bootstrap */ 
     632##  Fix glade2-generated files 
     633## 
     634if test "${action}" = "glade2" 
     635then 
     636  file="modules/gui/pda/pda.glade" 
     637  echo "generating code from $file" 
     638  glade-2 -w "$file" || exit 1 
     639 
     640  file="modules/gui/pda/pda_interface.c" 
     641  echo "fixing $file" 
     642  if grep "DO NOT EDIT THIS FILE" "$file" >/dev/null 2>&1 
     643  then 
     644    rm -f -- "$file.$$.bak" 
     645    cat > "$file.$$.bak" << EOF 
     646/* This file was created automatically by glade2 and fixed by bootstrap */ 
    654647 
    655648#include <vlc/vlc.h> 
    656649EOF 
    657       sed -e 1,7d \ 
    658           -e 's#_(\(".:..:.."\))#\1#' \ 
    659           -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \ 
    660           -e 's#_("---")#"---"#' \ 
    661           -e 's#_("--")#"--"#' \ 
    662           -e 's#_(\("/dev/[^"]*"\))#"\1"#' \ 
    663           -e 's#_(\("./."\))#\1#' \ 
    664           < $file >> $file.$$.bak 
    665       mv -f $file.$$.bak $file 
    666     fi 
    667   done 
    668  
    669   for file in modules/gui/gtk/gtk_support.h modules/gui/familiar/support.h 
    670   do 
    671     echo "fixing $file" 
    672     if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 
    673     then 
    674       rm -f $file.$$.bak 
    675       sed -e 's/DO NOT EDIT.*/Created by glade, fixed by bootstrap/' \ 
    676           -e 's,<config.h>,<vlc/vlc.h>,' \ 
    677           -e 's,#if.*ENABLE_NLS.*,#if 0 /* Disabled by bootstrap */,' \ 
    678           -e 's,#else,/* & */,' \ 
    679           < $file > $file.$$.bak 
    680       mv -f $file.$$.bak $file 
    681     fi 
    682   done 
    683  
    684   exit 0 
    685 fi 
    686  
    687 ## 
    688 ##  Fix glade2-generated files 
    689 ## 
    690 if test "${action}" = "glade2" 
    691 then 
    692   for file in modules/gui/gtk2/gnome2.glade modules/gui/gtk2/gtk2.glade modules/gui/pda/pda.glade 
    693   do 
    694     echo "generating code from $file" 
    695     glade-2 -w $file || exit 1 
    696   done 
    697  
    698   for file in modules/gui/pda/pda_interface.c 
    699   do 
    700     echo "fixing $file" 
    701     if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 
    702     then 
    703       rm -f $file.$$.bak 
    704       cat > $file.$$.bak << EOF 
    705 /* This file was created automatically by glade2 and fixed by bootstrap */ 
    706  
    707 #include <vlc/vlc.h> 
    708 EOF 
    709       sed -e 1,7d \ 
    710           -e 's#_(\(".:..:.."\))#\1#' \ 
    711           -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \ 
    712           -e 's#_("---")#"---"#' \ 
    713           -e 's#_("--")#"--"#' \ 
    714           -e 's#_(\("/dev/[^"]*"\))#\1#' \ 
    715           -e 's#_(\("./."\))#\1#' \ 
    716           < $file >> $file.$$.bak 
    717       mv -f $file.$$.bak $file 
    718     fi 
    719   done 
     650    sed -e 1,7d \ 
     651        -e 's#_(\(".:..:.."\))#\1#' \ 
     652        -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \ 
     653        -e 's#_("---")#"---"#' \ 
     654        -e 's#_("--")#"--"#' \ 
     655        -e 's#_(\("/dev/[^"]*"\))#\1#' \ 
     656        -e 's#_(\("./."\))#\1#' \ 
     657        < "$file" >> "$file.$$.bak" 
     658    mv -f "$file.$$.bak" "$file" 
     659  fi 
    720660 
    721661  exit 0