Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf883f8c

Browse files
committed
WIP
1 parentc6ec300 commitf883f8c

File tree

3 files changed

+72
-64
lines changed

3 files changed

+72
-64
lines changed

‎build/helpers/postgres.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ GOTO :NOLOAD
2020
:BUILD_POSTGRESQL
2121
TITLE Building PostgreSQL...
2222
CD /D%DOWNLOADS_DIR%
23+
2324
IF"%GIT_PATH%"=="" (
2425
SETGIT_PATH=git://git.postgresql.org/git/postgresql.git
2526
)
27+
2628
IFNOT"%GIT_BRANCH%"=="" (
2729
rm -rf%BUILD_DIR%\postgresql
2830
MKDIR%BUILD_DIR%\postgresql
@@ -37,6 +39,7 @@ rm -rf %BUILD_DIR%\postgresql
3739
MKDIR%BUILD_DIR%\postgresql
3840
tar xf postgresql-%PGVER%.tar.bz2 -C%BUILD_UDIR%/postgresql
3941
CD /D%BUILD_DIR%\postgresql\*%PGVER%*||GOTO :ERROR
42+
4043
:NOTAR
4144
IF%ONE_C%== YES (
4245
IF%HAVE_PGURL%==1SETPGTARNAME=postgrespro-1c
@@ -84,9 +87,6 @@ IF %HAVE_PGURL% == 0 (
8487
>>src\tools\msvc\config.plECHO^};
8588
>>src\tools\msvc\config.plECHO 1^;
8689

87-
REM IF %ONE_C% == YES (
88-
REM mv -v contrib\fulleq\fulleq.sql.in.in contrib\fulleq\fulleq.sql.in|| GOTO :ERROR
89-
REM )
9090
SETDEPENDENCIES_BIN_DIR=%DEPENDENCIES_BIN_DIR:\=/%
9191

9292
cp -va%DEPENDENCIES_BIN_DIR%/icu/include/* src\include\||GOTO :ERROR

‎build/helpers/probackup.cmd

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ CALL %ROOT%\build\helpers\setvars.cmd
22

33
SETPROBACKUP_URL=https://github.com/postgrespro/pg_probackup/tarball/%PROBACKUP_VERSION%
44
SETBIN_DIR=%BUILD_DIR%\pg_probackup_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%
5-
SETPRODUCT_NAME=PostgreSQL
65

7-
SETPGDIRSRC=%BUILD_DIR%\postgresql\postgresql-%PGVER%\
8-
SETPGDIR=Z:\inst\
9-
10-
SETPGDIR=Z:\Program Files\PostgresProEnterprise\11
11-
SETPG_REG_KEY=SOFTWARE\PostgresPro\X64\PostgresProEnterprise\11\Installations\postgresql-11
12-
13-
SETINCLUDE=%INCLUDE%%PGDIR%\include\server;%PGDIR%\include\server\port\win32;%PGDIR%\include\server\port\win32_msvc;%PGDIR%\include;addsrc\;src\;
14-
SETARCHIVE=pg_probackup-%PROBACKUP_VERSION%.tar.gz
6+
IF%PROBACKUP_EDITION%== vanilla (
7+
SETPRODUCT_NAME=PostgreSQL
8+
)
9+
ELSEIF%PROBACKUP_EDITION%== std (
10+
SETPRODUCT_NAME=PostgresPro
11+
)
12+
ELSE (
13+
ECHO Invalid PROBACKUP_EDITION:%PROBACKUP_EDITION%
14+
GOTO :ERROR
15+
)
1516

1617
echo Download sources ...
1718

@@ -21,30 +22,19 @@ MKDIR %BUILD_DIR%\pg_probackup\pg_probackup-%PG_MAJOR_VERSION%-%PROBACKUP_VERSIO
2122

2223
CD /D%BUILD_DIR%\pg_probackup\pg_probackup-%PG_MAJOR_VERSION%-%PROBACKUP_VERSION%||GOTO :ERROR
2324

24-
rem wget --no-check-certificate %PROBACKUP_URL% -O %DOWNLOADS_DIR%\pg_probackup-%PROBACKUP_VERSION%.tar.bz2|| GOTO :ERROR
25-
rem CD /D %DOWNLOADS_DIR%|| GOTO :ERROR
26-
rem tar xf pg_probackup-%PROBACKUP_VERSION%.tar.bz2 -C %BUILD_UDIR%/pg_probackup|| GOTO :ERROR
27-
2825
git clone https://github.com/postgrespro/pg_probackup .
2926

30-
rem CD /D %BUILD_DIR%\pg_probackup\*%PROBACKUP_VERSION%*|| GOTO :ERROR
31-
3227
gen_probackup_project.pl%BUILD_DIR%\postgresql\postgresql-%PGVER%
3328

3429
rm -rf%BIN_DIR%||GOTO :ERROR
3530
MKDIR%BIN_DIR%||GOTO :ERROR
3631

37-
rem copy pg_probackup binaries and dependencies
3832
copy%BUILD_DIR%\postgresql\postgresql-%PGVER%\Release\pg_probackup\pg_probackup.exe%BIN_DIR%||GOTO :ERROR
3933
copy%BUILD_DIR%\postgresql\postgresql-%PGVER%\Release\libpq\libpq.dll%BIN_DIR%||GOTO :ERROR
4034
copy%DEPENDENCIES_BIN_DIR%\zlib\lib\zlib1.dll%BIN_DIR%||GOTO :ERROR
4135
copy%DEPENDENCIES_BIN_DIR%\openssl\lib\libeay32.dll%BIN_DIR%||GOTO :ERROR
4236
copy%DEPENDENCIES_BIN_DIR%\openssl\lib\ssleay32.dll%BIN_DIR%||GOTO :ERROR
4337

44-
rem SET ZIP_FILE=pg-probackup-%PROBACKU_EDITION%-%PG_MAJOR_VERSION%-%PROBACKUP_VERSION%-%ARCH%.zip
45-
rem 7z.exe a .\..\out\pg_probackup.zip .\..\out\*.* -r
46-
rem 7z.exe a .\..\%ZIP_FILE% .\..\out\*.* -r
47-
4838
goto :DONE
4939

5040
:ERROR

‎build/helpers/probackup_installer.cmd

Lines changed: 59 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,59 @@
1-
CALL%ROOT%\build\helpers\setvars.cmd
2-
3-
echo.
4-
echo Building PG_PROBACKUP Installer...
5-
6-
SETPRODUCT_NAME=PostgreSQL
7-
SETBIN_DIR=%BUILD_DIR%\pg_probackup_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%
8-
SETWIXDIR=C:\Program Files (x86)\WiX Toolset v3.11\bin
9-
SETPG_DEF_BRANDING=PostgreSQL%PG_MAJOR_VERSION%
10-
SETPG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
11-
12-
CD /D%ROOT%\wix\pg_probackup||GOTO :ERROR
13-
14-
echo.
15-
echo Building Full Installer...
16-
17-
>Files.wxsECHO^<^?xml version="1.0" encoding="UTF-8"?^>
18-
>>Files.wxsECHO^<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"^>
19-
>>Files.wxsECHO^<^?include Variables.wxi?^>
20-
>>Files.wxsECHO^<Fragment^>
21-
>>Files.wxsECHO^<DirectoryRef Id ="INSTALLLOCATION"^>
22-
>>Files.wxsECHO^<^Component Id="ProductComponent" Guid="$(var.ComponentCode)" Win64="$(var.Win64)"^>
23-
perl genfilelist.pl%BIN_DIR%/*.* Files.wxs
24-
>>Files.wxsECHO^<^/Component^>
25-
>>Files.wxsECHO^<^/DirectoryRef^>
26-
>>Files.wxsECHO^<^/Fragment^>
27-
>>Files.wxsECHO^<^/Wix^>
28-
"%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
29-
30-
SETINS_FILE=pg-probackup-%PROBACKUP_EDITION%-%PG_MAJOR_VERSION%-%PROBACKUP_VERSION%-standalone-en.msi
31-
32-
"%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
33-
34-
goto :DONE
35-
36-
:ERROR
37-
ECHO Failed with error #%errorlevel%.
38-
EXIT /b%errorlevel%
39-
40-
:DONE
41-
ECHO Done.
1+
CALL%ROOT%\build\helpers\setvars.cmd
2+
3+
echo.
4+
echo Building PG_PROBACKUP Installer...
5+
6+
SETBIN_DIR=%BUILD_DIR%\pg_probackup_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%
7+
SETWIXDIR=C:\Program Files (x86)\WiX Toolset v3.11\bin
8+
SETPG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
9+
10+
IF%PROBACKUP_EDITION%== vanilla (
11+
SETPRODUCT_NAME=PostgreSQL
12+
SETPG_DEF_BRANDING=PostgreSQL%PG_MAJOR_VERSION%
13+
SETPG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
14+
)
15+
ELSEIF%PROBACKUP_EDITION%== std (
16+
SETPRODUCT_NAME=PostgresPro
17+
SETPG_DEF_BRANDING=PostgresPro%PG_MAJOR_VERSION%
18+
SETPG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
19+
)
20+
ELSE (
21+
ECHO Invalid PROBACKUP_EDITION:%PROBACKUP_EDITION%
22+
GOTO :ERROR
23+
)
24+
25+
26+
rm -rf%BUILD_DIR%\pg_probackup\installer||GOTO :ERROR
27+
cp -av%ROOT%\wix\pg_probackup\*%BUILD_DIR%\pg_probackup\installer||GOTO :ERROR
28+
CD /D%BUILD_DIR%\pg_probackup\installer||GOTO :ERROR
29+
30+
echo.
31+
echo Building Full Installer...
32+
33+
>Files.wxsECHO^<^?xml version="1.0" encoding="UTF-8"?^>
34+
>>Files.wxsECHO^<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"^>
35+
>>Files.wxsECHO^<^?include Variables.wxi?^>
36+
>>Files.wxsECHO^<Fragment^>
37+
>>Files.wxsECHO^<DirectoryRef Id ="INSTALLLOCATION"^>
38+
>>Files.wxsECHO^<^Component Id="ProductComponent" Guid="$(var.ComponentCode)" Win64="$(var.Win64)"^>
39+
perl genfilelist.pl%BIN_DIR%/*.* Files.wxs
40+
>>Files.wxsECHO^<^/Component^>
41+
>>Files.wxsECHO^<^/DirectoryRef^>
42+
>>Files.wxsECHO^<^/Fragment^>
43+
>>Files.wxsECHO^<^/Wix^>
44+
"%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
45+
46+
SETINS_FILE=pg-probackup-%PROBACKUP_EDITION%-%PG_MAJOR_VERSION%-%PROBACKUP_VERSION%-standalone-en.msi
47+
48+
"%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
49+
50+
cp -av pg-probackup-%PROBACKUP_EDITION%-%PG_MAJOR_VERSION%-%PROBACKUP_VERSION%-standalone-en.msi%BUILD_DIR%\installers\||goto :ERROR
51+
52+
goto :DONE
53+
54+
:ERROR
55+
ECHO Failed with error #%errorlevel%.
56+
EXIT /b%errorlevel%
57+
58+
:DONE
59+
ECHO Done.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp