From f84a3bf3cd31e9ed9b5b004c7a24d3e6cd13ce82 Mon Sep 17 00:00:00 2001 From: Christophe Mutricy Date: Fri, 7 Apr 2006 21:14:52 +0000 Subject: [PATCH] Don't use char outside ascii in shell script. --- msvc/libvlc.dsp.in | 4 ++-- msvc/libvlc.vcproj.in | 6 +++--- msvc/plugins.dsp.in | 32 ++++++++++++++++---------------- msvc/plugins.vcproj.in | 14 +++++++------- msvc/vlc.dsp.in | 2 +- msvc/vlc.vcproj.in | 4 ++-- toolbox | 40 ++++++++++++++++++++-------------------- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/msvc/libvlc.dsp.in b/msvc/libvlc.dsp.in index 3ed9fa75aa..d39b81cccf 100644 --- a/msvc/libvlc.dsp.in +++ b/msvc/libvlc.dsp.in @@ -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 diff --git a/msvc/libvlc.vcproj.in b/msvc/libvlc.vcproj.in index 2c8d204d1f..1afb7895a4 100644 --- a/msvc/libvlc.vcproj.in +++ b/msvc/libvlc.vcproj.in @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="liblvc" - ProjectGUID="{§GUID§}" + ProjectGUID="{ZGUIDZ}" RootNamespace="libvlc" Keyword="Win32Proj"> @@ -102,10 +102,10 @@ - §SOURCES§ + ZSOURCESZ - §HEADERS§ + ZHEADERSZ diff --git a/msvc/plugins.dsp.in b/msvc/plugins.dsp.in index e318c059fa..068ea417f1 100644 --- a/msvc/plugins.dsp.in +++ b/msvc/plugins.dsp.in @@ -1,24 +1,24 @@ -# 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\lib§PLUGIN§_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\lib§PLUGIN§_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\lib§PLUGIN§_plugin.pdb" /out:"plugins\lib§PLUGIN§_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\lib§PLUGIN§_plugin.pdb" /out:"plugins\lib§PLUGIN§_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 diff --git a/msvc/plugins.vcproj.in b/msvc/plugins.vcproj.in index dee4eaad4a..e30ee53148 100644 --- a/msvc/plugins.vcproj.in +++ b/msvc/plugins.vcproj.in @@ -2,9 +2,9 @@ - §SOURCES§ + ZSOURCESZ - §HEADERS§ + ZHEADERSZ diff --git a/msvc/vlc.dsp.in b/msvc/vlc.dsp.in index a1001a798b..f7e9f5854a 100644 --- a/msvc/vlc.dsp.in +++ b/msvc/vlc.dsp.in @@ -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" diff --git a/msvc/vlc.vcproj.in b/msvc/vlc.vcproj.in index 2787ce9d38..9db9e6aa62 100644 --- a/msvc/vlc.vcproj.in +++ b/msvc/vlc.vcproj.in @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="vlc" - ProjectGUID="{§GUID§}" + ProjectGUID="{ZGUIDZ}" Keyword="Win32Proj"> - §SOURCES§ + ZSOURCESZ diff --git a/toolbox b/toolbox index fd7bbe6f6f..23420a1fc2 100755 --- a/toolbox +++ b/toolbox @@ -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 ${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 ${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 ${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 -- GitLab