Upgrade JPPM 0.5.4 & 0.5.5

Author: dim-s

packager/buildSrc/AppPlugin.php

@@ -311,6 +311,11 @@ function build(Event $event)
                     $javaRuntimeBuilder->addJar($jar);
                 }
 
+                $tree = $event->packager()->fetchDependencyTree($event->package(), '');
+                $tree->eachDep(function (Package $pkg) use ($javaRuntimeBuilder) {
+                    $javaRuntimeBuilder->addJvmModules(...$pkg->getAny('jvm-modules', []));
+                });
+
                 $javaRuntimeBuilder->build($buildDir);
                 Console::log("-> Java Runtime is build successfully, the app will use the 'jre' dir as JAVA_HOME");
             }

packager/buildSrc/app/AppPluginJavaRuntimeBuilder.php

@@ -8,6 +8,7 @@
 use php\lang\System;
 use php\lib\fs;
 use php\lib\str;
+use php\util\Flow;
 
 class AppPluginJavaRuntimeBuilder
 {
@@ -16,6 +17,8 @@ class AppPluginJavaRuntimeBuilder
      */
     public $jars = [];
 
+    public $jvmModules = [];
+
     public function __construct()
     {
     }
@@ -25,6 +28,16 @@ public function addJar($jar)
         $this->jars[$jar] = $jar;
     }
 
+    public function addJvmModules(...$modules)
+    {
+        foreach ($modules as $module) {
+            if (!$this->jvmModules[$module]) {
+                $this->jvmModules[$module] = $module;
+                Console::log("-- add jvm module '{0}'", $module);
+            }
+        }
+    }
+
     public function fetchModules($workingDir)
     {
         $javaExec = new JavaExec();
@@ -41,8 +54,14 @@ public function fetchModules($workingDir)
                 foreach (str::lines($string, true) as $line) {
                     [, $module] = str::split($line, "->");
                     $module = str::trim($module);
-                    if ($module === "not found") continue;
-                    $modules[$module] = $module;
+                    if ($module === "not found") {
+                        continue;
+                    }
+
+                    if (!$modules[$module]) {
+                        Console::log("-- add jvm module '{0}'", $module);
+                        $modules[$module] = $module;
+                    }
                 }
             }
         }
@@ -52,11 +71,10 @@ public function fetchModules($workingDir)
 
     public function build($workingDir)
     {
-        $modules = $this->fetchModules($workingDir);
-
-        foreach ($modules as $module) {
-            Console::log("-- add jvm module '{0}'", $module);
-        }
+        $modules = flow(
+            $this->fetchModules($workingDir),
+            $this->jvmModules
+        )->toMap();
 
         $javaExec = new JavaExec();
         $javaHome = fs::parent($javaExec->getJavaBin());

packager/buildSrc/app/__compile-app-bytecode.php

@@ -5,6 +5,7 @@
 use php\lang\Environment;
 use php\lang\Module;
 use php\lib\fs;
+use php\lib\str;
 
 function ____makePackage($fileOrStream)
 {
@@ -84,20 +85,23 @@ function ____compile($sourceDir)
     spl_autoload_register(function ($name) use ($sourceDir, &$includedFiles) {
         echo("Try class '$name' auto load\n");
 
-        $filename = "$sourceDir/$name.php";
-        $includedFiles[fs::normalize($filename)] = true;
+        $filename = "$sourceDir/" . str::replace($name, "\\", "/") . ".php";
 
-        if (fs::exists($filename)) {
+        if (fs::isFile($filename)) {
             echo "Find class '$name' in ", $filename, "\n";
+            $includedFiles[fs::normalize($filename)] = true;
 
-            $compiled = new File($sourceDir, $name . ".phb");
+            $compiled = new File($sourceDir, str::replace($name, "\\", "/") . ".phb");
             fs::ensureParent($compiled);
 
             $fileStream = new FileStream($filename);
             $module = new Module($fileStream, false, true);
             $module->dump($compiled, true);
             $fileStream->close();
+            $includedFiles[fs::normalize($filename)] = true;
             return;
+        } else {
+            echo "[WARN] Unable to load '$name' class, '$filename' is not found";
         }
     });
 

packager/example/hello-world/src/index.php

@@ -1,4 +1,19 @@
 <?php
+use std;
 
 $hello = new \helloworld\HelloWorld("Hello? World");
-$hello->print();
+//$hello->print();
+
+function test($a, $b, $c) {
+    return $a + $b + $c;
+}
+
+function foo() {
+    for ($i = 0; $i < 10000000; $i++) {
+        $r = test($i, $i, $i);
+    }
+}
+
+$t = Time::millis();
+foo();
+echo (Time::millis() - $t) . "ms\n";

packager/package.php.yml

@@ -1,5 +1,5 @@
 name: jppm
-version: 0.5.3
+version: 0.5.5
 
 plugins: [GitHub, Hub, Doc]
 
@@ -14,9 +14,7 @@ github:
     > JPHP Package Manager v%version%
 
     **What's new**
-    + Add jlink support for build Java Runtime portable (in App plugin)
-    + Add launch scripts (sh & bat) in App Plugin
-    + Improve internal SDK.
+    + Fix bytecode compilation for Linux & Mac.
 
     **Downloads**
     + For Windows: [JPPM Windows Installer](%github.address%/releases/download/jppm-%version%/jppm-setup-%version%.exe)