diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-02-03 13:46:35 +0300 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-02-03 13:46:35 +0300 |
commit | cc7eb4fcbd740879c086c216ad06f0b484c942f7 (patch) | |
tree | d969a95825c79f8666a33e72bbfe1f0914b5c988 | |
parent | 9bd9ecb0b751dc3971a8a2931d2c9b4663ce6062 (diff) |
cosmetics in the batch files
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2911 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r-- | build.bat | 6 | ||||
-rw-r--r-- | build_2010.bat | 6 | ||||
-rw-r--r-- | src/apps/mplayerc/mpcresources/patch.bat | 6 | ||||
-rw-r--r-- | src/apps/mplayerc/mpcresources/rcfile.bat | 4 | ||||
-rw-r--r-- | src/apps/mplayerc/mpcresources/sync.bat | 10 | ||||
-rw-r--r-- | update_version.bat | 4 |
6 files changed, 18 insertions, 18 deletions
@@ -60,7 +60,7 @@ ECHO Not all build dependencies found. To build MPC-HC you need: ECHO * Visual Studio 2008 (SP1) installed
ECHO * MinGW 32 bit build environment with MSYS pointed to in MINGW32 env var
ECHO * MinGW 64 bit build environment with MSYS pointed to in MINGW64 env var
-ECHO. && ECHO.
+ECHO. & ECHO.
ECHO Press any key to exit...
PAUSE >NUL
ENDLOCAL
@@ -108,7 +108,7 @@ GOTO END :EndWithError
TITLE Compiling MPC-HC [ERROR]
-ECHO. && ECHO.
+ECHO. & ECHO.
ECHO **ERROR: Build failed and aborted!**
PAUSE
ENDLOCAL
@@ -117,7 +117,7 @@ EXIT :END
TITLE Compiling MPC-HC with MSVC 2008 [FINISHED]
-ECHO. && ECHO.
+ECHO. & ECHO.
ECHO MPC-HC's compilation started on %start_time%
ECHO and completed on %date%-%time%
ECHO.
diff --git a/build_2010.bat b/build_2010.bat index 8f1d89d8a..1c5d0e220 100644 --- a/build_2010.bat +++ b/build_2010.bat @@ -60,7 +60,7 @@ ECHO Not all build dependencies found. To build MPC-HC you need: ECHO * Visual Studio 2010 installed
ECHO * MinGW 32 bit build environment with MSYS pointed to in MINGW32 env var
ECHO * MinGW 64 bit build environment with MSYS pointed to in MINGW64 env var
-ECHO. && ECHO.
+ECHO. & ECHO.
ECHO Press any key to exit...
PAUSE >NUL
ENDLOCAL
@@ -108,7 +108,7 @@ GOTO END :EndWithError
TITLE Compiling MPC-HC [ERROR]
-ECHO. && ECHO.
+ECHO. & ECHO.
ECHO **ERROR: Build failed and aborted!**
PAUSE
ENDLOCAL
@@ -117,7 +117,7 @@ EXIT :END
TITLE Compiling MPC-HC with MSVC 2010 [FINISHED]
-ECHO. && ECHO.
+ECHO. & ECHO.
ECHO MPC-HC's compilation started on %start_time%
ECHO and completed on %date%-%time%
ECHO.
diff --git a/src/apps/mplayerc/mpcresources/patch.bat b/src/apps/mplayerc/mpcresources/patch.bat index d5af9e279..c641735a2 100644 --- a/src/apps/mplayerc/mpcresources/patch.bat +++ b/src/apps/mplayerc/mpcresources/patch.bat @@ -4,9 +4,9 @@ rem A simple script which demonstrates how to apply translated text to locale rc rem This is only an example.
for %%i in (*.rc) do (
-echo Patching file %%i
-perl patch.pl -i text\%%i.txt %%i
-echo ----------------------
+ echo Patching file %%i
+ perl patch.pl -i text\%%i.txt %%i
+ echo ----------------------
)
echo ----------------------
diff --git a/src/apps/mplayerc/mpcresources/rcfile.bat b/src/apps/mplayerc/mpcresources/rcfile.bat index 57da0b32a..a2fe67bff 100644 --- a/src/apps/mplayerc/mpcresources/rcfile.bat +++ b/src/apps/mplayerc/mpcresources/rcfile.bat @@ -5,11 +5,11 @@ rem then rename it to old file for rcfile.pl to process it echo Getting the latest mplayerc.rc from repository...
svn cat -r head ../mplayerc.rc > $$TEMP$$.old
-if %ERRORLEVEL% neq 0 GOTO :NOSVNCLI
+if %ERRORLEVEL% neq 0 goto NOSVNCLI
echo Generating new rc files and string files...
perl rcfile.pl -b $$TEMP$$.old
-goto :END
+goto END
:NOSVNCLI
echo You'll need svn command line tool to use this script.
diff --git a/src/apps/mplayerc/mpcresources/sync.bat b/src/apps/mplayerc/mpcresources/sync.bat index 2baf65f81..46cd2222e 100644 --- a/src/apps/mplayerc/mpcresources/sync.bat +++ b/src/apps/mplayerc/mpcresources/sync.bat @@ -7,13 +7,13 @@ rem This is only an example. echo Get the latest mplayerc.rc from repository first...
svn cat -r head ../mplayerc.rc > $$TEMP$$.old
-if %ERRORLEVEL% neq 0 goto :NOSVNCLI
+if %ERRORLEVEL% neq 0 goto NOSVNCLI
echo ----------------------
for %%i in (*.rc) do (
-echo Patching file %%i
-perl patch.pl -i text\%%i.txt %%i
-echo ----------------------
+ echo Patching file %%i
+ perl patch.pl -i text\%%i.txt %%i
+ echo ----------------------
)
echo ----------------------
@@ -30,7 +30,7 @@ copy ..\mplayerc.rc . perl rcstrings.pl -a
del mplayerc.rc
echo ----------------------
-goto :END
+goto END
:NOSVNCLI
echo You'll need svn command line tool to use this script.
diff --git a/update_version.bat b/update_version.bat index 6b8444d01..aae1adce5 100644 --- a/update_version.bat +++ b/update_version.bat @@ -1,9 +1,9 @@ @ECHO OFF
SubWCRev .\ include\Version_rev.h.in include\Version_rev.h -f
-IF %ERRORLEVEL% NEQ 0 GOTO :NoSubWCRev
+IF %ERRORLEVEL% NEQ 0 GOTO NoSubWCRev
SubWCRev .\ src\apps\mplayerc\res\mpc-hc.exe.manifest.conf src\apps\mplayerc\res\mpc-hc.exe.manifest -f
-IF %ERRORLEVEL% NEQ 0 GOTO :NoSubWCRev
+IF %ERRORLEVEL% NEQ 0 GOTO NoSubWCRev
EXIT /B
|