Skip to content

Commit 952b197

Browse files
committed
build: Fix the way Spanish manual is included in build
1 parent 7d97cb6 commit 952b197

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

Build.cmd

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,12 @@ IF "%ERRORLEVEL%" == "9009" GOTO :error
109109

110110
CALL :copy "Program\RunActivity.exe" "Program\RunActivityLAA.exe" || GOTO :error
111111
editbin /NOLOGO /LARGEADDRESSAWARE "Program\RunActivityLAA.exe" || GOTO :error
112-
copy "Program\RunActivity.exe.config" "Program\RunActivityLAA.exe.config" || GOTO :error
112+
CALL :copy "Program\RunActivity.exe.config" "Program\RunActivityLAA.exe.config" || GOTO :error
113113
ECHO Created large address aware version of RunActivity.exe.
114114

115-
REM Copy the Web content, empty the destination folder first
116-
IF EXIST "Program\Content\Web" RMDIR "Program\Content\Web" /S /Q
117-
IF NOT EXIST "Program\Content\Web" MKDIR "Program\Content\Web"
118-
XCOPY "Source\RunActivity\Viewer3D\WebServices\Web" "Program\Content\Web" /S /Y || GOTO :error
115+
REM Copy the web content
116+
ROBOCOPY /MIR /NJH /NJS "Source\RunActivity\Viewer3D\WebServices\Web" "Program\Content\Web"
117+
IF %ERRORLEVEL% GEQ 8 GOTO :error
119118

120119
REM Copy version number from OpenRails.exe into all other 1st party files
121120
FOR %%F IN ("Program\*.exe", "Program\Orts.*.dll", "Program\Contrib.*.dll", "Program\Tests.dll") DO (
@@ -144,7 +143,9 @@ IF NOT "%Mode%" == "Unstable" (
144143
PUSHD "Source\Documentation\Manual" && CALL make.bat latexpdf && POPD || GOTO :error
145144

146145
REM Copy the documentation.
147-
FOR /R "Source\Documentation" %%F IN (*.pdf *.txt) DO CALL :copy "%%~F" "Program\Documentation\%%~nF.pdf" || GOTO :error
146+
FOR /R "Source\Documentation" %%F IN (*.pdf) DO CALL :copy "%%~F" "Program\Documentation\%%~nF.pdf" || GOTO :error
147+
CALL :create "Program\Documentation\es"
148+
CALL :copy "Source\Documentation\Manual\es\Manual.pdf" "Program\Documentation\es\Manual.pdf" || GOTO :error
148149
ROBOCOPY /MIR /NJH /NJS "Source\Documentation\SampleFiles" "Program\Documentation\SampleFiles"
149150
IF %ERRORLEVEL% GEQ 8 GOTO :error
150151

Source/Menu/Menu.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,7 @@
204204
<PropertyGroup>
205205
<PreBuildEvent>
206206
</PreBuildEvent>
207-
<PostBuildEvent>REM Copy Spanish manual until we can make its RST files part of the build.
208-
CD ..\
209-
IF EXIST "Program\Documentation\es" RMDIR "Program\Documentation\es" /S /Q
210-
IF NOT EXIST "Program\Documentation\es" MKDIR "Program\Documentation\es"
211-
COPY "Source\Documentation\Manual\es\Manual.pdf" "Program\Documentation\es\"
212-
</PostBuildEvent>
207+
<PostBuildEvent>
208+
</PostBuildEvent>
213209
</PropertyGroup>
214210
</Project>

0 commit comments

Comments
 (0)