Libraries build fixes

Author: ZmotriN

CHANGELOG.md

@@ -10,6 +10,7 @@
 ### Fixed
 - Fix messy library builds
 
+
 ## [0.1.1] - 2024-05-18
 
 ### Changed

README.md

@@ -1,8 +1,8 @@
 # PHPSAB - PHP Static Autobuilder
 
-![PHP Version](https://img.shields.io/badge/PHP-8.3.7-blue)
-![Builder](https://img.shields.io/badge/VS16-x64-a679dd)
-![PHPSAB Version](https://img.shields.io/badge/Version-0.1.1-red)
+![PHP Version](https://img.shields.io/badge/PHP-8.3.7-858eb7)
+![Builder](https://img.shields.io/badge/vs16-x64-a679dd)
+![PHPSAB Version](https://img.shields.io/badge/Version-0.1.1-blue)
 ![Status](https://img.shields.io/badge/Status-Active-green)
 
 

config.full.ini

@@ -13,6 +13,9 @@ win32std = Yes ; Mandatory (for res:// stream protocol)
 winbinder = Yes ; Windows Interface native support
 wcli = Yes ; Windows CLI native support
 
+; win32ps = Yes ; Get processes informations
+; win32service = Yes ; Manage Windows services
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Windows built-in extensions ;
@@ -109,6 +112,7 @@ wcli = Yes ; Windows CLI native support
 ; pcsc = Yes
 ; pecl_http = Yes
 ; psr = Yes
+; rar = Yes
 ; simdjson = Yes
 ; ssh2 = Yes
 ; stomp = Yes
@@ -120,8 +124,6 @@ wcli = Yes ; Windows CLI native support
 ; translit = Yes
 ; uopz = Yes
 ; var_representation = Yes
-; win32service = Yes
-; win32ps = Yes
 ; xdiff = Yes
 ; xhprof = Yes
 ; yac = Yes
@@ -165,6 +167,7 @@ wcli = Yes ; Windows CLI native support
 ; componere
 ; decimal
 ; fann
+; grpc
 ; http_message
 ; judy
 ; lua
@@ -191,5 +194,4 @@ wcli = Yes ; Windows CLI native support
 ; "Deprecated error" extensions ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-; rar ; From PECL
 ; cmark

libraries/install_libevent.php

@@ -60,16 +60,20 @@
 $label = "Install " . $lib->name . '-' . $lib->version;
 draw_line($label, "running", Yellow);
 $builddir = $path . 'build\\';
+
 $files[$path .'build-win\lib\Release\event.lib'] = 'lib\libevent.lib';
 $files[$path .'build-win\lib\Release\event_core.lib'] = 'lib\libevent_core.lib';
 $files[$path .'build-win\lib\Release\event_extra.lib'] = 'lib\libevent_extras.lib';
 $files[$path .'build-win\lib\Release\event_openssl.lib'] = 'lib\libevent_openssl.lib';
+
 $inctmp = $path . 'include\\';
 foreach(dig($inctmp . '*.h') as $file)
     $files[$file] = 'include\\' . str_replace($inctmp, '', $file);
+
 $inctmp = $path . 'build-win\include\\';
 foreach(dig($inctmp . '*.h') as $file) 
     $files[$file] = 'include\\' . str_replace($inctmp, '', $file);
+
 if(!create_build($builddir, $files)) draw_status($label, "failed", Red, true);
 if(!install_deps($builddir)) draw_status($label, "failed", Red, true);
 else draw_status($label, "complete", Green);

libraries/install_libxdiff.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * ██╗     ██╗██████╗ ██╗  ██╗██████╗ ██╗███████╗███████╗
+ * ██║     ██║██╔══██╗╚██╗██╔╝██╔══██╗██║██╔════╝██╔════╝
+ * ██║     ██║██████╔╝ ╚███╔╝ ██║  ██║██║█████╗  █████╗  
+ * ██║     ██║██╔══██╗ ██╔██╗ ██║  ██║██║██╔══╝  ██╔══╝  
+ * ███████╗██║██████╔╝██╔╝ ██╗██████╔╝██║██║     ██║     
+ * ╚══════╝╚═╝╚═════╝ ╚═╝  ╚═╝╚═════╝ ╚═╝╚═╝     ╚═╝     
+ */
+
+ 
+$path = ARCH_PATH . $lib->name . '-' . $lib->version . '\\';
+$xdifflog = LOG . 'libxdiff.log';
+
+
+// Download and unzip libxdiff
+$tmpfile = TMP.pathinfo($lib->download_url, PATHINFO_BASENAME);
+if(!download_file($lib->download_url, $tmpfile, pathinfo($tmpfile, PATHINFO_BASENAME))) exit_error();
+if(!untar($tmpfile, ARCH_PATH)) exit_error();
+if(!is_dir($path)) exit_error("Can't find untar results");
+
+
+// Patch makefile.win32
+$contents = file_get_contents($path . 'makefile.win32');
+$contents = str_replace(':I386', ':X64', $contents);
+file_put_contents($path . 'makefile.win32', $contents);
+
+
+// Compile libxdiff
+$label = "Compile " . $lib->name . '-' . $lib->version;
+draw_line($label, "running", Yellow);
+$bat = '@echo off'.RN;
+$bat .= 'cd ' . escapeshellarg($path).RN;
+$bat .= 'nmake /f makefile.win32 CFG=release'.RN;
+$batfile = TMP . 'build_libxdiff.bat';
+file_put_contents($batfile, $bat);
+$ret = shell_exec_vs16($batfile);
+file_put_contents($xdifflog, $ret);
+
+
+// Verify if the build works
+if(!is_file($path . 'release\xdiff.lib')) draw_status($label, "failed", Red, true, 'SEE: ' . $xdifflog);
+else draw_status($label, "complete", Green);
+
+
+// Install libxdiff
+$label = "Install " . $lib->name . '-' . $lib->version;
+draw_line($label, "running", Yellow);
+$builddir = $path . 'build\\';
+
+$files[$path . 'release\xdiff.lib'] = 'lib\xdiff_a.lib';
+$files[$path . 'xdiff\xdiff.h'] = 'include\xdiff.h';
+
+if(!create_build($builddir, $files)) draw_status($label, "failed", Red, true);
+if(!install_deps($builddir)) draw_status($label, "failed", Red, true);
+else draw_status($label, "complete", Green);
+
+delete_parent_deps($lib->name);

matrix.json

@@ -1078,6 +1078,18 @@
             "switch": "--enable-var_representation",
             "dependancies": [],
             "libraries": []
+        },
+        {
+            "name": "rar",
+            "repo": "",
+            "url": "https://github.com/remicollet/php-rar/archive/refs/heads/issue-php82.zip",
+            "version": "4.2.0-1",
+            "archive": "php-rar-issue-php82",
+            "builtin": false,
+            "mandatory": false,
+            "switch": "--enable-rar",
+            "dependancies": [],
+            "libraries": []
         }
     ],
 
@@ -1535,9 +1547,8 @@
         {
             "name": "libxdiff",
             "version": "0.23",
-            "download_url": "https://windows.php.net/downloads/pecl/deps/libxdiff-0.23-vs16-x64.zip",
-            "install_script": "install_library.php",
-            "install_check": "lib\\xdiff_a.lib",
+            "download_url": "http://www.xmailserver.org/libxdiff-0.23.tar.gz",
+            "install_script": "install_libxdiff.php",
             "mandatory": false,
             "dependancies": []
         },

php/install_extension.php

@@ -35,7 +35,9 @@
             $tmpfile = preg_replace('#\.tgz$#i', '.tar.gz', $tmpfile);
 
         if (!download_file($ext->url, $tmpfile, pathinfo($tmpfile, PATHINFO_BASENAME))) exit_error();
-        if (!untar($tmpfile, EXT_PATH)) exit_error();
+        if (pathinfo($tmpfile, PATHINFO_EXTENSION) == 'zip') {
+            if (!unzip($tmpfile, EXT_PATH)) exit_error();
+        } elseif (!untar($tmpfile, EXT_PATH)) exit_error();
 
         if(!empty($ext->archive)) $tmpdir = EXT_PATH . $ext->archive;
         else $tmpdir = EXT_PATH . $ext->name . '-' . $ext->version;
@@ -58,7 +60,9 @@
                 $tmpfile = preg_replace('#\.tgz$#i', '.tar.gz', $tmpfile);
 
             if (!download_file($ext->url, $tmpfile, pathinfo($tmpfile, PATHINFO_BASENAME))) exit_error();
-            if (!untar($tmpfile, EXT_PATH)) exit_error();
+            if (pathinfo($tmpfile, PATHINFO_EXTENSION) == 'zip') {
+                if (!unzip($tmpfile, EXT_PATH)) exit_error();
+            } elseif (!untar($tmpfile, EXT_PATH)) exit_error();
 
             if(!empty($ext->archive)) $tmpdir = EXT_PATH . $ext->archive;
             else $tmpdir = EXT_PATH . $ext->name . '-' . $ext->version;

phpsab.php

@@ -22,7 +22,7 @@
 const CONFIG = DIR.'configs\\';
 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';
 const MAX_BUFFER_WIDTH = 100;
-const SPEED_DEV = true;
+const SPEED_DEV = false;
 
 
 draw_header("PHP Static Autobuilder");
@@ -362,7 +362,6 @@
 }
 
 
-
 /**
  * Install PHP
  */