X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=15260fe5e440aa60f77c504d6e3157342a823c57;hb=22c5fe4ae5640b1f2e7358dccbc720faa84616a2;hp=b488003d129191237b3ba5b2b7d037e213b09432;hpb=4ba7bb60af1ccf816bf5dcd61f541dc98481a04b;p=vlc

diff --git a/toolbox b/toolbox
index b488003d12..15260fe5e4 100755
--- a/toolbox
+++ b/toolbox
@@ -1,12 +1,13 @@
 #! /bin/sh
 
+
 ##  toolbox for the VLC media player
 ##  $Id$
 ##
-##  Copyright (C) 2005  the VideoLAN team
+##  Copyright (C) 2002-2006  the VideoLAN team
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
-##           Rémi Denis-Courmont <rem # videolan.org>
+##           Rémi Denis-Courmont <rem # videolan.org>
 
 ###
 ###  Get a sane environment, just in case
@@ -26,14 +27,14 @@ help()
   cat << EOF
 recognized flags are:
   --update-vc             update Microsoft Visual Studio files
+  --update-vc7            update Microsoft Visual .NET files
   --update-po             update translation files
   --update-includes       generate various include files
-  --update-glade          generate and fix Glade code
+  --update-version        generate src/misc/version.c
   --update-glade2         generate and fix Glade 2 code
   --update-flexml         generate and fix flexml and flex code
   --distclean             "make distclean" on steroids
   --dist-contrib          add the contrib dir to MAKE_DIST
-  --make-woody <dir>      change distdir <dir> to a woody distdir
 EOF
   exit 1
 }
@@ -65,27 +66,27 @@ case "$1" in
   --update-vc)
     action=vc
     ;;
+  --update-vc7)
+    action=vc7
+    ;;
   --update-po)
     action=po
     ;;
   --update-includes)
     action=includes
     ;;
+  --update-version)
+    action=version
+    ;;
   --update-flexml)
     action=flexml
     ;;
-  --update-glade|--fix-glade)
-    action=glade
-    ;;
   --update-glade2|--update-glade-2|--fix-glade2)
     action=glade2
     ;;
   --distclean)
     action=distclean
     ;;
-  --make-woody)
-    action=woody
-    ;;
   --add-include)
     action=include
     ;;
@@ -122,7 +123,7 @@ if test "${action}" = "changelog"
 then
   YEAR="`date +%Y`"
   echo "toolbox --changelog no longer required. use this instead:"
-  echo " svn log -v -r '{$YEAR-12-31}:{$YEAR-01-01}' > ChangeLog"
+  echo " LANG=C svn log -v -r '{$YEAR-12-31}:{$YEAR-01-01}' > ChangeLog"
   exit 0
 fi
 
@@ -170,14 +171,14 @@ then
   do
     printf "."
     #  Top of the project file
-    perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
+    perl -pe 'if(/ZSOURCESZ/){last;}' < ${target}.in > ${target}
     #  The source files
     for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
     do
       cat >> ${target} << EOF
 # Begin Source File${M}
 SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
-# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M}
+# ADD CPP /D "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M}
 # End Source File${M}
 EOF
     done
@@ -194,7 +195,7 @@ EOF
         cat >> ${target} << EOF
 # Begin Source File${M}
 SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
-# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M}
+# ADD CPP /D "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M}
 !IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M}
 # PROP Output_Dir "MIPSRel\\${subdir}"${M}
 # PROP Intermediate_Dir "MIPSRel\\${subdir}"${M}
@@ -250,7 +251,7 @@ EOF
           cat >> ${target} << EOF
 # Begin Source File${M}
 SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
-# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M}
+# ADD CPP /D "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M}
 !IF "\$(CFG)" == "libvlc - Win32 Release"${M}
 # PROP Output_Dir "Release\\${subdir}"${M}
 # PROP Intermediate_Dir "Release\\${subdir}"${M}
@@ -267,7 +268,7 @@ EOF
 EOF
     done
     #  The headers
-    perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target}
+    perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${target}.in >> ${target}
     for file in ${LIBVLC_HEADERS}
     do
       cat >> ${target} << EOF
@@ -290,7 +291,7 @@ EOF
     cat >> ${target} << EOF
 # End Group${M}
 EOF
-    perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+    perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
 
   # plugins files
@@ -311,13 +312,13 @@ EOF
         source="${msdir}/plugins.${suf}.in"
         target="${msdir}/plugin_${mod}.${suf}"
         printf "."
-        perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
+        perl -pe 'if(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${mod}'/g' < ${source} > ${target}
         for cfile in ${cfiles}
         do
           cat >> ${target} << EOF
 # Begin Source File${M}
 SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M}
-# ADD CPP /D "__VLC__" /D "__PLUGIN__"  /D "MODULE_NAME=${mod}" /D "MODULE_NAME_IS_${mod}" ${M}
+# ADD CPP /D "__LIBVLC__" /D "__PLUGIN__"  /D "MODULE_NAME=${mod}" /D "MODULE_NAME_IS_${mod}" ${M}
 !IF "\$(CFG)" == "plugin_${mod} - Win32 Release"${M}
 # PROP Output_Dir "Release\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M}
 # PROP Intermediate_Dir "Release\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M}
@@ -328,8 +329,8 @@ SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M}
 EOF
         done
         # sed is really nicer for this... unfortunately it's broken under cygwin
-        # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target}
-        perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target}
+        # sed -ne '1,/ZSOURCESZ/d; /ZHEADERSZ/,$d; p' < ${source} >> ${target}
+        perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${source} >> ${target}
         for hfile in ${hfiles}
         do
           cat >> ${target} << EOF
@@ -338,8 +339,8 @@ SOURCE="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"${M}
 # End Source File${M}
 EOF
         done
-        # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
-        perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
+        # sed -ne '1,/ZHEADERSZ/d; p' < ${source} >> ${target}
+        perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${source} >> ${target}
       done
     done
   done
@@ -349,7 +350,7 @@ EOF
   do
     printf "."
     #  Top of the project file
-    perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
+    perl -pe 'if(/ZSOURCESZ/){last;}' < ${target}.in > ${target}
     #  The source files
       cat >> ${target} << EOF
 # Begin Source File${M}
@@ -357,7 +358,163 @@ SOURCE="..\\src\\vlc.c"${M}
 # End Source File${M}
 EOF
     #  Bottom of the project file - handles resource files too
-    perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+    perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+  done
+
+  echo " done."
+  exit 0
+fi
+
+##
+##  Update the MSVC (.NET) project files
+##
+if test "${action}" = "vc7"
+then
+  echo "generating Visual .NET files"
+
+  srcdir=.
+
+  #  The evil ^M. printf '\r' does not work in Cygwin.
+  M='
+'
+
+  #  Variables we get from configure.ac
+  LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac`
+  LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac`
+  LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'`
+
+  #  Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :)
+  LIBVLC_SOURCES=`getfiles SOURCES_libvlc_common; getfiles SOURCES_libvlc_win32; getfiles SOURCES_libvlc_dirent; getfiles SOURCES_libvlc_getopt; getfiles SOURCES_libvlc_libc`
+
+  LIBVLC_HEADERS=`getfiles HEADERS_include; getfiles HEADERS_include_built`
+
+  LIBVLC_PKG_HEADERS=`getfiles dist_pkginclude_HEADERS`
+
+  # Clean up
+  rm -f msvc/*.vcproj
+
+  # config files
+  for target in msvc/config.h
+  do
+    printf "."
+    rm -f ${target}
+    sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \
+        -e "s/@VERSION@/${LIBVLC_VERSION}/" \
+        -e "s/@SYMBOL@/${LIBVLC_SYMBOL}/" < ${target}.in > ${target}
+  done
+
+ # vlc files
+  target="msvc/vlc.vcproj"
+  printf "."
+  #  Top of the project file
+  guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'`
+  perl -pe 'if(/ZSOURCESZ/){last;} s/ZGUIDZ/'${guid}'/g' < ${target}.in > ${target}
+  #  The source files
+  cat >> ${target} << EOF
+<File RelativePath="..\\src\\vlc.c"></File>${M}
+EOF
+  #  Bottom of the project file - handles resource files too
+  perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+  
+  # libvlc files
+  target=msvc/libvlc.vcproj
+  printf "."
+  #  Top of the project file
+  guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'`
+  perl -pe 'if(/ZSOURCESZ/){last;} s/ZGUIDZ/'${guid}'/g' < ${target}.in > ${target}
+  #  The source files
+  for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
+  do
+    cat >> ${target} << EOF
+<File RelativePath="..\\`echo ${dir}/${file} | sed 's,/,\\\\,g'`"></File>${M}
+EOF
+  done
+  for subdir in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq`
+  do
+    cat >> ${target} << EOF
+<Filter	Name="`echo ${subdir} | sed s,/,_,g`" Filter="c;cpp">${M}
+EOF
+    for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"`
+    do
+      cat >> ${target} << EOF
+<File RelativePath="..\\`echo ${file} | sed 's,/,\\\\,g'`">${M}
+EOF
+      if echo ${file} | grep -q '.c$'
+      then
+        cat >> ${target} << EOF
+	<FileConfiguration Name="Debug|Win32">${M}
+		<Tool Name="VCCLCompilerTool" ObjectFile="\$(IntDir)/\$(ProjectName)/`echo ${file} | sed -e s/\.c$/.obj/`"/>${M}
+	</FileConfiguration>${M}
+EOF
+      fi
+      cat >> ${target} << EOF
+</File>${M}
+EOF
+    done
+    cat >> ${target} << EOF
+</Filter>${M}
+EOF
+  done
+  #  The headers
+  perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${target}.in >> ${target}
+  for file in ${LIBVLC_HEADERS}
+  do
+    cat >> ${target} << EOF
+<File RelativePath="..\\`echo ${file} | sed 's,/,\\\\,g'`"></File>${M}
+EOF
+  done
+  cat >> ${target} << EOF
+<Filter	Name="vlc" Filter="h;hpp">${M}
+EOF
+  for file in ${LIBVLC_PKG_HEADERS}
+  do
+    cat >> ${target} << EOF
+<File RelativePath="..\\`echo ${file} | sed 's,/,\\\\,g'`"></File>${M}
+EOF
+  done
+  cat >> ${target} << EOF
+</Filter>${M}
+EOF
+  perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+
+  # plugins files
+  for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' ${srcdir}/configure.ac`
+  do
+    mf="${srcdir}/modules/${dir}/Modules.am"
+    for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}`
+    do
+      # this is an attempt at getting a list of plugin sources... we take the
+      # production and remove everything that does not contain "module", which
+      # means you miss $(NULL), but other variables too.
+      allfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${mf} | awk 'BEGIN{a=0}{if(!a&&$0~/^SOURCES_'${mod}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if($0~/^[a-zA-Z]/){exit;}print $0}}' | tr '\\ ' '\n\n' | grep '\.'`
+      hfiles=`for i in ${allfiles} ; do echo "$i" ; done | grep '\.h$'`
+      cfiles=`for i in ${allfiles} ; do echo "$i" ; done | grep -v '\.h$'`
+      for msdir in msvc
+      do
+        source="${msdir}/plugins.vcproj.in"
+        target="${msdir}/plugin_${mod}.vcproj"
+        printf "."
+	guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'`
+        perl -pe 'if(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${mod}'/g' < ${source} | sed 's,ZGUIDZ,'${guid}',' > ${target}
+        for cfile in ${cfiles}
+        do
+          cat >> ${target} << EOF
+<File RelativePath="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"></File>${M}
+EOF
+        done
+        # sed is really nicer for this... unfortunately it's broken under cygwin
+        # sed -ne '1,/ZSOURCESZ/d; /ZHEADERSZ/,$d; p' < ${source} >> ${target}
+        perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${source} >> ${target}
+        for hfile in ${hfiles}
+        do
+          cat >> ${target} << EOF
+<File RelativePath="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"></File>${M}
+EOF
+        done
+        # sed -ne '1,/ZHEADERSZ/d; p' < ${source} >> ${target}
+        perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${source} >> ${target}
+      done
+    done
   done
 
   echo " done."
@@ -370,27 +527,9 @@ fi
 if test "${action}" = "po"
 then
   # find out the source files
-  rm -f po/POTFILES.in
-  echo "# automatically created by toolbox --update-po" > po/POTFILES.in
-  echo "" >> po/POTFILES.in
-  echo "# main sources" >> po/POTFILES.in
-  find include src -name '*.[chm]' -o -name '*.[ch]pp' \
-    | grep -v '\(vlc_symbols\|misc/modules_\)' \
-    | sort >> po/POTFILES.in
-  echo "" >> po/POTFILES.in
-  echo "# modules" >> po/POTFILES.in
-  find modules -name '*.[chm]' -o -name '*.[ch]pp' \
-    | grep -v '\(\.moc\.\|gui/gtk2/\)' \
-    | sort >> po/POTFILES.in
-  # clean old potfiles
-  cd po
-  rm -f vlc.pot
-  # update
-  make vlc.pot || exit 1
-  make update-po || exit 1
-  cd ..
-
-  exit 0
+  echo "WARNING: you should run \"make update-po\" instead!" >&2
+  make update-po
+  exit $?
 fi
 
 ##
@@ -406,90 +545,84 @@ then
   if test -z "${builddir}"; then
     builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`"
   fi
-  BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
+  BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' ${builddir}/vlc-config`
 
   file="${builddir}/src/misc/modules_builtin.h"
 
-  rm -f ${file}.tmp && cp ${srcdir}/src/misc/modules_builtin.h.in ${file}.tmp
+  rm -f "${file}.tmp"
+  mkdir -p -- "${builddir}/src/misc"
+  cat "${srcdir}/src/misc/modules_builtin.h.in" > "${file}.tmp" || exit 1
   if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
     do
-      echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >>${file}.tmp
+      echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >> "${file}.tmp"
     done
-    echo "" >> ${file}.tmp
+    echo "" >> "${file}.tmp"
   fi
   echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp
-  echo "    do \\" >> ${file}.tmp
-  echo "    { \\" >> ${file}.tmp
+  echo "    do \\" >> "${file}.tmp"
+  echo "    { \\" >> "${file}.tmp"
   if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
     do
-      echo "        ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> ${file}.tmp
+      echo "        ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> "${file}.tmp"
     done
   fi
-  echo "    } while( 0 );" >> ${file}.tmp
-  echo "" >> ${file}.tmp
-  if diff >/dev/null 2>&1 ${file} ${file}.tmp
+  echo "    } while( 0 );" >> "${file}.tmp"
+  echo "" >> "${file}.tmp" || exit 1
+  if diff >/dev/null 2>&1 "${file}" "${file}.tmp"
   then
-    rm -f ${file}.tmp
+    rm -f "${file}.tmp"
   else
     echo "creating new ${file}"
-    mv -f ${file}.tmp ${file}
+    mv -f "${file}.tmp" "${file}"
   fi
 
   exit 0
 fi
 
 ##
-##  Fix glade-generated files
+##  Create version file
 ##
-if test "${action}" = "glade"
+if test "${action}" = "version"
 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
+  if test -z "${srcdir}"; then
+    srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
+  fi
+  if test -z "${builddir}"; then
+    builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`"
+  fi
+  if test -z "${CC}"; then
+    CC="`sed -ne 's/^CC *= *//p' < Makefile`"
+  fi
 
-  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 */
+  file="${builddir}/src/misc/version.c"
+  if which svnversion 2>&1 >/dev/null; then
+    VLC_CHANGESET=`svnversion $srcdir`
+  else
+    VLC_CHANGESET='exported'
+  fi
 
-#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
+  rm -f ${file}.tmp
+  mkdir -p -- "${builddir}/src/misc"
+  cat > ${file}.tmp << EOF
+/* DO NOT EDIT THIS FILE - IT IS REGENERATED AT EVERY COMPILE -
+ * IT GIVES BETTER TRACKING OF VLC STABLE AND DEVELOPMENT VERSIONS
+ * WHETHER THEY ARE BUILT BY OTHERS OR DURING DEVELOPMENT OR FOR THE
+ * OFFICIAL VLC STABLE RELEASES.
+ */
+const char psz_vlc_changeset[] = "${VLC_CHANGESET}";
 
-  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
+EOF
+  if diff >/dev/null 2>&1 ${file} ${file}.tmp
+  then
+    rm -f ${file}.tmp
+  else
+    echo "creating new ${file}"
+    mv -f ${file}.tmp ${file}
+  fi
 
   exit 0
 fi
@@ -499,34 +632,30 @@ fi
 ##
 if test "${action}" = "glade2"
 then
-  for file in modules/gui/gtk2/gnome2.glade modules/gui/gtk2/gtk2.glade modules/gui/pda/pda.glade
-  do
-    echo "generating code from $file"
-    glade-2 -w $file || exit 1
-  done
+  file="modules/gui/pda/pda.glade"
+  echo "generating code from $file"
+  glade-2 -w "$file" || exit 1
 
-  for file in modules/gui/pda/pda_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
+  file="modules/gui/pda/pda_interface.c"
+  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 glade2 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
+    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
 
   exit 0
 fi
@@ -538,19 +667,22 @@ if test "${action}" = "distclean"
 then
   set -x
   # a naive sanity check to make sure we are in a VLC tree
-  test -f vlc.spec.mdk -a -f debian/rules || exit 1
+  test -f vlc.mandriva.spec -a -f vlc.win32.nsi.in || exit 1
   # let's rock!
-  find . -type f '(' -name '*.[oa]' -o -name '*.so' -o -name '*.sl' -o -name '*.dylib' -o -name '*.dll' -o -name .dirstamp -o '(' '(' ! -path '\./doc/developer/Makefile\.in' ')' -a -name Makefile.in ')' -o -name 'stamp-h*' -o -name '*~' -o -name '*.bak' -o -name '*.moc.cpp' ')' -exec rm -f '{}' ';'
-  (cd autotools && find . -name '[a-z]*' -maxdepth 1 -exec rm -f '{}' ';')
-  (cd debian && find . -type d '(' -name '[a-z]*' ! -name 'patches' ')' -maxdepth 1 -exec rm -Rf '{}' ';')
+  find . -false -path './extras/contrib/*' -type f '(' -name '*.[oa]' -o -name '*.l[oa]' -o -name '*.so' -o -name '*.sl' -o -name '*.dylib' -o -name '*.dll' -o -name .dirstamp -o '(' '(' ! -path '\./doc/developer/Makefile\.in' ')' -a -name Makefile.in ')' -o -name 'stamp-h*' -o -name '*~' -o -name '*.bak' -o -name '*.moc.cpp' ')' -exec rm -f '{}' ';'
+  (cd autotools && find . -maxdepth 1 -name '[a-z]*' -exec rm -f '{}' ';')
   find msvc -type f -name '*.dsp' -exec rm -f '{}' ';'
   find evc -type f -name '*.vcp' -exec rm -f '{}' ';'
   find . -type d -name '.deps' -exec rm -Rf '{}' ';'
+  find . -type d -name '.libs' -exec rm -Rf '{}' ';'
   # there's some more cruft all around
   rm -f config.h config.log config.status
   rm -f vlc vlc-config Makefile Modules.am
   rm -Rf autom4te.cache
   rm -f mozilla/vlcintf.h mozilla/vlcintf.xpt
+  echo "\`toolbox --distclean\' is known to be broken."
+  echo "Don't complain if it does not work, or better yet, don't use it."
+  echo "You were warned."
   # FIXME: a lot of Makefiles are still there
 fi
 
@@ -585,70 +717,3 @@ then
   cp ${srcdir}/extras/contrib/src/Patches/* "${distdir}/extras/contrib/src/Patches/"
 fi
 
-##
-##  Build a woody-friendly package
-##
-if test "${action}" = "woody"
-then
-  set -ex
-  test -d "$1"
-
-  # changelog: replace (1.2.3-4) with (1.2.3-0woody.4)
-  sed -e 's/^vlc (\([^)]*\)-\([^-)]*\))/vlc-woody (\1-0woody.\2)/' \
-      -e 's/ unstable; / stable; /' \
-      < "$1/debian/changelog" > "$1/debian/changelog.woody"
-  mv "$1/debian/changelog.woody" "$1/debian/changelog"
-
-  # control: replace liba52-*-dev with a52dec-dev (>=0.7.3)
-  #                  libdv*-dev with libdv-dev
-  #                  kdelibs4-dev with kdelibs-dev
-  #                  libqt3-mt-dev libqt3-compat-headers with libqt-dev
-  #                  libarts1-dev with libarts-dev
-  #                  libdvdread3-dev with libdvdread2-dev
-  #                  libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev
-  #                  libxosd-dev (>=2.2.4-1.3) with libxosd-dev
-  #                  ttf-freefont with ttf-thryomanes
-  #                  dvb-dev (>= 1.0.1-6) with dvb-dev
-  #          remove libwxgtk2.4-dev
-  #                 libidl0 (workaround for mozilla-dev's bad deps)
-  #                 libglib2.0-0 (workaround for mozilla-dev's bad deps)
-  #                 gcc-3.2 (workaround for an ICE in gcc-3.3)
-  #          change Section: gnome with Section: graphics
-  #                 Section: kde with Section: kde
-  #                 Section: libdevel with Section: devel
-  sed -e 's/liba52-[^-]*-dev/a52dec-dev (>=0.7.3)/' \
-      -e 's/libdv[0-9]*-dev/libdv-dev/' \
-      -e 's/kdelibs[0-9]*-dev/kdelibs-dev/' \
-      -e 's/libqt[0-9]*-mt-dev/libqt-dev/' \
-      -e 's/, libqt[0-9]*-compat-headers[^,]*//' \
-      -e 's/libarts[0-9]*-dev/libarts-dev/' \
-      -e 's/libdvdread[0-9]*-dev/libdvdread2-dev/' \
-      -e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \
-      -e 's/, libxosd-dev[^,]*/, libxosd-dev/' \
-      -e 's/, ttf-freefont[^,]*/, ttf-thryomanes/' \
-      -e 's/, dvb-dev[^,]*/, dvb-dev/' \
-      -e 's/, libwx[^,]*//' \
-      -e '/Package: wxvlc/,/^ *$/d' \
-      -e 's/, libidl0[^,]*//' \
-      -e 's/, libglib2.0-0[^,]*//' \
-      -e 's/, gcc-3.2[^,]*//' \
-      -e 's/Section: gnome/Section: graphics/' \
-      -e 's/Section: kde/Section: graphics/' \
-      -e 's/Section: libdevel/Section: devel/' \
-      < "$1/debian/control" > "$1/debian/control.woody"
-  mv "$1/debian/control.woody" "$1/debian/control"
-
-  # rules: remove wxwindows and skins stuff
-  sed -e '/# Package: wxvlc/,/^ *$/d' \
-      -e 's,--enable-wxwindows,--disable-wxwindows,' \
-      -e 's,--enable-skins,--disable-skins,' \
-      < "$1/debian/rules" > "$1/debian/rules.woody"
-  mv "$1/debian/rules.woody" "$1/debian/rules"
-  chmod 0755 "$1/debian/rules"
-
-  # modules/misc/freetype.c: replace the default font
-  sed -e 's,freefont/FreeSerifBold.ttf,thryomanes/thryb___.ttf,' \
-      < "$1/modules/misc/freetype.c" > "$1/modules/misc/freetype.c.woody"
-  mv "$1/modules/misc/freetype.c.woody" "$1/modules/misc/freetype.c"
-fi
-