From bde18054e5fcad82f5dbc3d1e3a97dcc84f0ec7c Mon Sep 17 00:00:00 2001
From: Jerry Ma <jesse2061@outlook.com>
Date: Mon, 6 May 2024 14:12:40 +0800
Subject: [PATCH] Fix micro upx compress bug (#440)

* triple compression for micro with upx

* place debug info first
---
 src/SPC/builder/linux/LinuxBuilder.php       | 12 +++++
 src/SPC/command/BuildCliCommand.php          |  2 +-
 src/globals/extra/micro-triple-Makefile.frag | 51 ++++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 src/globals/extra/micro-triple-Makefile.frag

diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php
index 2f509f1e..b191440c 100644
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -145,7 +145,19 @@ class LinuxBuilder extends UnixBuilderBase
         ]);
 
         // upx pack and strip for micro
+        // but always restore Makefile.frag.bak first
+        if (file_exists(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.bak')) {
+            copy(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.bak', SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag');
+        }
         if ($this->getOption('with-upx-pack', false)) {
+            // judge $(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)` count
+            // if 2, replace src/globals/extra/micro-triple-Makefile.frag file content
+            if (substr_count(FileSystem::readFile(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag'), '$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`') === 2) {
+                // bak first
+                copy(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag', SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.bak');
+                // replace Makefile.frag content
+                FileSystem::writeFile(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag', FileSystem::readFile(ROOT_DIR . '/src/globals/extra/micro-triple-Makefile.frag'));
+            }
             // with upx pack always need strip
             FileSystem::replaceFileRegex(
                 SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag',
diff --git a/src/SPC/command/BuildCliCommand.php b/src/SPC/command/BuildCliCommand.php
index cef61f99..478cc883 100644
--- a/src/SPC/command/BuildCliCommand.php
+++ b/src/SPC/command/BuildCliCommand.php
@@ -131,8 +131,8 @@ class BuildCliCommand extends BuildCommand
             if (!empty($not_included)) {
                 $indent_texts['Extra Exts (' . count($not_included) . ')'] = implode(', ', $not_included);
             }
-            $this->printFormatInfo($indent_texts);
             $this->printFormatInfo($this->getDefinedEnvs(), true);
+            $this->printFormatInfo($indent_texts);
             logger()->notice('Build will start after 2s ...');
             sleep(2);
 
diff --git a/src/globals/extra/micro-triple-Makefile.frag b/src/globals/extra/micro-triple-Makefile.frag
new file mode 100644
index 00000000..45a250cc
--- /dev/null
+++ b/src/globals/extra/micro-triple-Makefile.frag
@@ -0,0 +1,51 @@
+
+micro: $(SAPI_MICRO_PATH)
+
+micro_2s_objs:
+	rm $(MICRO_2STAGE_OBJS) || :
+	$(MAKE) $(MICRO_2STAGE_OBJS)
+
+EXTRA_MICRO_BUILD_COMMANDS=
+POST_MICRO_BUILD_COMMANDS=$(STRIP) $(MICRO_STRIP_FLAGS) $(SAPI_MICRO_PATH)
+
+$(SAPI_MICRO_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_MICRO_OBJS)
+	$(MAKE) micro_2s_objs SFX_FILESIZE=0xcafebabe
+	$(BUILD_MICRO)
+	$(EXTRA_MICRO_BUILD_COMMANDS)
+	$(POST_MICRO_BUILD_COMMANDS)
+	$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`
+	$(BUILD_MICRO)
+	$(EXTRA_MICRO_BUILD_COMMANDS)
+	$(POST_MICRO_BUILD_COMMANDS)
+	$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`
+	$(BUILD_MICRO)
+	$(EXTRA_MICRO_BUILD_COMMANDS)
+	$(POST_MICRO_BUILD_COMMANDS)
+	$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`
+	$(BUILD_MICRO)
+	$(EXTRA_MICRO_BUILD_COMMANDS)
+	$(POST_MICRO_BUILD_COMMANDS)
+
+MICRO_EXES = sapi/micro/tests/simpleecho.exe sapi/micro/tests/fakecmd.exe
+
+$(MICRO_EXES): $(SAPI_MICRO_PATH)
+	@binname=$@;\
+	cat $(SAPI_MICRO_PATH) $${binname%.exe}.php > $@ || {\
+		rm $@; \
+		exit 1; \
+	}
+	@chmod 0755 $@
+
+MICRO_FAKECMD=sapi/micro/tests/fakecmd.exe
+
+micro_test: $(SAPI_MICRO_PATH) $(MICRO_EXES)
+	@[ x"hello world" = "x`sapi/micro/tests/simpleecho.exe nonce world`" ] || {\
+		echo sanity check for micro.sfx failed, the sfx generated may be corrupt. >&2 ;\
+		exit 1;\
+	}
+	@SKIP_IO_CAPTURE_TESTS=yes \
+	TEST_PHP_EXECUTABLE=$(MICRO_FAKECMD) \
+	TEST_PHP_SRCDIR=$(top_srcdir) \
+	CC="$(CC)" \
+		$(MICRO_FAKECMD) -n $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n $(TESTS); \
+	exit $$?;