Ensure that chapter names are utf8 (I failed to find information about

[vlc] / toolbox

diff --git a/toolbox b/toolbox
index 97ca9db2a79d1e30f0e800bb38804adb5c1a4d5a..01945e4f69a7efc91cd2103188730de255057494 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -30,7 +30,6 @@ recognized flags are:
   --update-vc7            update Microsoft Visual .NET files
   --update-po             update translation files
   --update-includes       generate various include files
-  --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
@@ -75,9 +74,6 @@ case "$1" in
   --update-includes)
     action=includes
     ;;
-  --update-version)
-    action=version
-    ;;
   --update-flexml)
     action=flexml
     ;;
@@ -178,7 +174,7 @@ then
       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
@@ -195,7 +191,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}
@@ -251,7 +247,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}
@@ -318,7 +314,7 @@ EOF
           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}
@@ -547,11 +543,11 @@ then
   fi
   BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' ${builddir}/vlc-config`
 
-  file="${builddir}/src/misc/modules_builtin.h"
+  file="${builddir}/src/modules/builtin.h"
 
   rm -f "${file}.tmp"
-  mkdir -p -- "${builddir}/src/misc"
-  cat "${srcdir}/src/misc/modules_builtin.h.in" > "${file}.tmp" || exit 1
+  mkdir -p -- "${builddir}/src/modules"
+  cat "${srcdir}/src/modules/builtin.h.in" > "${file}.tmp" || exit 1
   if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
@@ -583,50 +579,6 @@ then
   exit 0
 fi
 
-##
-##  Create version file
-##
-if test "${action}" = "version"
-then
-  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
-
-  file="${builddir}/src/misc/version.c"
-  if which svnversion 2>&1 >/dev/null; then
-    VLC_CHANGESET=`svnversion $srcdir`
-  else
-    VLC_CHANGESET='exported'
-  fi
-
-  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}";
-
-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
-
 ##
 ##  Fix glade2-generated files
 ##
@@ -667,10 +619,10 @@ 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 vlc.win32.nsi.in || 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 '*.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 . -name '[a-z]*' -maxdepth 1 -exec rm -f '{}' ';')
+  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 '{}' ';'
@@ -679,7 +631,6 @@ then
   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."