chore: wip

chrisbbreuer · chrisbbreuer · commit 67fce92e024c · 2025-09-18T20:21:19.000-07:00
diff --git a/.github/workflows/precompile-php.yml b/.github/workflows/precompile-php.yml
@@ -165,11 +165,9 @@ jobs:
       - name: Install build dependencies (macOS)
         if: matrix.platform == 'darwin'
         run: |
-          # Fallback to Homebrew for reliable CI builds
-          brew install autoconf automake libtool pkg-config bison re2c libxml2 openssl curl libpng jpeg freetype oniguruma libzip postgresql readline bzip2 gmp openldap libxslt icu4c libsodium zlib gettext
-          # Set up environment for Homebrew tools
-          echo "/opt/homebrew/bin:/usr/local/bin:$PATH" >> $GITHUB_PATH
-          echo "PKG_CONFIG_PATH=/opt/homebrew/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
+          # macOS: Let Launchpad handle all dependencies
+          echo "📦 macOS build will use Launchpad for all dependencies"
+          echo "🚀 No system package installation needed - Launchpad will provide everything"
 
       - name: Install build dependencies (Windows)
         if: matrix.platform == 'win32'
diff --git a/packages/launchpad/src/binary-downloader.ts b/packages/launchpad/src/binary-downloader.ts
@@ -4,6 +4,7 @@ import { Buffer } from 'node:buffer'
 import { execSync } from 'node:child_process'
 import * as fs from 'node:fs'
 import * as path from 'node:path'
+import process from 'node:process'
 import { config } from './config'
 import { createShims } from './install-helpers'
 import { logUniqueMessage } from './logging'
@@ -1508,7 +1509,7 @@ exec "${originalBinary}" "$@"
             const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf8'))
             if (metadata.icu_version && metadata.icu_version !== 'unknown') {
               const icuMajor = Number.parseInt(metadata.icu_version, 10)
-              if (!isNaN(icuMajor)) {
+              if (!Number.isNaN(icuMajor)) {
                 if (config.verbose) {
                   console.log(`🔍 Detected ICU v${icuMajor} from binary metadata`)
                 }
diff --git a/packages/launchpad/src/commands/cache/clean.ts b/packages/launchpad/src/commands/cache/clean.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import type { Command } from '../../cli/types'
 
 const cmd: Command = {
diff --git a/packages/launchpad/src/commands/cache/stats.ts b/packages/launchpad/src/commands/cache/stats.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import type { Command } from '../../cli/types'
 
 const cmd: Command = {
diff --git a/packages/launchpad/src/commands/config.ts b/packages/launchpad/src/commands/config.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import type { Command } from '../cli/types'
 import type { ValidationResult } from '../config-validation'
 import fs from 'node:fs'
diff --git a/packages/launchpad/src/commands/md5.ts b/packages/launchpad/src/commands/md5.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import type { Command } from '../cli/types'
 
 const cmd: Command = {
diff --git a/packages/launchpad/src/commands/reinstall.ts b/packages/launchpad/src/commands/reinstall.ts
@@ -1,5 +1,6 @@
 /* eslint-disable no-console */
 import type { Command } from '../cli/types'
+import process from 'node:process'
 import { config } from '../config'
 
 const cmd: Command = {
diff --git a/packages/launchpad/src/php/build-script.ts b/packages/launchpad/src/php/build-script.ts
@@ -4,6 +4,7 @@ import type { PhpBuildConfig } from './precompiler'
 import { existsSync, mkdirSync } from 'node:fs'
 import { arch, platform } from 'node:os'
 import { join } from 'node:path'
+import process from 'node:process'
 import { logUniqueMessage } from '../logging'
 import { BuildDependencyManager } from './build-dependencies'
 import { PhpPrecompiler } from './precompiler'
diff --git a/packages/launchpad/src/php/precompiler.ts b/packages/launchpad/src/php/precompiler.ts
@@ -2,6 +2,7 @@ import { execSync } from 'node:child_process'
 import { existsSync, mkdirSync, rmSync } from 'node:fs'
 import * as fs from 'node:fs'
 import { join } from 'node:path'
+import process from 'node:process'
 import { logUniqueMessage } from '../logging'
 
 export interface PhpBuildConfig {
diff --git a/packages/launchpad/src/setup.ts b/packages/launchpad/src/setup.ts
@@ -1,5 +1,7 @@
+/* eslint-disable no-console */
 import fs from 'node:fs'
 import path from 'node:path'
+import process from 'node:process'
 
 /**
  * Core setup logic used by both setup and upgrade commands
diff --git a/packages/launchpad/test/environment-success-validation.test.ts b/packages/launchpad/test/environment-success-validation.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { afterEach, beforeEach, describe, expect, it } from 'bun:test'
 import { execSync } from 'node:child_process'
 import fs from 'node:fs'
diff --git a/packages/launchpad/test/service-e2e-validation.test.ts b/packages/launchpad/test/service-e2e-validation.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { afterEach, beforeEach, describe, expect, it } from 'bun:test'
 import { execSync } from 'node:child_process'
 import fs from 'node:fs'
diff --git a/scripts/build-php.ts b/scripts/build-php.ts
@@ -1,8 +1,8 @@
 #!/usr/bin/env bun
-
-const { execSync } = require('node:child_process')
-const { mkdirSync, existsSync, writeFileSync, readdirSync } = require('node:fs')
-const { join } = require('node:path')
+import { execSync } from 'node:child_process'
+import { existsSync, mkdirSync, readdirSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+import process from 'node:process'
 
 interface BuildConfig {
   phpVersion: string
@@ -75,7 +75,7 @@ function downloadPhpSource(config: BuildConfig): string {
 
 async function downloadWindowsPhpBinary(config: BuildConfig): Promise<string> {
   const binaryName = `php-${config.phpVersion}-${config.platform}-${config.arch}-${config.config}`
-  const installPrefix = join(config.outputDir, binaryName)
+  const installPrefix = join(process.cwd(), config.outputDir, binaryName)
 
   // Create the directory structure that the main build function expects
   const phpSourceDir = join(config.buildDir, `php-${config.phpVersion}`)
@@ -790,7 +790,7 @@ openssl.capath =
 }
 
 async function buildPhp(config: BuildConfig): Promise<string> {
-  const installPrefix = join(config.outputDir, `php-${config.phpVersion}-${config.platform}-${config.arch}-${config.config}`)
+  const installPrefix = join(process.cwd(), config.outputDir, `php-${config.phpVersion}-${config.platform}-${config.arch}-${config.config}`)
 
   // For Windows, use pre-compiled binaries
   if (config.platform === 'win32') {
@@ -809,7 +809,7 @@ async function buildPhp(config: BuildConfig): Promise<string> {
   mkdirSync(installPrefix, { recursive: true })
 
   // Set up build environment with selective Launchpad dependencies
-  let buildEnv = { ...process.env }
+  const buildEnv = { ...process.env }
   const homeDir = process.env.HOME || process.env.USERPROFILE
   if (!homeDir) {
     throw new Error('HOME or USERPROFILE environment variable must be set')
@@ -1045,129 +1045,86 @@ exec "$@"
 
   log('Using Launchpad-managed dependencies for all extensions')
 
+  // Replace generic dependency flags with Launchpad-specific paths for libraries without pkg-config
+  const bz2Index = configureArgs.findIndex(arg => arg === '--with-bz2')
+  if (bz2Index !== -1) {
+    configureArgs[bz2Index] = `--with-bz2=${homeDir}/.local/sourceware.org/bzip2/v1.0.8`
+  }
+
+  const gettextIndex = configureArgs.findIndex(arg => arg === '--with-gettext')
+  if (gettextIndex !== -1) {
+    configureArgs[gettextIndex] = `--with-gettext=${homeDir}/.local/gnu.org/gettext/v0.22.5`
+  }
+
+  // Try macOS system iconv path
+  const iconvIndex = configureArgs.findIndex(arg => arg === '--with-iconv')
+  if (iconvIndex !== -1) {
+    configureArgs[iconvIndex] = '--with-iconv=/usr'
+  }
+
   log(`Configuring PHP with essential extensions: ${configureArgs.join(' ')}`)
 
   // Source the Launchpad environment and run configure in the same shell
   const buildEnvScript = `${homeDir}/.local/build-env.sh`
   let configureCommand: string
 
-  // Check if Launchpad environment script exists, otherwise install dependencies first
-  if (existsSync(buildEnvScript)) {
-    configureCommand = `source ${buildEnvScript} && ./configure ${configureArgs.join(' ')}`
-  }
-  else {
-    log('⚠️  Launchpad build-env.sh not found')
-
-    // Check if we're in CI environment - skip Launchpad dependencies if system dependencies are available
-    const isCI = process.env.CI === 'true' || process.env.GITHUB_ACTIONS === 'true'
+  // Always use Launchpad for dependency management - install dependencies first if needed
+  if (!existsSync(buildEnvScript)) {
+    log('📦 Installing PHP dependencies via Launchpad...')
 
-    // Check if essential build tools are available (installed via the CI workflow)
-    const checkSystemDeps = () => {
-      try {
-        execSync('which pkg-config && which autoconf && which bison', { stdio: 'pipe' })
-        return true
-      }
-      catch {
-        return false
+    try {
+      const isCI = process.env.CI === 'true' || process.env.GITHUB_ACTIONS === 'true'
+
+      const launchpadEnv = {
+        ...process.env,
+        LAUNCHPAD_SHOW_ENV_MESSAGES: 'false',
+        LAUNCHPAD_SHELL_ACTIVATION_MESSAGE: '',
+        LAUNCHPAD_SHELL_DEACTIVATION_MESSAGE: '',
+        LAUNCHPAD_NETWORK_MAX_CONCURRENT: isCI ? '3' : '6', // More conservative in CI
+        LAUNCHPAD_CACHE_ENABLED: 'true', // Enable caching
+        LAUNCHPAD_VERBOSE: process.env.LAUNCHPAD_VERBOSE || 'false',
       }
-    }
-
-    let useSystemDeps = false
-
-    if (isCI) {
-      log('🏗️  CI environment detected - checking for system dependencies...')
-
-      if (checkSystemDeps()) {
-        log('✅ System dependencies found - skipping Launchpad dependency installation')
-        log('🚀 Using system-provided dependencies for faster CI builds')
 
-        // Set up environment for system dependencies
-        const systemEnv = {
-          ...buildEnv,
-          // Add common system paths for macOS (Homebrew) and Linux
-          PKG_CONFIG_PATH: [
-            '/opt/homebrew/lib/pkgconfig',
-            '/usr/local/lib/pkgconfig',
-            '/usr/lib/pkgconfig',
-            buildEnv.PKG_CONFIG_PATH,
-          ].filter(Boolean).join(':'),
-          PATH: [
-            '/opt/homebrew/bin',
-            '/usr/local/bin',
-            buildEnv.PATH,
-          ].filter(Boolean).join(':'),
-        }
-
-        configureCommand = `./configure ${configureArgs.join(' ')}`
-        buildEnv = systemEnv
-        useSystemDeps = true
-      }
-      else {
-        log('⚠️  System dependencies not found - falling back to Launchpad installation')
-      }
+      // Install PHP dependencies
+      execSync('bun ./launchpad install php --deps-only', {
+        stdio: 'inherit',
+        cwd: process.cwd(),
+        timeout: 20 * 60 * 1000, // 20 minutes timeout
+        env: launchpadEnv,
+      })
+      log('✅ Launchpad dependencies installed successfully')
+    }
+    catch (error) {
+      throw new Error(`Failed to install PHP dependencies via Launchpad: ${error}`)
     }
+  }
 
-    // Install PHP dependencies using Launchpad (only if not using system deps)
-    if (!useSystemDeps) {
-      try {
-        const launchpadEnv = {
-          ...process.env,
-          LAUNCHPAD_SHOW_ENV_MESSAGES: 'false',
-          LAUNCHPAD_SHELL_ACTIVATION_MESSAGE: '',
-          LAUNCHPAD_SHELL_DEACTIVATION_MESSAGE: '',
-          LAUNCHPAD_NETWORK_MAX_CONCURRENT: '6', // Increase concurrent downloads
-          LAUNCHPAD_CACHE_ENABLED: 'true', // Enable caching
-          CI: 'true', // Ensure CI mode
-        }
+  // Source the Launchpad environment and run configure
+  if (existsSync(buildEnvScript)) {
+    log('✅ Using Launchpad build environment')
+    configureCommand = `source ${buildEnvScript} && ./configure ${configureArgs.join(' ')}`
+  }
+  else {
+    log('🔧 Launchpad build-env.sh still not found after installation - using fallback environment')
 
-        // Install PHP dependencies with optimized CI settings
-        log('📦 Installing PHP dependencies with optimized settings...')
-        execSync('bun ./launchpad install php --deps-only', {
-          stdio: 'inherit',
-          cwd: process.cwd(),
-          timeout: 15 * 60 * 1000, // 15 minutes timeout
-          env: launchpadEnv,
-        })
-        log('✅ Launchpad dependencies installed successfully')
+    // Fallback configuration without Launchpad environment
+    configureCommand = `./configure ${configureArgs.join(' ')}`
 
-        // Now try to source the environment script
-        if (existsSync(buildEnvScript)) {
-          configureCommand = `source ${buildEnvScript} && ./configure ${configureArgs.join(' ')}`
+    // Force clean environment for Linux to prevent libstdc++ injection
+    if (config.platform === 'linux') {
+      // Clear any remaining gcc/libstdc++ references from environment
+      Object.keys(buildEnv).forEach((key) => {
+        if (typeof buildEnv[key] === 'string' && buildEnv[key].includes('gnu.org/gcc')) {
+          buildEnv[key] = buildEnv[key].replace(/\S*gnu\.org\/gcc\S*/g, '')
         }
-        else {
-          log('Configuring PHP build...')
-
-          // Force clean environment for Linux to prevent libstdc++ injection
-          if (config.platform === 'linux') {
-            // Clear any remaining gcc/libstdc++ references from environment
-            Object.keys(buildEnv).forEach((key) => {
-              if (typeof buildEnv[key] === 'string' && buildEnv[key].includes('gnu.org/gcc')) {
-                buildEnv[key] = buildEnv[key].replace(/\S*gnu\.org\/gcc\S*/g, '')
-              }
-              if (typeof buildEnv[key] === 'string' && buildEnv[key].includes('libstdcxx')) {
-                buildEnv[key] = buildEnv[key].replace(/\S*libstdcxx\S*/g, '')
-              }
-            })
-          }
-
-          if (config.config === 'ci') {
-            // Use CI-specific configure for GitHub Actions
-            const ciConfigureArgs = generateCIConfigureArgs(config, installPrefix)
-            configureCommand = `./configure ${ciConfigureArgs.join(' ')}`
-          }
-          else {
-            // Use standard configure for local builds
-            const configureArgs = generateConfigureArgs(config, installPrefix)
-            configureCommand = `./configure ${configureArgs.join(' ')}`
-          }
+        if (typeof buildEnv[key] === 'string' && buildEnv[key].includes('libstdcxx')) {
+          buildEnv[key] = buildEnv[key].replace(/\S*libstdcxx\S*/g, '')
         }
-      }
-      catch (error) {
-        log('❌ Failed to install Launchpad dependencies, falling back to system libraries')
-        const ciConfigureArgs = generateCIConfigureArgs(config, installPrefix)
-        configureCommand = `./configure ${ciConfigureArgs.join(' ')}`
-      }
+      })
     }
+
+    // Use standard configure args for fallback
+    configureCommand = `./configure ${configureArgs.join(' ')}`
   }
 
   execSync(configureCommand, {
diff --git a/test-build-deps.ts b/test-build-deps.ts
@@ -1,5 +1,6 @@
 #!/usr/bin/env bun
 
+import process from 'node:process'
 import { logUniqueMessage } from './packages/launchpad/src/logging'
 import { BuildDependencyManager } from './packages/launchpad/src/php/build-dependencies'
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* eslint-disable no-console */`
`1`	`2`	`import type { Command } from '../../cli/types'`
`2`	`3`
`3`	`4`	`const cmd: Command = {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* eslint-disable no-console */`
`1`	`2`	`import type { Command } from '../cli/types'`
`2`	`3`	`import type { ValidationResult } from '../config-validation'`
`3`	`4`	`import fs from 'node:fs'`