Skip to content

V
vlc-gpu
Commit 1e9c5147 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Attempt to fix make distcheck

parent 8e326efe
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 32 deletions
toolbox
View file @ 1e9c5147
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
## Copyright (C) 2005 the VideoLAN team ## Copyright (C) 2005 the VideoLAN team
## ##
## Authors: Samuel Hocevar <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
## Rmi Denis-Courmont <rem # videolan.org> ## Rémi Denis-Courmont <rem # videolan.org>
### ###
### Get a sane environment, just in case ### Get a sane environment, just in case
...@@ -178,7 +178,7 @@ then ...@@ -178,7 +178,7 @@ then
do do
printf "." printf "."
# Top of the project file # Top of the project file
perl -pe 'if(/SOURCES/){last;}' < ${target}.in > ${target} perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
# The source files # The source files
for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
do do
...@@ -275,7 +275,7 @@ EOF ...@@ -275,7 +275,7 @@ EOF
EOF EOF
done done
# The headers # The headers
perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){if(/HEADERS/){last;}print $_}' < ${target}.in >> ${target} perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target}
for file in ${LIBVLC_HEADERS} for file in ${LIBVLC_HEADERS}
do do
cat >> ${target} << EOF cat >> ${target} << EOF
...@@ -298,7 +298,7 @@ EOF ...@@ -298,7 +298,7 @@ EOF
cat >> ${target} << EOF cat >> ${target} << EOF
# End Group${M} # End Group${M}
EOF EOF
perl -e 'while(<>){if(/HEADERS/){last;}}while(<>){print $_}' < ${target}.in >> ${target} perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
done done
# plugins files # plugins files
...@@ -319,7 +319,7 @@ EOF ...@@ -319,7 +319,7 @@ EOF
source="${msdir}/plugins.${suf}.in" source="${msdir}/plugins.${suf}.in"
target="${msdir}/plugin_${mod}.${suf}" target="${msdir}/plugin_${mod}.${suf}"
printf "." printf "."
perl -pe 'if(/SOURCES/){last;} s/PLUGIN/'${mod}'/g' < ${source} > ${target} perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
for cfile in ${cfiles} for cfile in ${cfiles}
do do
cat >> ${target} << EOF cat >> ${target} << EOF
...@@ -336,8 +336,8 @@ SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M} ...@@ -336,8 +336,8 @@ SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M}
EOF EOF
done done
# sed is really nicer for this... unfortunately it's broken under cygwin # sed is really nicer for this... unfortunately it's broken under cygwin
# sed -ne '1,/SOURCES/d; /HEADERS/,$d; p' < ${source} >> ${target} # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){if(/HEADERS/){last;}print $_}' < ${source} >> ${target} perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target}
for hfile in ${hfiles} for hfile in ${hfiles}
do do
cat >> ${target} << EOF cat >> ${target} << EOF
...@@ -346,8 +346,8 @@ SOURCE="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"${M} ...@@ -346,8 +346,8 @@ SOURCE="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"${M}
# End Source File${M} # End Source File${M}
EOF EOF
done done
# sed -ne '1,/HEADERS/d; p' < ${source} >> ${target} # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/HEADERS/){last;}}while(<>){print $_}' < ${source} >> ${target} perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
done done
done done
done done
...@@ -357,7 +357,7 @@ EOF ...@@ -357,7 +357,7 @@ EOF
do do
printf "." printf "."
# Top of the project file # Top of the project file
perl -pe 'if(/SOURCES/){last;}' < ${target}.in > ${target} perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
# The source files # The source files
cat >> ${target} << EOF cat >> ${target} << EOF
# Begin Source File${M} # Begin Source File${M}
...@@ -365,7 +365,7 @@ SOURCE="..\\src\\vlc.c"${M} ...@@ -365,7 +365,7 @@ SOURCE="..\\src\\vlc.c"${M}
# End Source File${M} # End Source File${M}
EOF EOF
# Bottom of the project file - handles resource files too # Bottom of the project file - handles resource files too
perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){print $_}' < ${target}.in >> ${target} perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
done done
echo " done." echo " done."
...@@ -415,20 +415,20 @@ then ...@@ -415,20 +415,20 @@ then
printf "." printf "."
# Top of the project file # Top of the project file
guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'`
perl -pe 'if(/SOURCES/){last;} s/GUID/'${guid}'/g' < ${target}.in > ${target} perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target}
# The source files # The source files
cat >> ${target} << EOF cat >> ${target} << EOF
<File RelativePath="..\\src\\vlc.c"></File>${M} <File RelativePath="..\\src\\vlc.c"></File>${M}
EOF EOF
# Bottom of the project file - handles resource files too # Bottom of the project file - handles resource files too
perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){print $_}' < ${target}.in >> ${target} perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
# libvlc files # libvlc files
target=msvc/libvlc.vcproj target=msvc/libvlc.vcproj
printf "." printf "."
# Top of the project file # Top of the project file
guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'`
perl -pe 'if(/SOURCES/){last;} s/GUID/'${guid}'/g' < ${target}.in > ${target} perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target}
# The source files # The source files
for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
do do
...@@ -463,7 +463,7 @@ EOF ...@@ -463,7 +463,7 @@ EOF
EOF EOF
done done
# The headers # The headers
perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){if(/HEADERS/){last;}print $_}' < ${target}.in >> ${target} perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target}
for file in ${LIBVLC_HEADERS} for file in ${LIBVLC_HEADERS}
do do
cat >> ${target} << EOF cat >> ${target} << EOF
...@@ -482,7 +482,7 @@ EOF ...@@ -482,7 +482,7 @@ EOF
cat >> ${target} << EOF cat >> ${target} << EOF
</Filter>${M} </Filter>${M}
EOF EOF
perl -e 'while(<>){if(/HEADERS/){last;}}while(<>){print $_}' < ${target}.in >> ${target} perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
# plugins files # plugins files
for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' ${srcdir}/configure.ac` for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' ${srcdir}/configure.ac`
...@@ -502,7 +502,7 @@ EOF ...@@ -502,7 +502,7 @@ EOF
target="${msdir}/plugin_${mod}.vcproj" target="${msdir}/plugin_${mod}.vcproj"
printf "." printf "."
guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'`
perl -pe 'if(/SOURCES/){last;} s/PLUGIN/'${mod}'/g' < ${source} | sed 's,GUID,'${guid}',' > ${target} perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} | sed 's,§GUID§,'${guid}',' > ${target}
for cfile in ${cfiles} for cfile in ${cfiles}
do do
cat >> ${target} << EOF cat >> ${target} << EOF
...@@ -510,16 +510,16 @@ EOF ...@@ -510,16 +510,16 @@ EOF
EOF EOF
done done
# sed is really nicer for this... unfortunately it's broken under cygwin # sed is really nicer for this... unfortunately it's broken under cygwin
# sed -ne '1,/SOURCES/d; /HEADERS/,$d; p' < ${source} >> ${target} # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){if(/HEADERS/){last;}print $_}' < ${source} >> ${target} perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target}
for hfile in ${hfiles} for hfile in ${hfiles}
do do
cat >> ${target} << EOF cat >> ${target} << EOF
<File RelativePath="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"></File>${M} <File RelativePath="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"></File>${M}
EOF EOF
done done
# sed -ne '1,/HEADERS/d; p' < ${source} >> ${target} # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/HEADERS/){last;}}while(<>){print $_}' < ${source} >> ${target} perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
done done
done done
done done
...@@ -556,33 +556,34 @@ then ...@@ -556,33 +556,34 @@ then
file="${builddir}/src/misc/modules_builtin.h" file="${builddir}/src/misc/modules_builtin.h"
rm -f ${file}.tmp && cp ${srcdir}/src/misc/modules_builtin.h.in ${file}.tmp rm -f "${file}.tmp"
cat "${srcdir}/src/misc/modules_builtin.h.in" > "${file}.tmp" || exit 1
if test -n "${BUILTINS}" if test -n "${BUILTINS}"
then then
for i in `echo ${BUILTINS}` for i in `echo ${BUILTINS}`
do do
echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >>${file}.tmp echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >> "${file}.tmp"
done done
echo "" >> ${file}.tmp echo "" >> "${file}.tmp"
fi fi
echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp
echo " do \\" >> ${file}.tmp echo " do \\" >> "${file}.tmp"
echo " { \\" >> ${file}.tmp echo " { \\" >> "${file}.tmp"
if test -n "${BUILTINS}" if test -n "${BUILTINS}"
then then
for i in `echo ${BUILTINS}` for i in `echo ${BUILTINS}`
do do
echo " ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> ${file}.tmp echo " ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> "${file}.tmp"
done done
fi fi
echo " } while( 0 );" >> ${file}.tmp echo " } while( 0 );" >> "${file}.tmp"
echo "" >> ${file}.tmp echo "" >> "${file}.tmp" || exit 1
if diff >/dev/null 2>&1 ${file} ${file}.tmp if diff >/dev/null 2>&1 "${file}" "${file}.tmp"
then then
rm -f ${file}.tmp rm -f "${file}.tmp"
else else
echo "creating new ${file}" echo "creating new ${file}"
mv -f ${file}.tmp ${file} mv -f "${file}.tmp" "${file}"
fi fi
exit 0 exit 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment