X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=deed580500dbf9e9bb89d392d07fc4c4a77d1aae;hb=a57ca1b318ee3d60be43236ce8688aef0fd88d68;hp=ba8ca109fb646f868db981cfa4df05b1c5ce89c0;hpb=42195685323f11ea92176ac02c366444d908f154;p=vlc

diff --git a/toolbox b/toolbox
index ba8ca109fb..deed580500 100755
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.53 2003/12/22 02:24:50 sam Exp $
+##  $Id$
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -28,7 +28,6 @@ recognized flags are:
   --update-glade          generate and fix Glade code
   --update-glade2         generate and fix Glade 2 code
   --update-flexml         generate and fix flexml and flex code
-  --changelog             update the CVS changelog
   --distclean             "make distclean" on steroids
   --make-woody <dir>      change distdir <dir> to a woody distdir
 EOF
@@ -114,21 +113,10 @@ fi
 ##
 if test "${action}" = "changelog"
 then
-  set -e
-  set -x
-  cvs2cl --help >/dev/null 2>&1 || exit 1
-  rm -f ChangeLog ChangeLog.tmp
-  cvs2cl --utc --hide-filenames --no-wrap -w --stdout -g -z9 | \
-    sed -e 's/^[^0-9]/ /' -e 's/^  *$//' -e 's/^ \* 	/ /g' | \
-    grep -v '^ \*$' | uniq > ChangeLog.tmp         # ^-- tab
-  YEAR=`sed -e 's/\(....\)-..-.*/\1/;q' ChangeLog.tmp`
-  LASTYEAR="$((${YEAR} - 1))"
-  sed -ne "/^${YEAR}-..-../,/^${LASTYEAR}-..-../{/^${LASTYEAR}-..-../d;p}" \
-    < ChangeLog.tmp > ChangeLog
-  rm -f ChangeLog.tmp
+  YEAR="`date +%Y`"
+  echo "toolbox --changelog no longer required. use this instead:"
+  echo " svn log -v -r '{$YEAR-12-31}:{$YEAR-01-01}' > ChangeLog"
   exit 0
-  # To generate changelog for the year 2001:
-  # sed -ne '/^2001/,/^2000/{/^2000/d;p}'
 fi
 
 ##
@@ -224,12 +212,30 @@ SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M}
 !ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Debug"${M}
 # PROP Output_Dir "ARMDbg\\${subdir}"${M}
 # PROP Intermediate_Dir "ARMDbg\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARMV4) Release"${M}
+# PROP Output_Dir "ARMV4Rel\\${subdir}"${M}
+# PROP Intermediate_Dir "ARMV4Rel\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARMV4) Debug"${M}
+# PROP Output_Dir "ARMV4Dbg\\${subdir}"${M}
+# PROP Intermediate_Dir "ARMV4Dbg\\${subdir}"${M}
 !ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Release"${M}
 # PROP Output_Dir "X86EMRel\\${subdir}"${M}
 # PROP Intermediate_Dir "X86EMRel\\${subdir}"${M}
 !ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Debug"${M}
 # PROP Output_Dir "X86EMDbg\\${subdir}"${M}
 # PROP Intermediate_Dir "X86EMDbg\\${subdir}"${M}
+!ELSEIF  "\$(CFG)" == "libvlc - Win32 (WCE emulator) Debug"${M}
+# PROP Output_Dir "emulatorDbg\\${subdir}"${M}
+# PROP Intermediate_Dir "emulatorDbg\\${subdir}"${M}
+!ELSEIF  "\$(CFG)" == "libvlc - Win32 (WCE emulator) Release"${M}
+# PROP Output_Dir "emulatorRel\\${subdir}"${M}
+# PROP Intermediate_Dir "emulatorRel\\${subdir}"${M}
+!ELSEIF  "\$(CFG)" == "libvlc - Win32 (WCE x86) Debug"${M}
+# PROP Output_Dir "X86Dbg\\${subdir}"${M}
+# PROP Intermediate_Dir "X86Dbg\\${subdir}"${M}
+!ELSEIF  "\$(CFG)" == "libvlc - Win32 (WCE x86) Release"${M}
+# PROP Output_Dir "X86Rel\\${subdir}"${M}
+# PROP Intermediate_Dir "X86Rel\\${subdir}"${M}
 !ENDIF${M}
 # End Source File${M}
 EOF
@@ -338,20 +344,11 @@ EOF
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
-    if test "${target}" = "evc/vlc.vcp"
-    then
-      cat >> ${target} << EOF
-# Begin Source File${M}
-SOURCE="..\\evc\\vlc.c"${M}
-# End Source File${M}
-EOF
-    else
       cat >> ${target} << EOF
 # Begin Source File${M}
 SOURCE="..\\src\\vlc.c"${M}
 # End Source File${M}
 EOF
-    fi
     #  Bottom of the project file - handles resource files too
     perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
@@ -365,14 +362,6 @@ fi
 ##
 if test "${action}" = "po"
 then
-  # create a fake file containing win32 strings
-  rm -f modules/gui/win32/strings.cpp
-  #printf "/* Automatically generated by 'toolbox --update-po', please don't compile */\n" > modules/gui/win32/strings.cpp
-  #find modules/gui/win32 -name '*.dfm' | while read file
-  #do
-  #  printf "\n/*\n * from $file:\n */\n\n" >> modules/gui/win32/strings.cpp
-  #  perl -ne 'chop; chop; if( / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file | grep -v '"-*"' | grep -v '"http://' | grep -v '"vlcs"' >> modules/gui/win32/strings.cpp || exit 1
-  #done
   # find out the source files
   rm -f po/POTFILES.in
   echo "# automatically created by toolbox --update-po" > po/POTFILES.in
@@ -384,7 +373,7 @@ then
   echo "" >> po/POTFILES.in
   echo "# modules" >> po/POTFILES.in
   find modules -name '*.[chm]' -o -name '*.[ch]pp' \
-    | grep -v '\(gui/win32/\|\.moc\.\|gui/gtk2/\)' \
+    | grep -v '\(\.moc\.\|gui/gtk2/\)' \
     | sort >> po/POTFILES.in
   # clean old potfiles
   cd po
@@ -566,20 +555,6 @@ EOF
   exit 0
 fi
 
-##
-##  Fix flexml-generated files
-##
-if test "${action}" = "flexml"
-then
-  cd modules/gui/skins/parser
-  flexml -SH -a skin.act skin.dtd
-  # comment the dummy main function
-  file=skin.c
-  sed 's@int main@//int main@' < $file > $file.$$.bak
-  mv -f $file.$$.bak $file
-  flex -oflex.c -BLs skin.l
-fi
-
 ##
 ##  Make distclean
 ##
@@ -590,7 +565,7 @@ then
   test -f vlc.spec.mdk -a -f debian/rules || 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 -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]*' -exec rm -f '{}' ';')
+  (cd autotools && find . -name '[a-z]*' -maxdepth 1 -exec rm -f '{}' ';')
   (cd debian && find . -type d -name '[a-z]*' -maxdepth 1 -exec rm -Rf '{}' ';')
   find msvc -type f -name '*.dsp' -exec rm -f '{}' ';'
   find evc -type f -name '*.vcp' -exec rm -f '{}' ';'
@@ -625,16 +600,13 @@ then
   #                  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-freefonts with ttf-thryomanes
+  #                  ttf-freefont with ttf-thryomanes
   #                  dvb-dev (>= 1.0.1-6) with dvb-dev
   #          remove libwxgtk2.4-dev
-  #                 libflac-dev
   #                 libidl0 (workaround for mozilla-dev's bad deps)
   #                 libglib2.0-0 (workaround for mozilla-dev's bad deps)
-  #                 libmatroska-dev
-  #                 libspeex-dev
-  #          change Source: vlc with Source: vlc-woody
-  #                 Section: gnome with Section: graphics
+  #                 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)/' \
@@ -646,16 +618,13 @@ then
       -e 's/libdvdread[0-9]*-dev/libdvdread2-dev/' \
       -e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \
       -e 's/, libxosd-dev[^,]*/, libxosd-dev/' \
-      -e 's/, ttf-freefonts[^,]*/, ttf-thryomanes/' \
+      -e 's/, ttf-freefont[^,]*/, ttf-thryomanes/' \
       -e 's/, dvb-dev[^,]*/, dvb-dev/' \
       -e 's/, libwx[^,]*//' \
       -e '/Package: wxvlc/,/^ *$/d' \
-      -e 's/, libflac-dev[^,]*//' \
       -e 's/, libidl0[^,]*//' \
       -e 's/, libglib2.0-0[^,]*//' \
-      -e 's/, libmatroska-dev[^,]*//' \
-      -e 's/, libspeex-dev[^,]*//' \
-      -e 's/Source: vlc/Source: vlc-woody/' \
+      -e 's/, gcc-3.2[^,]*//' \
       -e 's/Section: gnome/Section: graphics/' \
       -e 's/Section: kde/Section: graphics/' \
       -e 's/Section: libdevel/Section: devel/' \
@@ -663,20 +632,15 @@ then
   mv "$1/debian/control.woody" "$1/debian/control"
 
   # rules: remove wxwindows and skins stuff
-  #        remove flac support
-  #        remove matroska support
   sed -e '/# Package: wxvlc/,/^ *$/d' \
       -e 's,--enable-wxwindows,--disable-wxwindows,' \
       -e 's,--enable-skins,--disable-skins,' \
-      -e 's,--enable-flac,--disable-flac,' \
-      -e 's,--enable-mkv,--disable-mkv,' \
-      -e 's,--enable-speex,--disable-speex,' \
       < "$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,' \
+  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