X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=bootstrap;h=969d805e0d340d25b57b614c7633d379b5ef1792;hb=019f1d068c970413d41cc9b71fbbb1ba78d47881;hp=fa29a3ba3c0bd60c13db5b3773d2fb4dbf5d7719;hpb=003f74f14fccc7ef648d92b80bea6152e71bf01f;p=vlc

diff --git a/bootstrap b/bootstrap
index fa29a3ba3c..969d805e0d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,32 +1,286 @@
 #! /bin/sh
 
 ##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.20 2002/10/25 09:24:29 sam Exp $
+##  $Id: bootstrap,v 1.34 2002/12/17 14:39:05 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
 ###
-###  get a sane environment
+###  Get a sane environment, just in case
 ###
 LANG=C
 export LANG
+CYGWIN=binmode
+export CYGWIN
+
+##
+##  Give help
+##
+help()
+{
+  if test "$do_help" = "yes"
+  then
+    cat << EOF
+recognized flags are:
+  --config        create Makefile and configure scripts (read HACKING)
+  --update-vc     update Microsoft Visual Studio files
+  --update-po     update translation files
+EOF
+    exit 1
+  fi
+}
 
 ###
 ###  argument check
 ###
+test "$EMAIL" = "sam@zoy.org" && do_help=yes || do_help=no
 do_po=no
+do_vc=no
 while test $# -gt 0; do
   case "$1" in
+    --config)
+      do_help=no
+      ;;
+    --update-vc)
+      do_help=no
+      do_vc=yes
+      ;;
     --update-po)
+      do_help=no
       do_po=yes
       ;;
     *)
-      echo "unknown option $1"
+      echo "$0: unknown option $1"
+      do_help=yes
+      help
       ;;
   esac
   shift
 done
 
+##
+##  Give help if needed
+##
+help
+
+##
+##  Update the MSVC project files
+##
+if test "$do_vc" = "yes"
+then
+  if test ! -f Makefile
+  then
+    echo "no Makefile found, did you run ./configure?"
+    exit 1
+  fi
+
+  echo "generating Visual Studio files..."
+
+  #  The evil ^M
+  M='
'
+
+  #  Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :)
+  LIBVLC_SOURCES=`awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_common'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p';  awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_win32'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_dirent'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_getopt'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_libc'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'`
+
+  LIBVLC_HEADERS=`awk 'BEGIN{a=0}{if(!a&&/^'HEADERS_include'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'HEADERS_include_built'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'`
+
+  LIBVLC_PKG_HEADERS=`awk 'BEGIN{a=0}{if(!a&&/^'dist_pkginclude_HEADERS'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'`
+
+  # Clean up
+  rm -f evc/*.vcp msvc/*.dsp
+
+  # libvlc files
+  for target in evc/libvlc.vcp msvc/libvlc.dsp
+  do
+    echo "${target}"
+    #  Top of the project file
+    perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
+    #  The source files
+    for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
+    do
+      cat >> ${target} << EOF
+# Begin Source File${M}
+SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M}
+# End Source File${M}
+EOF
+    done
+    for subdir in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq`
+    do
+      cat >> ${target} << EOF
+# Begin Group "${subdir}"${M}
+EOF
+      for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"`
+      do
+      if test "${target}" = "evc/libvlc.vcp"
+      then
+        cat >> ${target} << EOF
+# Begin Source File${M}
+SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M}
+!IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M}
+# PROP Output_Dir "MIPSRel\\${subdir}"${M}
+# PROP Intermediate_Dir "MIPSRel\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Debug"${M}
+# PROP Output_Dir "MIPSDbg\\${subdir}"${M}
+# PROP Intermediate_Dir "MIPSDbg\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Release"${M}
+# PROP Output_Dir "SH4Rel\\${subdir}"${M}
+# PROP Intermediate_Dir "SH4Rel\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Debug"${M}
+# PROP Output_Dir "SH4Dbg\\${subdir}"${M}
+# PROP Intermediate_Dir "SH4Dbg\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Release"${M}
+# PROP Output_Dir "SH3Rel\\${subdir}"${M}
+# PROP Intermediate_Dir "SH3Rel\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Debug"${M}
+# PROP Output_Dir "SH3Dbg\\${subdir}"${M}
+# PROP Intermediate_Dir "SH3Dbg\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Release"${M}
+# PROP Output_Dir "ARMRel\\${subdir}"${M}
+# PROP Intermediate_Dir "ARMRel\\${subdir}"${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 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}
+!ENDIF${M}
+# End Source File${M}
+EOF
+        else
+          cat >> ${target} << EOF
+# Begin Source File${M}
+SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M}
+!IF "\$(CFG)" == "libvlc - Win32 Release"${M}
+# PROP Output_Dir "Release\\${subdir}"${M}
+# PROP Intermediate_Dir "Release\\${subdir}"${M}
+!ELSEIF "\$(CFG)" == "libvlc - Win32 Debug"${M}
+# PROP Output_Dir "Debug\\${subdir}"${M}
+# PROP Intermediate_Dir "Debug\\${subdir}"${M}
+!ENDIF${M}
+# End Source File${M}
+EOF
+        fi
+      done
+      cat >> ${target} << EOF
+# End Group${M}
+EOF
+    done
+    #  The headers
+    perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target}
+    for file in ${LIBVLC_HEADERS}
+    do
+      cat >> ${target} << EOF
+# Begin Source File${M}
+SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+# End Source File${M}
+EOF
+    done
+    cat >> ${target} << EOF
+# Begin Group "vlc"${M}
+EOF
+    for file in ${LIBVLC_PKG_HEADERS}
+    do
+      cat >> ${target} << EOF
+# Begin Source File${M}
+SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
+# End Source File${M}
+EOF
+    done
+    cat >> ${target} << EOF
+# End Group${M}
+EOF
+    perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+  done
+
+  # plugins files
+  grep '^L_[^ ]*_pic =' Modules.am | while read a b c
+  do
+    makefile="`echo $c | sed -e 's@/[^/]*$@/Modules.am@'`"
+    plugin="`echo $a | sed 's/L_\(.*\)_pic/\1/'`"
+    # 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'`
+    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
+    do
+      test "${dir}" = "evc" && suf="vcp" || suf="dsp"
+      source="${dir}/plugins.${suf}.in"
+      target="${dir}/plugin_${plugin}.${suf}"
+      echo "${target}"
+      perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${plugin}'/g' < ${source} > ${target}
+      for cfile in ${cfiles}
+      do
+        cat >> ${target} << EOF
+# Begin Source File${M}
+SOURCE="..\\${cfile}"${M}
+# End Source File${M}
+EOF
+      done
+      # sed is really nicer for this... unfortunately it's broken under cygwin
+      # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target}
+      perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target}
+      for hfile in ${hfiles}
+      do
+        cat >> ${target} << EOF
+# Begin Source File${M}
+SOURCE="..\\${hfile}"${M}
+# End Source File${M}
+EOF
+      done
+      # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
+      perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
+    done
+  done
+
+  # vlc files
+  for target in evc/vlc.vcp msvc/vlc.dsp
+  do
+    echo "${target}"
+    #  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
+
+  echo "done."
+  exit 0
+fi
+
+##
+##  Update the potfiles because no one ever does it
+##
+if test "$do_po" = "yes"
+then
+  cd po
+  make update-po #2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
+  cd ..
+
+  exit 0
+fi
+
 ##
 ## Check that our tools don't suck
 ##
@@ -38,6 +292,7 @@ fi
 
 PERLSUCKS=no
 AUTOMAKESUCKS=no
+INSTALLSUCKS=no
 
 ##
 ## Generate the modules makefile, by parsing modules/**/Modules.am
@@ -126,6 +381,7 @@ L_builtin += \$(L_${mod}_b)
 L_builtin_pic += \$(L_${mod}_pic)
 LDFLAGS_builtin += \$(F_${mod}_b)
 ${PRIVATE}BUILT_SOURCES += \$(B_${mod}_p) \$(B_${mod}_b)
+PLUGIN_FILES += \$(D_${mod}_p)
 
 ${PRIVATE}${sym}_lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
 ${NODIST}${PRIVATE}nodist_${sym}_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
@@ -152,10 +408,9 @@ libvlc_LIBRARIES += \$(L_${mod}_b) \$(L_${mod}_pic)
 lib${mod}_DATA = \$(D_${mod}_p)
 
 lib${mod}dir = \$(libdir)/vlc/${topdir}
-MOSTLYCLEANFILES += \$(D_${mod}_p)
 ${PRIVATE}noinst_LIBRARIES += \$(L_${mod}_p)
 ${PRIVATE}${dir}/lib${mod}_plugin\$(LIBEXT): \$(${sym}_lib${mod}_plugin_a_OBJECTS)
-${PRIVATE}	\$(${LINKER}) \$^ -o \$@ -shared \$(LDFLAGS_plugins) \$(LDFLAGS_${mod})
+${PRIVATE}	\$(${LINKER}) \$^ -shared \$(LDFLAGS_plugins) \$(LDFLAGS_${mod})
 
 
 EOF
@@ -171,7 +426,7 @@ echo "done."
 ###  classic bootstrap stuff
 ###
 set -x
-rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
+rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
 rm -Rf intl
 
 # Check for gettext
@@ -199,28 +454,36 @@ fi
 
 # Check for automake
 amvers="none"
-if automake-1.6 --version >/dev/null 2>&1
+if automake-1.7 --version >/dev/null 2>&1
 then
-  amvers="-1.6"
-  if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1
-  then AUTOMAKESUCKS=yes
-  fi
+  amvers="-1.7"
 else
-  if automake-1.5 --version >/dev/null 2>&1
+  if automake-1.6 --version >/dev/null 2>&1
   then
-    amvers="-1.5"
+    amvers="-1.6"
+    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1
+    then AUTOMAKESUCKS=yes
+    fi
   else
-    if automake --version > /dev/null 2>&1
+    if automake-1.5 --version >/dev/null 2>&1
     then
-      amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q`
-      case $amvers in
-      1.6|1.6.0|1.6.1)
-        AUTOMAKESUCKS=yes ;;
-      esac
-
-      if expr "$amvers" "<" "1.5" > /dev/null 2>&1
-      then amvers="none"
-      else amvers=""
+      INSTALLSUCKS=yes
+      amvers="-1.5"
+    else
+      if automake --version > /dev/null 2>&1
+      then
+        amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q`
+        case $amvers in
+        1.6|1.6.0|1.6.1)
+          AUTOMAKESUCKS=yes ;;
+        1.5.*)
+          INSTALLSUCKS=yes ;;
+        esac
+
+        if expr "$amvers" "<" "1.5" > /dev/null 2>&1
+        then amvers="none"
+        else amvers=""
+        fi
       fi
     fi
   fi
@@ -244,12 +507,14 @@ case "$PERLSUCKS" in
   ;;
   yes)
     set +x
-    echo ""
-    echo "==========================================================="
-    echo "IMPORTANT NOTE: automake failed. On certain systems this is"
-    echo "because of insufficient stack size. Please set the stack"
-    echo "size to something bigger or unlimited (\`unlimit stacksize')"
-    echo "and try again."
+    cat << EOF
+
+=======================================================================
+IMPORTANT NOTE: automake failed, please check the error messages. If it
+actually segfaulted, it might be because of insufficient stack size; set
+the stack size to something bigger or unlimited (\`unlimit stacksize')
+and try again.
+EOF
     exit 1
   ;;
 esac
@@ -293,7 +558,7 @@ EOF
         -e 's#_("--")#"--"#' \
         -e 's#_("/dev/dvd")#"/dev/dvd"#' \
         -e 's#_(\("./."\))#\1#' \
-	< modules/gui/gtk/$file >> /tmp/$$.$file.bak
+        < modules/gui/gtk/$file >> /tmp/$$.$file.bak
     mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
 fi
 done
@@ -306,18 +571,6 @@ then
     mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
 fi
 
-##
-##  Update the potfiles because no one ever does it
-##
-if test "$do_po" = "no"
-then
-  echo "not updating potfiles. use --update-po to force doing it."
-else
-  cd po
-  make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
-  cd ..
-fi
-
 ##
 ##  Tell the user about gettext and sed
 ##
@@ -325,17 +578,21 @@ case "$GETTEXT" in
   yes)
   ;;
   no)
-    echo ""
-    echo "==========================================================="
-    echo "IMPORTANT NOTE: you do not have gettext installed on your"
-    echo "system. The vlc build will work, but you will not have"
-    echo "internationalization support. We suggest installing gettext."
+    cat << EOF
+
+===========================================================
+IMPORTANT NOTE: you do not have gettext installed on your
+system. The vlc build will work, but you will not have
+internationalization support. We suggest installing gettext.
+EOF
   ;;
   old)
-    echo ""
-    echo "=========================================================="
-    echo "NOTE: you have an old version of gettext installed on your"
-    echo "system. We suggest upgrading to gettext 0.11.3 or later."
+    cat << EOF
+
+==========================================================
+NOTE: you have an old version of gettext installed on your
+system. We suggest upgrading to gettext 0.11.3 or later.
+EOF
   ;;
 esac
 
@@ -343,12 +600,29 @@ case "$AUTOMAKESUCKS" in
   no)
   ;;
   yes)
-    echo ""
-    echo "============================================================="
-    echo "IMPORTANT NOTE: your version of automake has a bug which will"
-    echo "prevent proper plugin compilation. Either compile VLC with"
-    echo "the --disable-plugins flag, or use a version of automake newer"
-    echo "than 1.6.1 (1.6.2 is OK, and so are the 1.5 series)."
+    cat << EOF
+
+=============================================================
+IMPORTANT NOTE: your version of automake has a bug which will
+prevent proper plugin compilation. Either compile VLC with
+the --disable-plugins flag, or use a version of automake newer
+than 1.6.1 (1.6.2 is OK, and so are the 1.5 series).
+EOF
+  ;;
+esac
+
+case "$INSTALLSUCKS" in
+  no)
+  ;;
+  yes)
+    cat << EOF
+
+=============================================================
+IMPORTANT NOTE: your version of automake has a bug which will
+prevent proper installation. Do not use "make install" with this
+version of automake, or use a version of automake newer than 1.5
+(such as 1.6 or 1.7).
+EOF
   ;;
 esac
 
@@ -356,12 +630,14 @@ case "$SEDSUCKS" in
   no)
   ;;
   yes)
-    echo ""
-    echo "============================================================="
-    echo "IMPORTANT NOTE: the version of 'sed' on your system is unable"
-    echo "to handle long lines. bootstrap will try its best to generate"
-    echo "a correct Makefile, but you should expect problems. We highly"
-    echo "recommend installing GNU sed."
+    cat << EOF
+
+=============================================================
+IMPORTANT NOTE: the version of 'sed' on your system is unable
+to handle long lines. bootstrap will try its best to generate
+a correct Makefile, but you should expect problems. We highly
+recommend installing GNU sed.
+EOF
   ;;
 esac