* configure.ac:

[vlc] / toolbox

diff --git a/toolbox b/toolbox
index 44b4c4c3dbdf88b1a985d457b3194d34f9de4721..a865af1292a2eaf2baa198331a2bdc9087d93fd8 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.28 2003/06/27 13:50:07 sam Exp $
+##  $Id: toolbox,v 1.36 2003/07/01 19:17:32 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -20,13 +20,13 @@ help()
 {
   cat << EOF
 recognized flags are:
-  --update-changelog      update the CVS changelog
   --update-vc             update Microsoft Visual Studio files
   --update-po             update translation files
   --update-includes       generate various include files
   --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"
 EOF
   exit 1
@@ -37,9 +37,10 @@ EOF
 ##
 getfiles()
 {
-  awk 'BEGIN{a=0}{if(!a&&/^'"$1"'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | \
+  awk 'BEGIN{a=0}{if(!a&&$0~/^'"$1"'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if($0~/^[a-zA-Z]/){exit;}print $0}}' < "${srcdir}/Makefile.am" | \
     tr '\\ ' '\n\n' | \
-    sed -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'
+    sed -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p' | \
+    sed -e "s,^,${srcdir}/,"
 }
 
 ###
@@ -52,7 +53,7 @@ then
 fi
 
 case "$1" in
-  --update-changelog)
+  --changelog|--update-changelog)
     action=changelog
     ;;
   --update-vc)
@@ -91,12 +92,21 @@ shift
 ##
 if test "${action}" = "changelog"
 then
+  set -e
+  set -x
   cvs2cl --help >/dev/null 2>&1 || exit 1
-  rm -f ChangeLog
-  cvs2cl --utc --hide-filenames --no-wrap -w --stdout | \
+  rm -f ChangeLog ChangeLog.tmp
+  cvs2cl --utc --hide-filenames --no-wrap -w --stdout -g -z9 | \
     sed -e 's/^[^0-9]/ /' -e 's/^  *$//' | \
-    uniq > ChangeLog
+    uniq > ChangeLog.tmp
+  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
   exit 0
+  # To generate changelog for the year 2001:
+  # sed -ne '/^2001/,/^2000/{/^2000/d;p}'
 fi
 
 ##
@@ -106,8 +116,10 @@ if test "${action}" = "vc"
 then
   echo "generating Visual Studio files..."
 
+  srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
+
   #  The evil ^M
-  M='\r'
+  M="`printf '\r'`"
 
   #  Variables we get from configure.ac
   LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac`
@@ -251,7 +263,7 @@ EOF
     # 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.
-    cfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${makefile} | awk 'BEGIN{a=0}{if(!a&&/^SOURCES_'${plugin}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p'`
+    cfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${makefile} | awk 'BEGIN{a=0}{if(!a&&$0~/^SOURCES_'${plugin}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if($0~/^[a-zA-Z]/){exit;}print $0}}' | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p'`
     hfiles=`for i in ${cfiles} ; do echo $i ; done | grep '\.h$'`
     cfiles=`for i in ${cfiles} ; do echo $i ; done | grep -v '\.h$'`
     for dir in evc msvc
@@ -355,10 +367,11 @@ if test "${action}" = "includes"
 then
   #set -x
 
+  srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
   LIBVLC_HEADERS=`getfiles HEADERS_include`
   BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
 
-  file=include/vlc_symbols.h
+  file="${srcdir}/include/vlc_symbols.h"
 
   rm -f ${file}.in
   echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> ${file}.in
@@ -376,7 +389,7 @@ then
     mv -f ${file}.in ${file}
   fi
 
-  file=src/misc/modules_plugin.h
+  file="${srcdir}/src/misc/modules_plugin.h"
 
   rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
   sed -e 's#.*\$[I][d]:.*# * Automatically generated from '${file}'.in by bootstrap#' < ${file}.in > ${file}.tmp
@@ -391,10 +404,10 @@ then
     mv -f ${file}.tmp ${file}
   fi
 
-  file=src/misc/modules_builtin.h
+  file="${srcdir}/src/misc/modules_builtin.h"
 
   rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
-  if test "${BUILTINS}" != ""
+  if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
     do
@@ -405,7 +418,7 @@ then
   echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp
   echo "    do \\" >> ${file}.tmp
   echo "    { \\" >> ${file}.tmp
-  if test "${BUILTINS}" != ""
+  if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
     do