X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=3dbb217e21c9ea618a5843c96aef834c14a93b65;hb=488790df5f7ad325db16fa25c5b64d58ff26b28b;hp=a941e06c17d6fcf1230ee96fb4db75463c892715;hpb=be7e3f05a32652f3a484a19f922730613fce992e;p=vlc

diff --git a/toolbox b/toolbox
index a941e06c17..3dbb217e21 100755
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.46 2003/10/24 14:50:07 sam Exp $
+##  $Id: toolbox,v 1.52 2003/12/09 14:33:31 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -119,8 +119,8 @@ then
   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/^  *$//' | \
-    uniq > ChangeLog.tmp
+    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}" \
@@ -136,7 +136,7 @@ fi
 ##
 if test "${action}" = "vc"
 then
-  echo "generating Visual Studio files..."
+  echo "generating Visual Studio files"
 
   if test -z "${srcdir}"; then
     srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
@@ -158,12 +158,12 @@ then
   LIBVLC_PKG_HEADERS=`getfiles dist_pkginclude_HEADERS`
 
   # Clean up
-  rm -f evc/*.vcp msvc/*.dsp
+  rm -f evc/*.vcp msvc/*.dsp msvc/*.vcproj msvc/*.sln msvc/*.ncb
 
   # config files
   for target in evc/config.h msvc/config.h
   do
-    echo "${target}"
+    printf "."
     rm -f ${target}
     sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \
         -e "s/@VERSION@/${LIBVLC_VERSION}/" \
@@ -173,7 +173,7 @@ then
   # libvlc files
   for target in evc/libvlc.vcp msvc/libvlc.dsp
   do
-    echo "${target}"
+    printf "."
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
@@ -193,6 +193,7 @@ EOF
 EOF
       for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"`
       do
+      subdir="`echo ${file} | sed -e 's%/[^/]*$%/%' | sed -e 's%/%\\\\%g'`"
       if test "${target}" = "evc/libvlc.vcp"
       then
         cat >> ${target} << EOF
@@ -296,7 +297,7 @@ EOF
         test "${msdir}" = "evc" && suf="vcp" || suf="dsp"
         source="${msdir}/plugins.${suf}.in"
         target="${msdir}/plugin_${mod}.${suf}"
-        echo "${target}"
+        printf "."
         perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
         for cfile in ${cfiles}
         do
@@ -304,6 +305,12 @@ 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}
+!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}
+!ELSEIF "\$(CFG)" == "plugin_${mod} - Win32 Debug"${M}
+# PROP Output_Dir "Debug\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M}
+# PROP Intermediate_Dir "Debug\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M}
 # End Source File${M}
 EOF
         done
@@ -327,7 +334,7 @@ EOF
   # vlc files
   for target in evc/vlc.vcp msvc/vlc.dsp
   do
-    echo "${target}"
+    printf "."
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
@@ -349,7 +356,7 @@ EOF
     perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
 
-  echo "done."
+  echo " done."
   exit 0
 fi
 
@@ -372,7 +379,7 @@ then
   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_\)' \
+    | grep -v '\(vlc_symbols\|misc/modules_\|\.moc\.\)' \
     | sort >> po/POTFILES.in
   echo "" >> po/POTFILES.in
   echo "# modules" >> po/POTFILES.in
@@ -596,6 +603,7 @@ then
   #                  libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev
   #                  libxosd-dev (>=2.2.4-1.3) with libxosd-dev
   #                  ttf-freefonts 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)
@@ -616,6 +624,7 @@ then
       -e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \
       -e 's/, libxosd-dev[^,]*/, libxosd-dev/' \
       -e 's/, ttf-freefonts[^,]*/, ttf-thryomanes/' \
+      -e 's/, dvb-dev[^,]*/, dvb-dev/' \
       -e 's/, libwx[^,]*//' \
       -e '/Package: wxvlc/,/^ *$/d' \
       -e 's/, libflac-dev[^,]*//' \