Skip to content

Commit 85a62d2

Browse files
committed
Monday fixes
1 parent 3be6fac commit 85a62d2

File tree

6 files changed

+95
-18
lines changed

6 files changed

+95
-18
lines changed

CHANGELOG.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,13 @@
88
### Changed
99

1010
### Fixed
11+
- Fix messy library builds
1112

1213
## [0.1.1] - 2024-05-18
1314

14-
### Added
15-
- haru pdf support
16-
- dio serial support
17-
- sync support
18-
- win32service support
19-
- win32ps support
20-
- ds Specialized data structures support
21-
- teds Tentative Extra Data Structures support
22-
- jsonpath support
23-
- msgpack support
24-
- simdjson support
25-
- xhprof support
26-
2715
### Changed
2816
- git clone and pull recursive
2917

3018
### Fixed
3119
- draw_status label fix
32-
- yaml build script nameA
20+
- yaml build script name

config.full.ini

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,18 @@ wcli = Yes ; Windows CLI native support
108108
; parallel = Yes
109109
; pcsc = Yes
110110
; pecl_http = Yes
111+
; psr = Yes
111112
; simdjson = Yes
112113
; ssh2 = Yes
113114
; stomp = Yes
115+
; svm = Yes
114116
; sync = Yes
115117
; teds = Yes
116118
; timezonedb = Yes
117119
; trader = Yes
118120
; translit = Yes
121+
; uopz = Yes
122+
; var_representation = Yes
119123
; win32service = Yes
120124
; win32ps = Yes
121125
; xdiff = Yes
@@ -170,10 +174,16 @@ wcli = Yes ; Windows CLI native support
170174
; oauth
171175
; parle
172176
; phalcon (need session extension)
177+
; propro
173178
; protobuf
179+
; runkit7
180+
; sandbox
174181
; scrypt
182+
; taint
175183
; uv
176184
; xlswriter
185+
; xmldiff
186+
; yar
177187

178188

179189
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

libraries/install_pthread.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
$files[$path . '_ptw32.h'] = 'include\_ptw32.h';
6161
$files[$path . 'sched.h'] = 'include\sched.h';
6262
$files[$path . 'semaphore.h'] = 'include\semaphore.h';
63+
$files[$path . 'pthread.h'] = 'include\pthread.h';
6364
if(!create_build($builddir, $files)) draw_status($label, "failed", Red, true);
6465
$contents = file_get_contents($builddir . 'include\sched.h');
6566
$contents = str_replace(' typedef __int64', ' //typedef __int64', $contents);

matrix.json

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,6 +1032,52 @@
10321032
"switch": "--with-crypto",
10331033
"dependancies": ["openssl"],
10341034
"libraries": ["openssl"]
1035+
},
1036+
{
1037+
"name": "svm",
1038+
"repo": "",
1039+
"url": "https://pecl.php.net/get/svm-0.2.3.tgz",
1040+
"version": "0.2.3",
1041+
"install_script": "ext_svm.php",
1042+
"libsvm": "https://github.com/cjlin1/libsvm/archive/refs/tags/v332.zip",
1043+
"builtin": false,
1044+
"mandatory": false,
1045+
"switch": "--with-svm",
1046+
"dependancies": [],
1047+
"libraries": []
1048+
},
1049+
{
1050+
"name": "uopz",
1051+
"repo": "",
1052+
"url": "https://pecl.php.net/get/uopz-7.1.1.tgz",
1053+
"version": "7.1.1",
1054+
"builtin": false,
1055+
"mandatory": false,
1056+
"switch": "--enable-uopz",
1057+
"dependancies": [],
1058+
"libraries": []
1059+
},
1060+
{
1061+
"name": "psr",
1062+
"repo": "",
1063+
"url": "https://pecl.php.net/get/psr-1.2.0.tgz",
1064+
"version": "1.2.0",
1065+
"builtin": false,
1066+
"mandatory": false,
1067+
"switch": "--enable-psr",
1068+
"dependancies": [],
1069+
"libraries": []
1070+
},
1071+
{
1072+
"name": "var_representation",
1073+
"repo": "",
1074+
"url": "https://pecl.php.net/get/var_representation-0.1.4.tgz",
1075+
"version": "0.1.4",
1076+
"builtin": false,
1077+
"mandatory": false,
1078+
"switch": "--enable-var_representation",
1079+
"dependancies": [],
1080+
"libraries": []
10351081
}
10361082
],
10371083

@@ -1467,7 +1513,7 @@
14671513
"name": "ip2location",
14681514
"version": "8.6.1-1",
14691515
"download_url": "https://github.com/chrislim2888/IP2Location-C-Library/archive/refs/heads/master.zip",
1470-
"win_patch_url": "https://raw.githubusercontent.com/lexylein/IP2Location-C-Library/patch-1/libIP2Location/IP2Location.cz",
1516+
"win_patch_url": "https://raw.githubusercontent.com/lexylein/IP2Location-C-Library/patch-1/libIP2Location/IP2Location.c",
14711517
"install_script": "install_ip2location.php",
14721518
"mandatory": false,
14731519
"dependancies": []

php/ext_svm.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
/**
4+
* ██╗ ██╗██████╗ ███████╗██╗ ██╗███╗ ███╗
5+
* ██║ ██║██╔══██╗██╔════╝██║ ██║████╗ ████║
6+
* ██║ ██║██████╔╝███████╗██║ ██║██╔████╔██║
7+
* ██║ ██║██╔══██╗╚════██║╚██╗ ██╔╝██║╚██╔╝██║
8+
* ███████╗██║██████╔╝███████║ ╚████╔╝ ██║ ╚═╝ ██║
9+
* ╚══════╝╚═╝╚═════╝ ╚══════╝ ╚═══╝ ╚═╝ ╚═╝
10+
*/
11+
12+
13+
$libsvm = TMP.pathinfo($ext->libsvm, PATHINFO_BASENAME);
14+
if(!download_file($ext->libsvm, $libsvm, "libsvm-3.3.2")) exit_error("Can't download libsvm");
15+
if(!$firstdir = zip_first_dir($libsvm)) exit_error("Invalid zip archive");
16+
17+
$label = 'Install latest libsvm';
18+
draw_line($label, 'running', Yellow);
19+
20+
$zip = new ZipArchive;
21+
if ($zip->open($libsvm) !== TRUE) draw_status($label, "failed", Red, true, "Invalid proto headers archive");
22+
if(!$contents = $zip->getFromName($firstdir . '/svm.cpp')) draw_status($label, "failed", Red, true);
23+
else file_put_contents($path . 'libsvm\svm.cpp', $contents);
24+
if(!$contents = $zip->getFromName($firstdir . '/svm.h')) draw_status($label, "failed", Red, true);
25+
else file_put_contents($path . 'libsvm\svm.h', $contents);
26+
$zip->close();
27+
28+
draw_status($label, 'complete', Green);

phpsab.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
const CONFIG = DIR.'configs\\';
2323
const USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36';
2424
const MAX_BUFFER_WIDTH = 100;
25-
const SPEED_DEV = false;
25+
const SPEED_DEV = true;
2626

2727

2828
draw_header("PHP Static Autobuilder");
@@ -354,9 +354,13 @@
354354
/**
355355
* Install libraries
356356
*/
357-
foreach($MATRIX->libraries as $lib)
358-
if(in_array($lib->name, $libraries))
357+
foreach($MATRIX->libraries as $lib) {
358+
if(in_array($lib->name, $libraries)){
359359
include(MASTER.'libraries\\' . $lib->install_script);
360+
unset($files);
361+
}
362+
}
363+
360364

361365

362366
/**

0 commit comments

Comments
 (0)