Skip to content

Commit be04304

Browse files
author
nitrocaster
committed
Deployment scripts: use copy when cp is not present.
1 parent 435918a commit be04304

File tree

2 files changed

+73
-56
lines changed

2 files changed

+73
-56
lines changed

‎xrbinprep.cmd‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,46 @@ if not exist %game_root% (
1717
echo path not found: %game_root%
1818
goto ret
1919
)
20+
set game_root=!game_root:"=!
2021
for /f "delims=" %%a in ('chdir') do set git_root=%%a
21-
set git_root="%git_root%"
2222
pushd %game_root%
2323
set bin_dbg_win32=_bin_dbg_Win32
2424
set bin_mix_win32=_bin_mix_Win32
2525
set bin_rel_win32=_bin_rel_Win32
2626
set xbin=%bin_dbg_win32% %bin_mix_win32% %bin_rel_win32%
27+
28+
where cp >nul 2>nul
29+
if %errorLevel% neq 0 (
30+
set cp_tool=copy /Y
31+
) else (
32+
set cp_tool=cp
33+
)
34+
2735
for %%b in (%xbin%) do (
2836
if not exist %%b (
2937
mkdir %%b
3038
)
3139
if not exist %%b\dedicated (
3240
mkdir %%b\dedicated
3341
)
34-
cp bin\dbghelp.dll %%b\dbghelp.dll
35-
cp bin\eax.dll %%b\eax.dll
36-
cp bin\wrap_oal.dll %%b\wrap_oal.dll
37-
cp bin\eax.dll %%b\dedicated\eax.dll
38-
cp bin\wrap_oal.dll %%b\dedicated\wrap_oal.dll
39-
cp %git_root%\src\Externals\OpenSSL\bin\libeay32.dll %%b\libeay32.dll
40-
cp %git_root%\src\Externals\OpenSSL\bin\ssleay32.dll %%b\ssleay32.dll
42+
%cp_tool% bin\dbghelp.dll %%b\dbghelp.dll
43+
%cp_tool% bin\eax.dll %%b\eax.dll
44+
%cp_tool% bin\wrap_oal.dll %%b\wrap_oal.dll
45+
%cp_tool% bin\eax.dll %%b\dedicated\eax.dll
46+
%cp_tool% bin\wrap_oal.dll %%b\dedicated\wrap_oal.dll
47+
%cp_tool% "%git_root%\src\Externals\OpenSSL\bin\libeay32.dll" %%b\libeay32.dll
48+
%cp_tool% "%git_root%\src\Externals\OpenSSL\bin\ssleay32.dll" %%b\ssleay32.dll
4149
)
42-
cp %git_root%\src\Externals\BugTrap\bin\BugTrapD.dll %bin_dbg_win32%\BugTrap.dll
43-
cp %git_root%\src\Externals\BugTrap\bin\BugTrap.dll %bin_mix_win32%\BugTrap.dll
44-
cp %git_root%\src\Externals\BugTrap\bin\BugTrap.dll %bin_rel_win32%\BugTrap.dll
50+
%cp_tool% "%git_root%\src\Externals\BugTrap\bin\BugTrapD.dll" %bin_dbg_win32%\BugTrap.dll
51+
%cp_tool% "%git_root%\src\Externals\BugTrap\bin\BugTrap.dll" %bin_mix_win32%\BugTrap.dll
52+
%cp_tool% "%git_root%\src\Externals\BugTrap\bin\BugTrap.dll" %bin_rel_win32%\BugTrap.dll
4553
if exist gamedata (
4654
echo gamedata already exists. Remove/rename it, then
4755
echo create soft link to "%git_root%\res\gamedata"
4856
echo -or-
4957
echo run this script again
5058
) else (
51-
mklink /D gamedata %git_root%\res\gamedata
59+
mklink /D gamedata "%git_root%\res\gamedata"
5260
)
5361
popd
5462
call :make_binup Win32 Debug
@@ -63,12 +71,12 @@ set platform=%~1
6371
set conf=%~2
6472
set fname=.xrbinup_%conf%_%platform%.cmd
6573
( ^
66-
echo @echo off && ^
67-
echo setlocal && ^
68-
echo set src=%git_root% && ^
69-
echo set dst=%game_root% && ^
70-
echo call xrbinup.cmd %%dst%% %%src%% %platform% %conf% && ^
71-
echo endlocal ) ^
74+
echo @echo off&& ^
75+
echo setlocal&& ^
76+
echo set src=%git_root%&& ^
77+
echo set dst=!game_root!&& ^
78+
echo call xrbinup.cmd "%%dst%%" "%%src%%" %platform% %conf%&& ^
79+
echo endlocal) ^
7280
> %fname%
7381
endlocal
7482
goto:eof

‎xrbinup.cmd‎

Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -33,65 +33,74 @@ goto ret
3333
:platform_ok
3434
set cfg=%4
3535
if %cfg%==Debug (
36-
set dst=%1\_bin_dbg
36+
set dst=%1
37+
set dst=!dst:"=!\_bin_dbg
3738
goto cfg_ok
3839
)
3940
if %cfg%==Mixed (
40-
set dst=%1\_bin_mix
41+
set dst=%1
42+
set dst=!dst:"=!\_bin_mix
4143
goto cfg_ok
4244
)
4345
if %cfg%==Release (
44-
set dst=%1\_bin_rel
46+
set dst=%1
47+
set dst=!dst:"=!\_bin_rel
4548
goto cfg_ok
4649
)
4750
echo invalid configuration: %cfg%
4851
goto ret
4952

5053
:cfg_ok
51-
set dst=%dst%_%platform%
52-
set src=%2\bin\%platform%\%cfg%
54+
set dst=!dst!_%platform%
55+
set src=%2
56+
set src=!src:"=!\bin\%platform%\%cfg%
5357

54-
set cp_tool=cp
58+
where cp >nul 2>nul
59+
if %errorLevel% neq 0 (
60+
set cp_tool=copy /Y
61+
) else (
62+
set cp_tool=cp
63+
)
5564

56-
%cp_tool% %src%\xrEngine.exe %dst%\xrEngine.exe
57-
%cp_tool% %src%\xrAPI.dll %dst%\xrAPI.dll
58-
%cp_tool% %src%\xrCore.dll %dst%\xrCore.dll
59-
%cp_tool% %src%\xrCDB.dll %dst%\xrCDB.dll
60-
%cp_tool% %src%\xrSound.dll %dst%\xrSound.dll
61-
%cp_tool% %src%\xrParticles.dll %dst%\xrParticles.dll
62-
%cp_tool% %src%\xrPhysics.dll %dst%\xrPhysics.dll
63-
%cp_tool% %src%\xrD3D9-Null.dll %dst%\xrD3D9-Null.dll
64-
%cp_tool% %src%\xrAICore.dll %dst%\xrAICore.dll
65-
%cp_tool% %src%\xrScriptEngine.dll %dst%\xrScriptEngine.dll
66-
%cp_tool% %src%\xrGame.dll %dst%\xrGame.dll
67-
%cp_tool% %src%\xrGameSpy.dll %dst%\xrGameSpy.dll
68-
%cp_tool% %src%\xrNetServer.dll %dst%\xrNetServer.dll
69-
%cp_tool% %src%\xrRender_R1.dll %dst%\xrRender_R1.dll
70-
%cp_tool% %src%\xrRender_R2.dll %dst%\xrRender_R2.dll
71-
%cp_tool% %src%\xrRender_R3.dll %dst%\xrRender_R3.dll
72-
%cp_tool% %src%\xrRender_R4.dll %dst%\xrRender_R4.dll
73-
%cp_tool% %src%\xrRender_GL.dll %dst%\xrRender_GL.dll
65+
%cp_tool% "!src!\xrEngine.exe" "!dst!\xrEngine.exe"
66+
%cp_tool% "!src!\xrAPI.dll" "!dst!\xrAPI.dll"
67+
%cp_tool% "!src!\xrCore.dll" "!dst!\xrCore.dll"
68+
%cp_tool% "!src!\xrCDB.dll" "!dst!\xrCDB.dll"
69+
%cp_tool% "!src!\xrSound.dll" "!dst!\xrSound.dll"
70+
%cp_tool% "!src!\xrParticles.dll" "!dst!\xrParticles.dll"
71+
%cp_tool% "!src!\xrPhysics.dll" "!dst!\xrPhysics.dll"
72+
%cp_tool% "!src!\xrD3D9-Null.dll" "!dst!\xrD3D9-Null.dll"
73+
%cp_tool% "!src!\xrAICore.dll" "!dst!\xrAICore.dll"
74+
%cp_tool% "!src!\xrScriptEngine.dll" "!dst!\xrScriptEngine.dll"
75+
%cp_tool% "!src!\xrGame.dll" "!dst!\xrGame.dll"
76+
%cp_tool% "!src!\xrGameSpy.dll" "!dst!\xrGameSpy.dll"
77+
%cp_tool% "!src!\xrNetServer.dll" "!dst!\xrNetServer.dll"
78+
%cp_tool% "!src!\xrRender_R1.dll" "!dst!\xrRender_R1.dll"
79+
%cp_tool% "!src!\xrRender_R2.dll" "!dst!\xrRender_R2.dll"
80+
%cp_tool% "!src!\xrRender_R3.dll" "!dst!\xrRender_R3.dll"
81+
%cp_tool% "!src!\xrRender_R4.dll" "!dst!\xrRender_R4.dll"
82+
%cp_tool% "!src!\xrRender_GL.dll" "!dst!\xrRender_GL.dll"
7483
if %platform%==Win32 (
75-
%cp_tool% %src%\amd_ags_x86.dll %dst%\amd_ags_x86.dll
84+
%cp_tool% "!src!\amd_ags_x86.dll" "!dst!\amd_ags_x86.dll"
7685
)
7786
if %platform%==Win64 (
78-
%cp_tool% %src%\amd_ags_x64.dll %dst%\amd_ags_x64.dll
87+
%cp_tool% "!src!\amd_ags_x64.dll" "!dst!\amd_ags_x64.dll"
7988
)
80-
%cp_tool% %src%\xrXMLParser.dll %dst%\xrXMLParser.dll
89+
%cp_tool% "!src!\xrXMLParser.dll" "!dst!\xrXMLParser.dll"
8190
rem CxImage is compiled as DLLs only in debug configuration
8291
if %cfg%==Debug (
83-
%cp_tool% %src%\CxImage.dll %dst%\CxImage.dll
92+
%cp_tool% "!src!\CxImage.dll" "!dst!\CxImage.dll"
8493
)
85-
%cp_tool% %src%\LuaJIT.dll %dst%\LuaJIT.dll
86-
%cp_tool% %src%\luabind.dll %dst%\luabind.dll
87-
%cp_tool% %src%\ODE.dll %dst%\ODE.dll
88-
%cp_tool% %src%\OpenAL32.dll %dst%\OpenAL32.dll
89-
%cp_tool% %src%\OpenAL32.dll %dst%\dedicated\OpenAL32.dll
90-
%cp_tool% %src%_Dedicated\dedicated\xrEngine.exe %dst%\dedicated\xrEngine.exe
91-
%cp_tool% %src%\xrWeatherEditor.dll %dst%\xrWeatherEditor.dll
92-
%cp_tool% %src%\xrManagedApi.dll %dst%\xrManagedApi.dll
93-
%cp_tool% %src%\xrSdkControls.dll %dst%\xrSdkControls.dll
94-
%cp_tool% %src%\xrPostprocessEditor.exe %dst%\xrPostprocessEditor.exe
94+
%cp_tool% "!src!\LuaJIT.dll" "!dst!\LuaJIT.dll"
95+
%cp_tool% "!src!\luabind.dll" "!dst!\luabind.dll"
96+
%cp_tool% "!src!\ODE.dll" "!dst!\ODE.dll"
97+
%cp_tool% "!src!\OpenAL32.dll" "!dst!\OpenAL32.dll"
98+
%cp_tool% "!src!\OpenAL32.dll" "!dst!\dedicated\OpenAL32.dll"
99+
%cp_tool% "!src!_Dedicated\dedicated\xrEngine.exe" "!dst!\dedicated\xrEngine.exe"
100+
%cp_tool% "!src!\xrWeatherEditor.dll" "!dst!\xrWeatherEditor.dll"
101+
%cp_tool% "!src!\xrManagedApi.dll" "!dst!\xrManagedApi.dll"
102+
%cp_tool% "!src!\xrSdkControls.dll" "!dst!\xrSdkControls.dll"
103+
%cp_tool% "!src!\xrPostprocessEditor.exe" "!dst!\xrPostprocessEditor.exe"
95104

96105
:ret
97106
endlocal

0 commit comments

Comments
 (0)