Don't use char outside ascii in shell script.

diff --git a/msvc/libvlc.dsp.in b/msvc/libvlc.dsp.in
index 3ed9fa75aadd8efa20372895fd79bef252fa6d93..d39b81cccfcb5597bdf0d5661c77f57bd6482e19 100644 (file)
--- a/msvc/libvlc.dsp.in
+++ b/msvc/libvlc.dsp.in
@@ -83,11 +83,11 @@ LIB32=link.exe -lib
 \r
 # Begin Group "Source Files"\r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-§SOURCES§\r
+ZSOURCESZ\r
 # End Group\r
 # Begin Group "Header Files"\r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-§HEADERS§\r
+ZHEADERSZ\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/msvc/libvlc.vcproj.in b/msvc/libvlc.vcproj.in
index 2c8d204d1fd5970b3ec400e0f4d61c455f31e2a2..1afb7895a40feab139ac79c2ca4079c8b5c038bf 100644 (file)
--- a/msvc/libvlc.vcproj.in
+++ b/msvc/libvlc.vcproj.in
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="7.10"\r
        Name="liblvc"\r
-       ProjectGUID="{§GUID§}"\r
+       ProjectGUID="{ZGUIDZ}"\r
        RootNamespace="libvlc"\r
        Keyword="Win32Proj">\r
        <Platforms>\r
@@ -102,10 +102,10 @@
        </References>\r
        <Files>\r
                <Filter Name="Source Files" Filter="c;cpp">\r
-                        §SOURCES§\r
+                        ZSOURCESZ\r
                </Filter>\r
                <Filter Name="Header Files" Filter="h;hpp">\r
-                        §HEADERS§\r
+                        ZHEADERSZ\r
                </Filter>\r
        </Files>\r
        <Globals>\r

diff --git a/msvc/plugins.dsp.in b/msvc/plugins.dsp.in
index e318c059faebbe387c96f370f8f74136233246f3..068ea417f10770845385c25a10bf0fd5221e3445 100644 (file)
--- 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>\r
+# Microsoft Developer Studio Project File - Name="plugin_ZPLUGINZ" - Package Owner=<4>\r
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Console Application" 0x0103\r
 \r
-CFG=plugin_§PLUGIN§ - Win32 Debug\r
+CFG=plugin_ZPLUGINZ - Win32 Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "plugin_§PLUGIN§.mak".\r
+!MESSAGE NMAKE /f "plugin_ZPLUGINZ.mak".\r
 !MESSAGE \r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "plugin_§PLUGIN§.mak" CFG="plugin_§PLUGIN§ - Win32 Debug"\r
+!MESSAGE NMAKE /f "plugin_ZPLUGINZ.mak" CFG="plugin_ZPLUGINZ - Win32 Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "plugin_§PLUGIN§ - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "plugin_§PLUGIN§ - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "plugin_ZPLUGINZ - Win32 Release" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "plugin_ZPLUGINZ - Win32 Debug" (based on "Win32 (x86) Console Application")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -28,7 +28,7 @@ CFG=plugin_
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 Release"\r
+!IF  "$(CFG)" == "plugin_ZPLUGINZ - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -49,10 +49,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# 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"\r
-# 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"\r
+# 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"\r
+# 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"\r
 \r
-!ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "plugin_ZPLUGINZ - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -73,23 +73,23 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# 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"\r
+# 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"\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# 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"\r
+# 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"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
-# Name "plugin_§PLUGIN§ - Win32 Release"\r
-# Name "plugin_§PLUGIN§ - Win32 Debug"\r
+# Name "plugin_ZPLUGINZ - Win32 Release"\r
+# Name "plugin_ZPLUGINZ - Win32 Debug"\r
 \r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 \r
-§SOURCES§\r
+ZSOURCESZ\r
 \r
 # End Group\r
 \r
@@ -97,7 +97,7 @@ LINK32=link.exe
 \r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 \r
-§HEADERS§\r
+ZHEADERSZ\r
 \r
 # End Group\r
 \r

diff --git a/msvc/plugins.vcproj.in b/msvc/plugins.vcproj.in
index dee4eaad4a0e96823afd274a8c05084f7118c405..e30ee531488948d796e32927de867e6db6b18a95 100644 (file)
--- a/msvc/plugins.vcproj.in
+++ b/msvc/plugins.vcproj.in
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="7.10"\r
-       Name="§PLUGIN§"\r
-       ProjectGUID="{§GUID§}"\r
-       RootNamespace="§PLUGIN§"\r
+       Name="ZPLUGINZ"\r
+       ProjectGUID="{ZGUIDZ}"\r
+       RootNamespace="ZPLUGINZ"\r
        Keyword="Win32Proj">\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +21,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".;..\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__VLC__;__PLUGIN__;MODULE_NAME=§PLUGIN§"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__VLC__;__PLUGIN__;MODULE_NAME=ZPLUGINZ"\r
                                MinimalRebuild="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -72,7 +72,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories=".;..\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;__VLC__;__PLUGIN__;MODULE_NAME=§PLUGIN§"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;__VLC__;__PLUGIN__;MODULE_NAME=ZPLUGINZ"\r
                                RuntimeLibrary="4"\r
                                UsePrecompiledHeader="3"\r
                                WarningLevel="3"\r
@@ -115,10 +115,10 @@
        </References>\r
        <Files>\r
                <Filter Name="Source Files" Filter="c;cpp">\r
-                        §SOURCES§\r
+                        ZSOURCESZ\r
                </Filter>\r
                <Filter Name="Header Files" Filter="h;hpp">\r
-                        §HEADERS§\r
+                        ZHEADERSZ\r
                </Filter>\r
        </Files>\r
        <Globals>\r

diff --git a/msvc/vlc.dsp.in b/msvc/vlc.dsp.in
index a1001a798be30fdf939e38992727286257cbd226..f7e9f5854afa398cc1a7914a59ef8a959afd54e4 100644 (file)
--- a/msvc/vlc.dsp.in
+++ b/msvc/vlc.dsp.in
@@ -86,7 +86,7 @@ LINK32=link.exe
 \r
 # Begin Group "Source Files"\r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-§SOURCES§\r
+ZSOURCESZ\r
 # End Group\r
 \r
 # Begin Group "Resource Files"\r

diff --git a/msvc/vlc.vcproj.in b/msvc/vlc.vcproj.in
index 2787ce9d38bd325791f6ad12c67936717ab26c03..9db9e6aa62739989873fea1d9536a90058566b7e 100644 (file)
--- a/msvc/vlc.vcproj.in
+++ b/msvc/vlc.vcproj.in
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="7.10"\r
        Name="vlc"\r
-       ProjectGUID="{§GUID§}"\r
+       ProjectGUID="{ZGUIDZ}"\r
        Keyword="Win32Proj">\r
        <Platforms>\r
                <Platform\r
@@ -118,7 +118,7 @@
        </References>\r
        <Files>\r
                <Filter Name="Source Files" Filter="cpp;c">\r
-                       §SOURCES§\r
+                       ZSOURCESZ\r
                </Filter>\r
                <Filter Name="Resource Files" Filter="rc">\r
                        <File RelativePath="..\share\vlc_win32_rc.rc"></File>\r

diff --git a/toolbox b/toolbox
index fd7bbe6f6fb1377b39fc0122ff033e34f50199d8..23420a1fc2d8e750cb44e92bde4be6d49b21f905 100755 (executable)
--- 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
 <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