Skip to content

GitLab

Commit f84a3bf3 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

Don't use char outside ascii in shell script.

parent dc723a84
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 51 deletions
msvc/libvlc.dsp.in
View file @ f84a3bf3
......@@ -83,11 +83,11 @@ LIB32=link.exe -lib
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
SOURCES
ZSOURCESZ
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
HEADERS
ZHEADERSZ
# End Group
# End Target
# End Project
msvc/libvlc.vcproj.in
View file @ f84a3bf3
......@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="liblvc"
ProjectGUID="{GUID}"
ProjectGUID="{ZGUIDZ}"
RootNamespace="libvlc"
Keyword="Win32Proj">
<Platforms>
......@@ -102,10 +102,10 @@
</References>
<Files>
<Filter Name="Source Files" Filter="c;cpp">
SOURCES
ZSOURCESZ
</Filter>
<Filter Name="Header Files" Filter="h;hpp">
HEADERS
ZHEADERSZ
</Filter>
</Files>
<Globals>
......
msvc/plugins.dsp.in
View file @ f84a3bf3
# Microsoft Developer Studio Project File - Name="plugin_PLUGIN" - Package Owner=<4>
# Microsoft Developer Studio Project File - Name="plugin_ZPLUGINZ" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=plugin_PLUGIN - Win32 Debug
CFG=plugin_ZPLUGINZ - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "plugin_PLUGIN.mak".
!MESSAGE NMAKE /f "plugin_ZPLUGINZ.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "plugin_PLUGIN.mak" CFG="plugin_PLUGIN - Win32 Debug"
!MESSAGE NMAKE /f "plugin_ZPLUGINZ.mak" CFG="plugin_ZPLUGINZ - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "plugin_PLUGIN - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "plugin_PLUGIN - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "plugin_ZPLUGINZ - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "plugin_ZPLUGINZ - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
......@@ -28,7 +28,7 @@ CFG=plugin_
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "plugin_PLUGIN - Win32 Release"
!IF "$(CFG)" == "plugin_ZPLUGINZ - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
......@@ -49,10 +49,10 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib /nologo /dll /machine:I386 /entry:_CRT_INIT@12 /out:"plugins\libPLUGIN_plugin.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib comctl32.lib rpcrt4.lib /nologo /dll /machine:I386 /entry:_CRT_INIT@12 /opt:ref /out:"plugins\libPLUGIN_plugin.dll"
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib /nologo /dll /machine:I386 /entry:_CRT_INIT@12 /out:"plugins\libZPLUGINZ_plugin.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib comctl32.lib rpcrt4.lib /nologo /dll /machine:I386 /entry:_CRT_INIT@12 /opt:ref /out:"plugins\libZPLUGINZ_plugin.dll"
!ELSEIF "$(CFG)" == "plugin_PLUGIN - Win32 Debug"
!ELSEIF "$(CFG)" == "plugin_ZPLUGINZ - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
......@@ -73,23 +73,23 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib /nologo /dll /subsystem:console /debug /machine:I386 /pdbtype:sept /entry:_CRT_INIT@12 /pdb:"plugins\libPLUGIN_plugin.pdb" /out:"plugins\libPLUGIN_plugin.dll"
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib /nologo /dll /subsystem:console /debug /machine:I386 /pdbtype:sept /entry:_CRT_INIT@12 /pdb:"plugins\libZPLUGINZ_plugin.pdb" /out:"plugins\libZPLUGINZ_plugin.dll"
# SUBTRACT BASE LINK32 /pdb:none
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib comctl32.lib rpcrt4.lib /nologo /dll /subsystem:console /debug /machine:I386 /pdbtype:sept /entry:_CRT_INIT@12 /pdb:"plugins\libPLUGIN_plugin.pdb" /out:"plugins\libPLUGIN_plugin.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib comctl32.lib rpcrt4.lib /nologo /dll /subsystem:console /debug /machine:I386 /pdbtype:sept /entry:_CRT_INIT@12 /pdb:"plugins\libZPLUGINZ_plugin.pdb" /out:"plugins\libZPLUGINZ_plugin.dll"
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
# Name "plugin_PLUGIN - Win32 Release"
# Name "plugin_PLUGIN - Win32 Debug"
# Name "plugin_ZPLUGINZ - Win32 Release"
# Name "plugin_ZPLUGINZ - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
SOURCES
ZSOURCESZ
# End Group
......@@ -97,7 +97,7 @@ LINK32=link.exe
# PROP Default_Filter "h;hpp;hxx;hm;inl"
HEADERS
ZHEADERSZ
# End Group
......
msvc/plugins.vcproj.in
View file @ f84a3bf3
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="PLUGIN"
ProjectGUID="{GUID}"
RootNamespace="PLUGIN"
Name="ZPLUGINZ"
ProjectGUID="{ZGUIDZ}"
RootNamespace="ZPLUGINZ"
Keyword="Win32Proj">
<Platforms>
<Platform
......@@ -21,7 +21,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\include"
PreprocessorDefinitions="WIN32;_DEBUG;__VLC__;__PLUGIN__;MODULE_NAME=PLUGIN"
PreprocessorDefinitions="WIN32;_DEBUG;__VLC__;__PLUGIN__;MODULE_NAME=ZPLUGINZ"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
......@@ -72,7 +72,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".;..\include"
PreprocessorDefinitions="WIN32;NDEBUG;__VLC__;__PLUGIN__;MODULE_NAME=PLUGIN"
PreprocessorDefinitions="WIN32;NDEBUG;__VLC__;__PLUGIN__;MODULE_NAME=ZPLUGINZ"
RuntimeLibrary="4"
UsePrecompiledHeader="3"
WarningLevel="3"
......@@ -115,10 +115,10 @@
</References>
<Files>
<Filter Name="Source Files" Filter="c;cpp">
SOURCES
ZSOURCESZ
</Filter>
<Filter Name="Header Files" Filter="h;hpp">
HEADERS
ZHEADERSZ
</Filter>
</Files>
<Globals>
......
msvc/vlc.dsp.in
View file @ f84a3bf3
......@@ -86,7 +86,7 @@ LINK32=link.exe
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
SOURCES
ZSOURCESZ
# End Group
# Begin Group "Resource Files"
......
msvc/vlc.vcproj.in
View file @ f84a3bf3
......@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="vlc"
ProjectGUID="{GUID}"
ProjectGUID="{ZGUIDZ}"
Keyword="Win32Proj">
<Platforms>
<Platform
......@@ -118,7 +118,7 @@
</References>
<Files>
<Filter Name="Source Files" Filter="cpp;c">
SOURCES
ZSOURCESZ
</Filter>
<Filter Name="Resource Files" Filter="rc">
<File RelativePath="..\share\vlc_win32_rc.rc"></File>
......
toolbox
View file @ f84a3bf3
......@@ -178,7 +178,7 @@ then
do
printf "."
# Top of the project file
perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
perl -pe 'if(/ZSOURCESZ/){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(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){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(/ZHEADERSZ/){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(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${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,/ZSOURCESZ/d; /ZHEADERSZ/,$d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){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,/ZHEADERSZ/d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/ZHEADERSZ/){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(/ZSOURCESZ/){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(/ZSOURCESZ/){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(/ZSOURCESZ/){last;} s/ZGUIDZ/'${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(/ZSOURCESZ/){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(/ZSOURCESZ/){last;} s/ZGUIDZ/'${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(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){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(/ZHEADERSZ/){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(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${mod}'/g' < ${source} | sed 's,ZGUIDZ,'${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,/ZSOURCESZ/d; /ZHEADERSZ/,$d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){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,/ZHEADERSZ/d; p' < ${source} >> ${target}
perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${source} >> ${target}
done
done
done
......
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