Skip to content

Commit 9af93fe

Browse files
magreenblattmagreenblatt
committed
Windows: Rename RC variable which breaks cmake (fixes issue chromiumembedded#222)
1 parent 3b11538 commit 9af93fe

File tree

9 files changed

+42
-36
lines changed

9 files changed

+42
-36
lines changed

‎tools/compile.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
:: reserved. Use of this source code is governed by a BSD-style license
44
:: that can be found in the LICENSE file.
55

6+
set RETURNCODE=
67
setlocal
7-
set RC=
88
cd ..
99

1010
if "%1" == "" (
@@ -24,11 +24,11 @@ xcopy /sfy .\java\tests\detailed\handler\*.html %OUT_PATH%\tests\detailed\handle
2424
xcopy /sfy .\java\tests\detailed\handler\*.png %OUT_PATH%\tests\detailed\handler\
2525

2626
:end
27-
endlocal & set RC=%ERRORLEVEL%
27+
endlocal & set RETURNCODE=%ERRORLEVEL%
2828
goto omega
2929

3030
:returncode
31-
exit /B %RC%
31+
exit /B %RETURNCODE%
3232

3333
:omega
34-
call :returncode %RC%
34+
call :returncode %RETURNCODE%

‎tools/make_all_jni_headers.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
:: reserved. Use of this source code is governed by a BSD-style license
44
:: that can be found in the LICENSE file.
55

6+
set RETURNCODE=
67
setlocal
7-
set RC=
88

99
if "%1" == "" (
1010
echo ERROR: Please specify a target platform: win32 or win64
@@ -48,11 +48,11 @@ call make_jni_header.bat %1 org.cef.network.CefWebPluginInfo_N
4848
call make_jni_header.bat %1 org.cef.network.CefWebPluginManager_N
4949

5050
:end
51-
endlocal & set RC=%ERRORLEVEL%
51+
endlocal & set RETURNCODE=%ERRORLEVEL%
5252
goto omega
5353

5454
:returncode
55-
exit /B %RC%
55+
exit /B %RETURNCODE%
5656

5757
:omega
58-
call :returncode %RC%
58+
call :returncode %RETURNCODE%

‎tools/make_distrib.bat‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
:: reserved. Use of this source code is governed by a BSD-style license
44
:: that can be found in the LICENSE file.
55

6+
set RETURNCODE=
67
setlocal
7-
set RC=
8+
89
cd ..
910

1011
if "%1" == "" (
@@ -90,11 +91,11 @@ xcopy /sfy %JOGAMP_PATH%\*.LICENSE.txt %DISTRIB_PATH%
9091
xcopy /sfy %TOOLS_DISTRIB_PATH%\* %DISTRIB_PATH% /exclude:.\tools\distrib\EXCLUDE_FILES.txt
9192

9293
:end
93-
endlocal & set RC=%ERRORLEVEL%
94+
endlocal & set RETURNCODE=%ERRORLEVEL%
9495
goto omega
9596

9697
:returncode
97-
exit /B %RC%
98+
exit /B %RETURNCODE%
9899

99100
:omega
100-
call :returncode %RC%
101+
call :returncode %RETURNCODE%

‎tools/make_docs.bat‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
:: reserved. Use of this source code is governed by a BSD-style license
44
:: that can be found in the LICENSE file.
55

6+
set RETURNCODE=
67
setlocal
7-
set RC=
8+
89
cd ..\java
910

1011
set OUT_PATH="..\out\docs"
@@ -13,11 +14,11 @@ if not exist %OUT_PATH% mkdir %OUT_PATH%
1314
javadoc -Xdoclint:none -windowtitle "CEF3 Java API Docs" -footer "<center><a href="https://bitbucket.org/chromiumembedded/java-cef" target="_top">Chromium Embedded Framework (CEF)</a> Copyright &copy 2013 Marshall A. Greenblatt</center>" -nodeprecated -d %OUT_PATH% -link http://docs.oracle.com/javase/7/docs/api/ -subpackages org.cef
1415

1516
:end
16-
endlocal & set RC=%ERRORLEVEL%
17+
endlocal & set RETURNCODE=%ERRORLEVEL%
1718
goto omega
1819

1920
:returncode
20-
exit /B %RC%
21+
exit /B %RETURNCODE%
2122

2223
:omega
23-
call :returncode %RC%
24+
call :returncode %RETURNCODE%

‎tools/make_jar.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
:: reserved. Use of this source code is governed by a BSD-style license
44
:: that can be found in the LICENSE file.
55

6+
set RETURNCODE=
67
setlocal
7-
set RC=
88

99
if "%1" == "" (
1010
echo ERROR: Please specify a build target: win32 or win64
@@ -16,11 +16,11 @@ jar -cf jcef.jar org/cef/*.class org/cef/browser/*.class org/cef/callback/*.clas
1616
jar -cf jcef-tests.jar tests/detailed/*.class tests/detailed/dialog/*.class tests/detailed/handler/* tests/detailed/ui/*.class
1717

1818
:end
19-
endlocal & set RC=%ERRORLEVEL%
19+
endlocal & set RETURNCODE=%ERRORLEVEL%
2020
goto omega
2121

2222
:returncode
23-
exit /B %RC%
23+
exit /B %RETURNCODE%
2424

2525
:omega
26-
call :returncode %RC%
26+
call :returncode %RETURNCODE%

‎tools/make_jni_header.bat‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
:: reserved. Use of this source code is governed by a BSD-style license
44
:: that can be found in the LICENSE file.
55

6+
set RETURNCODE=
67
setlocal
7-
set RC=
8+
89
cd ..
910

1011
if "%1" == "" (
@@ -34,11 +35,11 @@ for /F "tokens=1,* delims=." %%F in (%TMP%) DO (
3435
call javah.exe -force -classpath %CLS_PATH% -o %OUT_PATH%/%CLS_NAME%.h %2
3536

3637
:end
37-
endlocal & set RC=%ERRORLEVEL%
38+
endlocal & set RETURNCODE=%ERRORLEVEL%
3839
goto omega
3940

4041
:returncode
41-
exit /B %RC%
42+
exit /B %RETURNCODE%
4243

4344
:omega
44-
call :returncode %RC%
45+
call :returncode %RETURNCODE%

‎tools/make_readme.bat‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
:: reserved. Use of this source code is governed by a BSD-style license
44
:: that can be found in the LICENSE file.
55

6+
set RETURNCODE=
67
setlocal
7-
set RC=
8+
89
cd ..
910
if "%1" == "" (
1011
echo ERROR: Please specify a target platform: win32 or win64
@@ -19,11 +20,11 @@ if not exist %DISTRIB_PATH% mkdir %DISTRIB_PATH%
1920
call python tools\make_readme.py --output-dir %DISTRIB_PATH%\ --platform %1
2021

2122
:end
22-
endlocal & set RC=%ERRORLEVEL%
23+
endlocal & set RETURNCODE=%ERRORLEVEL%
2324
goto omega
2425

2526
:returncode
26-
exit /B %RC%
27+
exit /B %RETURNCODE%
2728

2829
:omega
29-
call :returncode %RC%
30+
call :returncode %RETURNCODE%

‎tools/run.bat‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
:: reserved. Use of this source code is governed by a BSD-style license
44
:: that can be found in the LICENSE file.
55

6+
set RETURNCODE=
67
setlocal
7-
set RC=
8+
89
cd ..
910

1011
if "%1" == "" (
@@ -51,11 +52,11 @@ goto loop1
5152
java -cp %CLS_PATH% -Djava.library.path=%LIB_PATH% tests.%RUN_TYPE%.MainFrame %RESTVAR%
5253

5354
:end
54-
endlocal & set RC=%ERRORLEVEL%
55+
endlocal & set RETURNCODE=%ERRORLEVEL%
5556
goto omega
5657

5758
:returncode
58-
exit /B %RC%
59+
exit /B %RETURNCODE%
5960

6061
:omega
61-
call :returncode %RC%
62+
call :returncode %RETURNCODE%

‎tools/run_tests.bat‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
:: reserved. Use of this source code is governed by a BSD-style license
44
:: that can be found in the LICENSE file.
55

6+
set RETURNCODE=
67
setlocal
7-
set RC=
8+
89
cd ..
910

1011
if "%1" == "" (
@@ -52,11 +53,11 @@ set PATH="%JAVA_HOME%\bin"
5253
java -Djava.library.path=%LIB_PATH% -jar .\third_party\junit\junit-platform-console-standalone-1.4.2.jar -cp %OUT_PATH% --disable-ansi-colors --select-package tests.junittests %RESTVAR%
5354

5455
:end
55-
endlocal & set RC=%ERRORLEVEL%
56+
endlocal & set RETURNCODE=%ERRORLEVEL%
5657
goto omega
5758

5859
:returncode
59-
exit /B %RC%
60+
exit /B %RETURNCODE%
6061

6162
:omega
62-
call :returncode %RC%
63+
call :returncode %RETURNCODE%

0 commit comments

Comments
 (0)