X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=9adb9a83e32121bc281aed6295592667d948c86f;hb=5ca3fb1cd427871afb2f0ec3f02dc15914405fac;hp=b626ad477ea44728c982f059612defd6ee4fbfcf;hpb=bb1ef14f0a2d4f7a71912bee5cb04dd2af3723d9;p=vlc

diff --git a/toolbox b/toolbox
index b626ad477e..9adb9a83e3 100755
--- a/toolbox
+++ b/toolbox
@@ -29,6 +29,7 @@ recognized flags are:
   --update-glade2         generate and fix Glade 2 code
   --update-flexml         generate and fix flexml and flex code
   --distclean             "make distclean" on steroids
+  --dist-contrib          add the contrib dir to MAKE_DIST
   --make-woody <dir>      change distdir <dir> to a woody distdir
 EOF
   exit 1
@@ -85,6 +86,9 @@ case "$1" in
   --add-include)
     action=include
     ;;
+  --dist-contrib)
+    action=contrib
+    ;;
   --help)
     help
     ;;
@@ -212,6 +216,12 @@ 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}
@@ -338,20 +348,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 +366,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 +377,7 @@ then
   echo "" >> po/POTFILES.in
   echo "# modules" >> po/POTFILES.in
   find modules -name '*.[chm]' -o -name '*.[ch]pp' \
-    | grep -v '\(gui/wxwindows/wizard\|\.moc\.\|gui/gtk2/\)' \
+    | grep -v '\(\.moc\.\|gui/gtk2/\)' \
     | sort >> po/POTFILES.in
   # clean old potfiles
   cd po
@@ -407,10 +400,15 @@ 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
+  mkdir -p "${builddir}/include"
+
   LIBVLC_HEADERS=`getfiles HEADERS_include`
   BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
 
-  file="${srcdir}/include/vlc_symbols.h"
+  file="${builddir}/include/vlc_symbols.h"
 
   rm -f ${file}.in
   echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> ${file}.in
@@ -428,10 +426,10 @@ then
     mv -f ${file}.in ${file}
   fi
 
-  file="${srcdir}/src/misc/modules_plugin.h"
+  file="${builddir}/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
+  rm -f ${file}.tmp
+  sed -e 's#.*\$[I][d]:.*# * Automatically generated from '${file}'.in by bootstrap#' < ${srcdir}/src/misc/modules_plugin.h.in > ${file}.tmp
   echo '#define STORE_SYMBOLS( p_symbols ) \' >> ${file}.tmp
   cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/    (p_symbols)->\2_inner = \2; \\/' >> ${file}.tmp
   echo '' >> ${file}.tmp
@@ -443,9 +441,9 @@ then
     mv -f ${file}.tmp ${file}
   fi
 
-  file="${srcdir}/src/misc/modules_builtin.h"
+  file="${builddir}/src/misc/modules_builtin.h"
 
-  rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
+  rm -f ${file}.tmp && cp ${srcdir}/src/misc/modules_builtin.h.in ${file}.tmp
   if test -n "${BUILTINS}"
   then
     for i in `echo ${BUILTINS}`
@@ -589,6 +587,37 @@ then
   # FIXME: a lot of Makefiles are still there
 fi
 
+##
+## Add the extras/contrib dir to the distribution
+##
+if test "${action}" = "contrib"
+then
+  set -x
+  if test ! -d "${distdir}/extras"
+  then
+    mkdir "${distdir}/extras"
+  fi
+  if test ! -d "${distdir}/extras/contrib"
+  then
+    mkdir "${distdir}/extras/contrib"
+  fi
+  cp "${srcdir}/extras/contrib/Makefile" "${distdir}/extras/contrib/Makefile"
+  cp "${srcdir}/extras/contrib/README" "${distdir}/extras/contrib/README"
+  cp "${srcdir}/extras/contrib/bootstrap" "${distdir}/extras/contrib/bootstrap"
+  cp "${srcdir}/extras/contrib/change_prefix.sh" "${distdir}/extras/contrib/change_prefix.sh"
+  if test ! -d "${distdir}/extras/contrib/src"
+  then
+    mkdir "${distdir}/extras/contrib/src"
+  fi
+  cp "${srcdir}/extras/contrib/src/Makefile" "${distdir}/extras/contrib/src/Makefile"
+  cp "${srcdir}/extras/contrib/src/packages.mak" "${distdir}/extras/contrib/src/packages.mak"
+  if test ! -d "${distdir}/extras/contrib/src/Patches"
+  then
+    mkdir "${distdir}/extras/contrib/src/Patches"
+  fi
+  cp ${srcdir}/extras/contrib/src/Patches/* "${distdir}/extras/contrib/src/Patches/"
+fi
+
 ##
 ##  Build a woody-friendly package
 ##