videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Attempt to fix make distcheck

pull/2/head
Rémi Denis-Courmont 21 years ago
parent
8e326efee2
commit
1e9c5147e1
1 changed files with 33 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 65
      toolbox

65
toolbox
View File

@ -6,7 +6,7 @@
## Copyright (C) 2005 the VideoLAN team
##
## Authors: Samuel Hocevar <sam@zoy.org>
## Rémi Denis-Courmont <rem # videolan.org>
## Rémi Denis-Courmont <rem # videolan.org>
###
### Get a sane environment, just in case
@ -178,7 +178,7 @@ then
do
printf "."
# Top of the project file
perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
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
@ -275,7 +275,7 @@ EOF
EOF
done
# 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}
do
cat >> ${target} << EOF
@ -298,7 +298,7 @@ EOF
cat >> ${target} << EOF
# End Group${M}
EOF
perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
done
# plugins files
@ -319,7 +319,7 @@ EOF
source="${msdir}/plugins.${suf}.in"
target="${msdir}/plugin_${mod}.${suf}"
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}
do
cat >> ${target} << EOF
@ -336,8 +336,8 @@ SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${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}
# 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
@ -346,8 +346,8 @@ SOURCE="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"${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}
# sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
done
done
done
@ -357,7 +357,7 @@ EOF
do
printf "."
# Top of the project file
perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
# The source files
cat >> ${target} << EOF
# Begin Source File${M}
@ -365,7 +365,7 @@ SOURCE="..\\src\\vlc.c"${M}
# End Source File${M}
EOF
# 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
echo " done."
@ -415,20 +415,20 @@ then
printf "."
# 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'`
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
cat >> ${target} << EOF
<File RelativePath="..\\src\\vlc.c"></File>${M}
EOF
# 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
target=msvc/libvlc.vcproj
printf "."
# 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'`
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
for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
do
@ -463,7 +463,7 @@ EOF
EOF
done
# 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}
do
cat >> ${target} << EOF
@ -482,7 +482,7 @@ EOF
cat >> ${target} << EOF
</Filter>${M}
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
for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' ${srcdir}/configure.ac`
@ -502,7 +502,7 @@ EOF
target="${msdir}/plugin_${mod}.vcproj"
printf "."
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}
do
cat >> ${target} << EOF
@ -510,16 +510,16 @@ EOF
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}
# 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
<File RelativePath="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"></File>${M}
EOF
done
# sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
# sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
done
done
done
@ -556,33 +556,34 @@ then
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}"
then
for i in `echo ${BUILTINS}`
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
echo "" >> ${file}.tmp
echo "" >> "${file}.tmp"
fi
echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp
echo " do \\" >> ${file}.tmp
echo " { \\" >> ${file}.tmp
echo " do \\" >> "${file}.tmp"
echo " { \\" >> "${file}.tmp"
if test -n "${BUILTINS}"
then
for i in `echo ${BUILTINS}`
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
fi
echo " } while( 0 );" >> ${file}.tmp
echo "" >> ${file}.tmp
if diff >/dev/null 2>&1 ${file} ${file}.tmp
echo " } while( 0 );" >> "${file}.tmp"
echo "" >> "${file}.tmp" || exit 1
if diff >/dev/null 2>&1 "${file}" "${file}.tmp"
then
rm -f ${file}.tmp
rm -f "${file}.tmp"
else
echo "creating new ${file}"
mv -f ${file}.tmp ${file}
mv -f "${file}.tmp" "${file}"
fi
exit 0

Write Preview
Loading…
Cancel
Save