Skip to content

Commit 8d43886

Browse files
authored
Merge pull request #484 from twpol/feature/documentation-build-spanish-overwrite
fix: Do not act recursively on documentation or things go wrong Forum post at http://www.elvastower.com/forums/index.php?/topic/35505-problems-with-openrails-website/page__view__findpost__p__276030
2 parents 636134c + 5b4ced7 commit 8d43886

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Build.cmd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,21 +136,22 @@ IF NOT "%Mode%" == "Unstable" (
136136
CALL :recreate "Program\Documentation" || GOTO :error
137137

138138
REM Compile the documentation.
139-
FOR /R "Source\Documentation" %%F IN (*.doc *.docx *.docm *.xls *.xlsx *.xlsm *.odt) DO ECHO %%~F && OfficeToPDF.exe /bookmarks /print "%%~F" "Program\Documentation\%%~nF.pdf" || GOTO :error
139+
FOR %%E IN (doc docx docm xls xlsx xlsm odt) DO FOR %%F IN ("Source\Documentation\*.%%E") DO ECHO %%~F && OfficeToPDF.exe /bookmarks /print "%%~F" "Program\Documentation\%%~nF.pdf" || GOTO :error
140140
>"Source\Documentation\Manual\version.py" ECHO version = '%Version%' || GOTO :error
141141
>>"Source\Documentation\Manual\version.py" ECHO release = '%Revision%' || GOTO :error
142142
PUSHD "Source\Documentation\Manual" && CALL make.bat clean & POPD || GOTO :error
143143
PUSHD "Source\Documentation\Manual" && CALL make.bat latexpdf && POPD || GOTO :error
144144

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

152153
REM Copy the documentation separately.
153-
FOR /R "Program\Documentation" %%F IN (*.pdf) DO CALL :copy "%%~F" "OpenRails-%Mode%-%%~nxF" || GOTO :error
154+
FOR %%F IN ("Program\Documentation\*.pdf") DO CALL :copy "%%~F" "OpenRails-%Mode%-%%~nxF" || GOTO :error
154155
)
155156

156157
IF "%Mode%" == "Stable" (

0 commit comments

Comments
 (0)