PgAdmin3 Documentation and Guru Hints

slaykovsky · slaykovsky · commit a4579175533f · 2016-03-18T17:21:33.000+03:00
diff --git a/Readme.md b/Readme.md
@@ -14,6 +14,7 @@ Directory contains various build scripts.
 * msys2
 * 7-Zip
 * NSIS
+* HTML Help Workshop (for PgAdmin documentation, included in Visual Studio)
 
 ## Patches
 
diff --git a/build/helpers/pgadmin.cmd b/build/helpers/pgadmin.cmd
@@ -1,5 +1,5 @@
 CALL %ROOT%\build\helpers\setvars.cmd
-
+GOTO :BUILD_PGADMIN
 rm -rf %DEPENDENCIES_BIN_DIR%
 IF EXIST %DOWNLOADS_DIR%\deps-SDK71-%ARCH%.zip (
   7z x %DOWNLOADS_DIR%\deps-SDK71-%ARCH%.zip -o%DEPENDENCIES_BIN_DIR% -y
@@ -15,14 +15,13 @@ IF EXIST %DOWNLOADS_DIR%\pgsql_%ARCH%_%PGVER%.zip (
   ECHO "You need to build PostgreSQL first!"
   EXIT /B 1 || GOTO :ERROR
 )
-
 :BUILD_ALL
 
 :BUILD_WXWIDGETS
 TITLE Building wxWidgets...
 CD /D %DOWNLOADS_DIR%
 wget --no-check-certificate -c https://sourceforge.net/projects/wxwindows/files/%WXWIDGETS_VER%/wxWidgets-%WXWIDGETS_VER%.tar.bz2 -O wxWidgets-%WXWIDGETS_VER%.tar.bz2
-rm -rf %DEPENDENCIES_BIN_DIR%\wxwidgets %DEPENDENCIES_SRC_DIR%\wxWidgets-*
+rm -rf %DEPENDENCIES_BIN_DIR%\wxwidgets %DEPENDENCIES_SRC_DIR%\wxWidgets-%WXWIDGETS_VER%
 MKDIR %DEPENDENCIES_BIN_DIR%\wxwidgets
 tar xf wxWidgets-%WXWIDGETS_VER%.tar.bz2 -C %DEPENDENCIES_SRC_DIR% || GOTO :ERROR
 CD /D %DEPENDENCIES_SRC_DIR%\wxWidgets-*
@@ -69,10 +68,12 @@ cp -va %DEPENDENCIES_SRC_DIR%/wxWidgets-3*/include  %DEPENDENCIES_BIN_DIR%\wxwid
 :BUILD_PGADMIN
 TITLE Building PgAdmin3...
 CD /D %DOWNLOADS_DIR%
-wget --no-check-certificate -c https://github.com/postgres/pgadmin3/archive/%PGADMIN_TAG%.zip -O pgadmin3-%PGADMIN_VERSION%.zip
+REM wget --no-check-certificate -c https://github.com/postgres/pgadmin3/archive/%PGADMIN_TAG%.zip -O pgadmin3-%PGADMIN_VERSION%.zip
+wget --no-check-certificate -c https://ftp.postgresql.org/pub/pgadmin3/release/v%PGADMIN_VERSION%/src/pgadmin3-%PGADMIN_VERSION%.tar.gz
 rm -rf %BUILD_DIR%\pgadmin
 MKDIR %BUILD_DIR%\pgadmin
-7z x pgadmin3-%PGADMIN_VERSION%.zip -o%BUILD_DIR%\pgadmin -y
+REM 7z x pgadmin3-%PGADMIN_VERSION%.zip -o%BUILD_DIR%\pgadmin -y
+tar xf pgadmin3-%PGADMIN_VERSION%.tar.gz -C %BUILD_DIR%\pgadmin
 CD /D %BUILD_DIR%\pgadmin\pgadmin3-*
 SET OPENSSL=%DEPENDENCIES_BIN_DIR%\openssl
 SET WXWIN=%DEPENDENCIES_BIN_DIR%\wxwidgets
@@ -86,6 +87,20 @@ IF NOT EXIST libssh2.patch GOTO :DONE_PGADMIN_LIBSSH2_PATCH
 patch -f -p0 < libssh2.patch || GOTO :ERROR
 :DONE_PGADMIN_LIBSSH2_PATCH
 
+REM This block is for building docs
+SET PATH=%PATH%;%PYTHON64_PATH%;%PYTHON64_PATH%\Scripts
+pip install sphinx
+cd docs
+createConf.vbs
+REM Workaround ^_^
+sed -i "s:ProgramFiles:ProgramFiles(x86):g" builddocs.bat
+sed -i "s|EXIT 0|GOTO :DONE|g" builddocs.bat
+>> builddocs.bat ECHO :DONE
+>> builddocs.bat ECHO ECHO "Docs build success!"
+CALL builddocs.bat
+cd ..
+
+
 IF %ARCH% == X64 sed -i 's/Win32/x64/g' xtra\png2c\png2c.vcxproj
 IF %ARCH% == X64 sed -i 's/Win32/x64/g' pgadmin\pgAdmin3.vcxproj
 sed -i "/<Bscmake>/,/<\/Bscmake>/d" pgadmin\pgAdmin3.vcxproj
@@ -94,18 +109,31 @@ IF %ARCH% == X64 msbuild xtra/png2c/png2c.vcxproj /m /p:Configuration="Release (
 cp -va xtra pgadmin || GOTO :ERROR
 IF %ARCH% == X86 msbuild pgadmin/pgAdmin3.vcxproj /m /p:Configuration="Release (3.0)" /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
 IF %ARCH% == X64 msbuild pgadmin/pgAdmin3.vcxproj /m /p:Configuration="Release (3.0)" /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
-REM Docs building is not working now
-REM Need to understand how to add sphinx-build to PATH
-SET PATH=%PATH%;%PYTHON64_PATH%;%PYTHON64_PATH%\Scripts
-REM msbuild docs/Docs.vcxproj /m /p:Configuration="All" /p:Platform="Win32" || GOTO :ERROR
+
+
 rm -rf %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin
 MKDIR %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\lib
+MKDIR %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs
+MKDIR %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\en_US
 cp -va pgadmin/Release*/*.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin  || GOTO :ERROR
 cp -va i18n c:/pg/distr_%ARCH%_%PGVER%/pgadmin/bin  || GOTO :ERROR
+
+cp -va docs/cs_CZ %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\cs_CZ || GOTO :ERROR
+cp -va docs/de_DE %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\de_DE || GOTO :ERROR
+cp -va docs/es_ES %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\es_ES || GOTO :ERROR
+cp -va docs/fi_FI %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\fi_FI || GOTO :ERROR
+cp -va docs/fr_FR %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\fr_FR || GOTO :ERROR
+cp -va docs/sl_SI %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\sl_SI || GOTO :ERROR
+cp -va docs/zh_CN %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\zh_CN || GOTO :ERROR
+cp -va docs/zh_TW %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\zh_TW || GOTO :ERROR
+cp -va docs/zh_TW %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\zh_TW || GOTO :ERROR
+cp -va docs/en_US/pgadmin3.css %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\en_US || GOTO :ERROR
+cp -va docs/en_US/_build/htmlhelp/* %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\en_US\ || GOTO :ERROR
+cp -va docs/en_US/hints %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin\Docs\en_US\hints || GOTO :ERROR
+
 cp -va c:/pg/distr_%ARCH%_%PGVER%/postgresql/bin/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin  || GOTO :ERROR
 cp -va %DEPENDENCIES_BIN_DIR%/wxwidgets/lib/vc_dll/*.dll  %BUILD_DIR%\distr_%ARCH%_%PGVER%\pgadmin\bin  || GOTO :ERROR
 
-
 GOTO :DONE
 
 :ERROR
