pgadm msvs2010

gsmolk · gsmolk · commit 94c6395c49d9 · 2016-05-10T19:44:32.000+03:00
diff --git a/build/helpers/dependencies.cmd b/build/helpers/dependencies.cmd
@@ -39,8 +39,8 @@ CD /D %DOWNLOADS_DIR%
 TITLE Building zlib...
 CD /D %DOWNLOADS_DIR%
 wget -c http://zlib.net/zlib-%ZLIB_VER%.tar.gz -O zlib-%ZLIB_VER%.tar.gz
-rm -rf "%DEPENDENCIES_BIN_DIR%\zlib %DEPENDENCIES_SRC_DIR%\zlib*
-MKDIR "%DEPENDENCIES_BIN_DIR%\zlib
+rm -rf %DEPENDENCIES_BIN_DIR%\zlib %DEPENDENCIES_SRC_DIR%\zlib*
+MKDIR %DEPENDENCIES_BIN_DIR%\zlib
 tar xf zlib-%ZLIB_VER%.tar.gz -C %DEPENDENCIES_SRC_DIR% || GOTO :ERROR
 CD /D %DEPENDENCIES_SRC_DIR%\zlib*
 set CL=/MP
diff --git a/build/helpers/pgadmin.cmd b/build/helpers/pgadmin.cmd
@@ -1,5 +1,6 @@
 CALL %ROOT%\build\helpers\setvars.cmd
 
+
 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
@@ -36,6 +37,10 @@ IF %SDK% == SDK71 (
   IF %ARCH% == X86 msbuild build\msw\wx_vc10.sln  /m /p:Configuration="DLL Release" /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
   IF %ARCH% == X64 msbuild build\msw\wx_vc10.sln  /m /p:Configuration="Release" /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
   IF %ARCH% == X64 msbuild build\msw\wx_vc10.sln  /m /p:Configuration="DLL Release" /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
+  REM Upgrade hhp2cached project to VS2010
+  vcupgrade -overwrite -nologo utils\hhp2cached\hhp2cached_vc9.vcproj
+  IF %ARCH% == X86 msbuild utils\hhp2cached\hhp2cached_vc9.vcxproj /m /p:Configuration="Release" /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
+  IF %ARCH% == X86 msbuild utils\hhp2cached\hhp2cached_vc9.vcxproj /m /p:Configuration="DLL Release" /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
 )
 
 IF %SDK% == MSVC2013 (
diff --git a/build/helpers/pgadmin_installer.cmd b/build/helpers/pgadmin_installer.cmd
@@ -12,8 +12,9 @@ REM Download VC Redistibutable packages
 TITLE Downloading VC Redistibutable packages
 MKDIR "c:\pg\vcredist"
 
-wget -c https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe -O "c:\pg\vcredist\vcredist_x86_2015.exe" || GOTO :ERROR
-wget -c https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe -O "c:\pg\vcredist\vcredist_x64_2015.exe" || GOTO :ERROR
+REM wget -c https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe -O "c:\pg\vcredist\vcredist_x86_2015.exe" || GOTO :ERROR
+REM wget -c https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe -O "c:\pg\vcredist\vcredist_x64_2015.exe" || GOTO :ERROR
+	wget -c https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe -O "c:\pg\vcredist\vcredist_x86_2010.exe"  || GOTO :ERROR
 
 REM Make directory for installers
 MKDIR "c:\pg\installers"
diff --git a/build/helpers/pgadmin_nsis_installer.cmd b/build/helpers/pgadmin_nsis_installer.cmd
@@ -20,6 +20,7 @@ SET PRODUCT_DIR_REGKEY="Software\%COMPANY_NAME%\%PRODUCT_NAME%\%PGADMIN_VERSION%
 SET ADMIN_REG_KEY="SOFTWARE\%COMPANY_NAME%\%PRODUCT_NAME%\%PGADMIN_VERSION%\Installations\"
 SET ADMIN_INS_SUFFIX="%ARCH%bit_Setup.exe"
 SET ADMIN_INS_SOURCE_DIR="C:\pg\distr_%ARCH%_%PG_DEF_VERSION%\pgadmin\*.*"
+
 >%NSIS_RES_DIR%\pgadmin.def.nsh  ECHO !define PRODUCT_NAME "%PRODUCT_NAME%"
 >>%NSIS_RES_DIR%\pgadmin.def.nsh ECHO !define PRODUCT_VERSION "%PGADMIN_VERSION%"
 >>%NSIS_RES_DIR%\pgadmin.def.nsh ECHO !define PRODUCT_PUBLISHER %PRODUCT_PUBLISHER%
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -9,7 +9,7 @@ SET LIBSSH2_VER=1.6.0
 SET WXWIDGETS_VER=3.0.2
 
 REM Path vars
-SET PERL32_PATH=C:\Perl
+SET PERL32_PATH=C:\Perl512x86
 SET PERL64_PATH=C:\Perl64
 SET PERL32_BIN=%PERL32_PATH%\bin
 SET PERL64_BIN=%PERL64_PATH%\bin
@@ -30,6 +30,15 @@ IF %SDK% == SDK71 (
   ECHO ON
 )
 
+IF %SDK% == MSVC2010 (
+  SET REDIST_YEAR=2010
+  SET PlatformToolset=v100
+  IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall" x86 || GOTO :ERROR
+  ECHO ON
+  IF %ARCH% == X64 CALL "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall" amd64 || GOTO :ERROR
+  ECHO ON
+)
+
 IF %SDK% == MSVC2013 (
   SET REDIST_YEAR=2013
   SET PlatformToolset=v120
diff --git a/build/run.cmd b/build/run.cmd
@@ -75,13 +75,13 @@ IF "%~1"=="3" (
 
 IF "%~1"=="4" (
   TITLE Building PgAdmin
-  IF "%SDK%"=="" SET SDK=MSVC2015
+  IF "%SDK%"=="" SET SDK=SDK71
   CMD.EXE /C %ROOT%\build\helpers\pgadmin.cmd
 )
 
 IF "%~1"=="5" (
   TITLE Building PgAdmin installer
-  IF "%SDK%"=="" SET SDK=MSVC2015
+  IF "%SDK%"=="" SET SDK=SDK71
   CMD.EXE /C %ROOT%\build\helpers\pgadmin_installer.cmd
 )
 
diff --git a/nsis/pgadmin.nsi b/nsis/pgadmin.nsi
@@ -84,12 +84,12 @@ Var StartMenuFolder
 ;--------------------------------
 ;Installer Sections
 
-Section "Microsoft Visual C++ 2015 Redistibutable" secMS
+Section "Microsoft Visual C++ 2010 Redistibutable" secMS
   GetTempFileName $1
   !ifdef PG_64bit
-    File /oname=$1 "c:\pg\vcredist\vcredist_x64_2015.exe"
+    File /oname=$1 "c:\pg\vcredist\vcredist_x64_2010.exe"
   !else
-    File /oname=$1 "c:\pg\vcredist\vcredist_x86_2015.exe"
+    File /oname=$1 "c:\pg\vcredist\vcredist_x86_2010.exe"
   !endif
   ExecWait "$1  /passive /norestart" $0
   DetailPrint "Visual C++ Redistributable Packages return $0"

Original file line number	Diff line number	Diff line change
`@@ -75,13 +75,13 @@ IF "%~1"=="3" (`
`75`	`75`
`76`	`76`	`IF "%~1"=="4" (`
`77`	`77`	`TITLE Building PgAdmin`
`78`		`- IF "%SDK%"=="" SET SDK=MSVC2015`
	`78`	`+ IF "%SDK%"=="" SET SDK=SDK71`
`79`	`79`	`CMD.EXE /C %ROOT%\build\helpers\pgadmin.cmd`
`80`	`80`	`)`
`81`	`81`
`82`	`82`	`IF "%~1"=="5" (`
`83`	`83`	`TITLE Building PgAdmin installer`
`84`		`- IF "%SDK%"=="" SET SDK=MSVC2015`
	`84`	`+ IF "%SDK%"=="" SET SDK=SDK71`
`85`	`85`	`CMD.EXE /C %ROOT%\build\helpers\pgadmin_installer.cmd`
`86`	`86`	`)`
`87`	`87`