Skip to content

Commit bf1f54a

Browse files
authored
Fix paths for PostgreSQL library and header file copying on Windows (#1102)
2 parents 565ff27 + 1c3dc91 commit bf1f54a

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/SPC/builder/windows/library/postgresql_win.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ class postgresql_win extends WindowsLibraryBase
1010

1111
protected function build(): void
1212
{
13-
copy($this->source_dir . '\pgsql\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
14-
copy($this->source_dir . '\pgsql\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
15-
copy($this->source_dir . '\pgsql\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
13+
copy($this->source_dir . '\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
14+
copy($this->source_dir . '\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
15+
copy($this->source_dir . '\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
1616

1717
// create libpq folder in buildroot/includes/libpq
1818
if (!file_exists(BUILD_INCLUDE_PATH . '\libpq')) {
@@ -21,7 +21,7 @@ protected function build(): void
2121

2222
$headerFiles = ['libpq-fe.h', 'postgres_ext.h', 'pg_config_ext.h', 'libpq\libpq-fs.h'];
2323
foreach ($headerFiles as $header) {
24-
copy($this->source_dir . '\pgsql\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
24+
copy($this->source_dir . '\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
2525
}
2626
}
2727
}

src/globals/test-extensions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
// 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
3232
// 'ubuntu-24.04-arm', // bin/spc for arm64
3333
'windows-2022', // .\bin\spc.ps1
34-
'windows-2025',
34+
// 'windows-2025',
3535
];
3636

3737
// whether enable thread safe
@@ -46,12 +46,12 @@
4646
$frankenphp = false;
4747

4848
// prefer downloading pre-built packages to speed up the build process
49-
$prefer_pre_built = false;
49+
$prefer_pre_built = true;
5050

5151
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
5252
$extensions = match (PHP_OS_FAMILY) {
5353
'Linux', 'Darwin' => 'decimal',
54-
'Windows' => 'decimal',
54+
'Windows' => 'bcmath,brotli,bz2,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,iconv,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_pgsql,pgsql,session,simdjson,simplexml,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,zip,zlib',
5555
};
5656

5757
// If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).

0 commit comments

Comments
 (0)