* Makefile.am: added a "package-win32-exe" and "package-win32-zip" rule. "package...

[vlc] / toolbox

diff --git a/toolbox b/toolbox
index 29f225ce402ff9fe51f680dda159b57392cc9215..ef377b53915499bafa1205f2b0903031610fa55a 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,13 +1,15 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.39 2003/07/08 13:09:30 sam Exp $
+##  $Id: toolbox,v 1.44 2003/07/31 13:06:05 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
 ###
 ###  Get a sane environment, just in case
 ###
+LC_ALL=C
+export LC_ALL
 LANG=C
 export LANG
 CYGWIN=binmode
@@ -81,6 +83,9 @@ case "$1" in
   --make-woody)
     action=woody
     ;;
+  --add-include)
+    action=include
+    ;;
   --help)
     help
     ;;
@@ -91,6 +96,19 @@ case "$1" in
 esac
 shift
 
+##
+##  Add includes to help doxygen
+##
+if test "${action}" = "include"
+then
+  case "$1" in
+    */vlc_common.h|*/include/vlc/*);;
+    */include/*.h) echo "#include <vlc_common.h>" ;;
+  esac
+  cat $1
+  exit 0
+fi
+
 ##
 ##  Update the CVS changelog
 ##
@@ -106,7 +124,7 @@ then
   YEAR=`sed -e 's/\(....\)-..-.*/\1/;q' ChangeLog.tmp`
   LASTYEAR="$((${YEAR} - 1))"
   sed -ne "/^${YEAR}-..-../,/^${LASTYEAR}-..-../{/^${LASTYEAR}-..-../d;p}" \
-    < ChangeLog.tmp > Changelog
+    < ChangeLog.tmp > ChangeLog
   rm -f ChangeLog.tmp
   exit 0
   # To generate changelog for the year 2001:
@@ -124,8 +142,8 @@ then
     srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
   fi
 
-  #  The evil ^M
-  M="`printf '\r'`"
+  #  The evil ^M. printf '\r' does not work in Cygwin.
+  M='\r'
 
   #  Variables we get from configure.ac
   LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac`
@@ -163,7 +181,7 @@ then
     do
       cat >> ${target} << EOF
 # Begin Source File${M}
-SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
 # ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M}
 # End Source File${M}
 EOF
@@ -179,7 +197,7 @@ EOF
       then
         cat >> ${target} << EOF
 # Begin Source File${M}
-SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
 # ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M}
 !IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M}
 # PROP Output_Dir "MIPSRel\\${subdir}"${M}
@@ -217,7 +235,7 @@ EOF
         else
           cat >> ${target} << EOF
 # Begin Source File${M}
-SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
 # ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M}
 !IF "\$(CFG)" == "libvlc - Win32 Release"${M}
 # PROP Output_Dir "Release\\${subdir}"${M}
@@ -240,7 +258,7 @@ EOF
     do
       cat >> ${target} << EOF
 # Begin Source File${M}
-SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
 # End Source File${M}
 EOF
     done
@@ -251,7 +269,7 @@ EOF
     do
       cat >> ${target} << EOF
 # Begin Source File${M}
-SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
 # End Source File${M}
 EOF
     done
@@ -273,11 +291,11 @@ EOF
       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 dir in evc msvc
+      for msdir in evc msvc
       do
-        test "${dir}" = "evc" && suf="vcp" || suf="dsp"
-        source="${dir}/plugins.${suf}.in"
-        target="${dir}/plugin_${mod}.${suf}"
+        test "${msdir}" = "evc" && suf="vcp" || suf="dsp"
+        source="${msdir}/plugins.${suf}.in"
+        target="${msdir}/plugin_${mod}.${suf}"
         echo "${target}"
         perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
         for cfile in ${cfiles}
@@ -353,11 +371,13 @@ then
   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' | sort >> 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 '\(gui/win32/\|\.moc\.\)' \
+    | grep -v '\(gui/win32/\)' \
     | sort >> po/POTFILES.in
   # clean old potfiles
   cd po
@@ -553,6 +573,9 @@ then
   # FIXME: a lot of Makefiles are still there
 fi
 
+##
+##  Build a woody-friendly package
+##
 if test "${action}" = "woody"
 then
   set -ex
@@ -612,5 +635,10 @@ then
       < "$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,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