postgrespro
diff --git a/‎build/helpers/probackup_installer.cmd
+9-34 b/‎build/helpers/probackup_installer.cmd
+9-34
diff --git a/‎wix/pg_probackup/Files.wxs renamed to ‎wix/pg_probackup/Files_example.wxs b/‎wix/pg_probackup/Files.wxs renamed to ‎wix/pg_probackup/Files_example.wxs
@@ -1,31 +1,13 @@
 echo.
-echo Building Installer...
-
-
->Files.wxs  ECHO ^<^?xml version="1.0" encoding="UTF-8"?^>
->>Files.wxs  ECHO ^<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"^>
->>Files.wxs  ECHO ^<^?include Variables.wxi?^>
->>Files.wxs  ECHO ^<Fragment^>
->>Files.wxs  ECHO ^<DirectoryRef Id = "INSTALLLOCATION"^>
->>Files.wxs  ECHO 	^<^Directory Id="BIN" Name="bin"^>
->>Files.wxs  ECHO     		^<^Component Id="ProductComponent" Guid="$(var.ComponentCode)" Win64="$(var.Win64)"^>
-perl genfilelist.pl ./out/bin/*.* Files.wxs
->>Files.wxs  ECHO 		^<^/Component^>
->>Files.wxs  ECHO 	^<^/Directory^>
->>Files.wxs  ECHO ^<^/DirectoryRef^>
->>Files.wxs  ECHO ^<^/Fragment^>
->>Files.wxs  ECHO ^<^/Wix^>
+echo Building PG_PROBACKUP Installer...
 
+SET PRODUCT_NAME=PostgreSQL
+SET BIN_DIR=%BUILD_DIR%\pg_probackup_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%
 SET WIXDIR=C:\Program Files (x86)\WiX Toolset v3.11\bin
-perl regenguids.pl Variables.wxi
-move Variables.wxi.out Variables.wxi
-echo on
-"%WIXDIR%\candle" -nologo  -dAPPVERSION="%APPVERSION%" -dPG_REG_KEY="%PG_REG_KEY%" -dPG_DEF_BRANDING="%PG_DEF_BRANDING%" Product.wxs Files.wxs || goto :ERROR
-                                                                                                      
-rem SET INS_FILE=pg-probackup-%EDITION%-%PG_MAJOR_VERSION%-%APPVERSION%-%BITS%.msi
-SET INS_FILE=pg-probackup-%EDITION%-%PG_MAJOR_VERSION%-%APPVERSION%.msi
+SET PG_DEF_BRANDING=PostgreSQL%PG_MAJOR_VERSION%
+SET PG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
 
-"%WIXDIR%\light" -sice:ICE03 -sice:ICE25 -sice:ICE82 -sw1101 -nologo -ext WixUIExtension -cultures:ru-ru -o %INS_FILE% Files.wixobj Product.wixobj || goto :ERROR
+CD /D %ROOT%\wix\pg_probackup || GOTO :ERROR
 
 echo.
 echo Building Full Installer...
@@ -36,26 +18,19 @@ echo Building Full Installer...
 >>Files.wxs  ECHO ^<Fragment^>
 >>Files.wxs  ECHO ^<DirectoryRef Id = "INSTALLLOCATION"^>
 >>Files.wxs  ECHO     		^<^Component Id="ProductComponent" Guid="$(var.ComponentCode)" Win64="$(var.Win64)"^>
-perl genfilelist.pl ./out_full/*.* Files.wxs
+perl genfilelist.pl %BIN_DIR%/*.* Files.wxs
 >>Files.wxs  ECHO 		^<^/Component^>
 >>Files.wxs  ECHO ^<^/DirectoryRef^>
 >>Files.wxs  ECHO ^<^/Fragment^>
 >>Files.wxs  ECHO ^<^/Wix^>
-"%WIXDIR%\candle" -nologo  -dAPPVERSION="%APPVERSION%" -dPG_REG_KEY="%PG_REG_KEY%" -dPG_DEF_BRANDING="%PG_DEF_BRANDING%" Product_separate.wxs Files.wxs || goto :ERROR
+"%WIXDIR%\candle" -nologo  -dAPPVERSION="%PROBACKUP_VERSION%" -dPG_REG_KEY="%PG_REG_KEY%" -dPG_DEF_BRANDING="%PG_DEF_BRANDING%" Product_separate.wxs Files.wxs || goto :ERROR
 
-rem SET INS_FILE=pg-probackup-%EDITION%-%PG_MAJOR_VERSION%-%APPVERSION%-%BITS%-standalone.msi
-SET INS_FILE=pg-probackup-%EDITION%-%PG_MAJOR_VERSION%-%APPVERSION%-standalone-en.msi
+SET INS_FILE=pg-probackup-%PROBACKUP_EDITION%-%PG_MAJOR_VERSION%-%PROBACKUP_VERSION%-standalone-en.msi
 
 "%WIXDIR%\light" -sice:ICE03 -sice:ICE25 -sice:ICE82 -sw1101 -nologo -ext WixUIExtension -cultures:en-us -o %INS_FILE% Files.wixobj Product_separate.wixobj || goto :ERROR
 
-SET INS_FILE=pg-probackup-%EDITION%-%PG_MAJOR_VERSION%-%APPVERSION%-standalone-ru.msi
-
-"%WIXDIR%\light" -sice:ICE03 -sice:ICE25 -sice:ICE82 -sw1101 -nologo -ext WixUIExtension -cultures:ru-ru -o %INS_FILE% Files.wixobj Product_separate.wixobj || goto :ERROR
-
-
 goto :DONE
 
-
 :ERROR
 ECHO Failed with error #%errorlevel%.
 EXIT /b %errorlevel%