aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2007-03-13 09:45:32 +0000
committerMagnus Hagander <magnus@hagander.net>2007-03-13 09:45:32 +0000
commite40889adb298738c09127e59d774b63cf8fcc241 (patch)
tree7951e01849f570819e17610490b64dab409df1f3 /src
parentcbf1293ffdf23628288966b045d987008b22298a (diff)
downloadpostgresql-e40889adb298738c09127e59d774b63cf8fcc241.tar.gz
postgresql-e40889adb298738c09127e59d774b63cf8fcc241.zip
Set root of docbook stuff from buildenv.bat and not from builddoc.bat.
Fix calling for file renaming when cd:ed into a different directory.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/tools/msvc/builddoc.bat25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/tools/msvc/builddoc.bat b/src/tools/msvc/builddoc.bat
index ad1013279fa..6623544f1dd 100755
--- a/src/tools/msvc/builddoc.bat
+++ b/src/tools/msvc/builddoc.bat
@@ -1,6 +1,5 @@
@echo off
-REM Adjust path for your docbook installation
-SET ROOT=c:\prog\pgsql\docbook
+REM Adjust path for your docbook installation in buildenv.bat
SETLOCAL
SET STARTDIR=%CD%
@@ -9,27 +8,27 @@ SET DSSSL=docbook-dsssl-1.79
IF EXIST ..\msvc IF EXIST ..\..\..\src cd ..\..\..
IF NOT EXIST doc\src\sgml\version.sgml goto noversion
+IF EXIST src\tools\msvc\buildenv.bat CALL src\tools\msvc\buildenv.bat
-IF NOT EXIST %ROOT%\%OPENJADE% SET NF=OpenJade
-IF NOT EXIST %ROOT%\docbook SET NF=docbook
-IF NOT EXIST %ROOT%\%DSSSL% set NF=docbook-dssl
+IF NOT EXIST %DOCROOT%\%OPENJADE% SET NF=OpenJade
+IF NOT EXIST %DOCROOT%\docbook SET NF=docbook
+IF NOT EXIST %DOCROOT%\%DSSSL% set NF=docbook-dssl
IF NOT "%NF%" == "" GOTO notfound
IF "%1" == "renamefiles" GOTO renamefiles
-cmd /v /c "%0" renamefiles
-
+cmd /v /c src\tools\msvc\builddoc renamefiles
cd doc\src\sgml
-SET SGML_CATALOG_FILES=%ROOT%\%OPENJADE%\dsssl\catalog;%ROOT%\docbook\docbook.cat
-perl %ROOT%\%DSSSL%\bin\collateindex.pl -f -g -o bookindex.sgml -N
+SET SGML_CATALOG_FILES=%DOCROOT%\%OPENJADE%\dsssl\catalog;%DOCROOT%\docbook\docbook.cat
+perl %DOCROOT%\%DSSSL%\bin\collateindex.pl -f -g -o bookindex.sgml -N
perl mk_feature_tables.pl YES ..\..\..\src\backend\catalog\sql_feature_packages.txt ..\..\..\src\backend\catalog\sql_features.txt > features-supported.sgml
perl mk_feature_tables.pl NO ..\..\..\src\backend\catalog\sql_feature_packages.txt ..\..\..\src\backend\catalog\sql_features.txt > features-unsupported.sgml
-%ROOT%\%OPENJADE%\bin\openjade -V draft-mode -wall -wno-unused-param -wno-empty -D . -c %ROOT%\%DSSSL%\catalog -d stylesheet.dsl -i output-html -t sgml postgres.sgml
-perl %ROOT%\%DSSSL%\bin\collateindex.pl -f -g -i 'bookindex' -o bookindex.sgml HTML.index
-%ROOT%\%OPENJADE%\bin\openjade -V draft-mode -wall -wno-unused-param -wno-empty -D . -c %ROOT%\%DSSSL%\catalog -d stylesheet.dsl -i output-html -t sgml postgres.sgml
+%DOCROOT%\%OPENJADE%\bin\openjade -V draft-mode -wall -wno-unused-param -wno-empty -D . -c %DOCROOT%\%DSSSL%\catalog -d stylesheet.dsl -i output-html -t sgml postgres.sgml
+perl %DOCROOT%\%DSSSL%\bin\collateindex.pl -f -g -i 'bookindex' -o bookindex.sgml HTML.index
+%DOCROOT%\%OPENJADE%\bin\openjade -V draft-mode -wall -wno-unused-param -wno-empty -D . -c %DOCROOT%\%DSSSL%\catalog -d stylesheet.dsl -i output-html -t sgml postgres.sgml
cd %STARTDIR%
echo Docs build complete.
@@ -38,7 +37,7 @@ exit /b
:renamefiles
REM Rename ISO entity files
-CD %ROOT%\docbook
+CD %DOCROOT%\docbook
FOR %%f in (ISO*) do (
set foo=%%f
IF NOT "!foo:~-4!" == ".gml" ren !foo! !foo:~0,3!-!foo:~3!.gml