Implement argv[0], optimize gradle config.

fankins · Apr 21, 2017 · fd14fd2 · fd14fd2
1 parent afc3e55
commit fd14fd2
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,20 +1,10 @@
 def javaVersion    = '1.7';
 def projectVersion = '0.9.0';
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
-    }
-}
-
 allprojects {
     apply plugin: 'idea'
     apply plugin: 'signing'
     apply plugin: 'java'
-    apply plugin: 'maven'
 
     project.group = 'org.develnext.jphp'
     project.version = projectVersion
@@ -46,7 +36,6 @@ allprojects {
 }
 
 configure(subprojects) {
-    apply plugin: 'maven'
     apply plugin: 'java'
 
     sourceCompatibility = javaVersion

diff --git a/jphp-core/build.gradle b/jphp-core/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'maven'
+
 sourceSets {
     main.java.srcDirs = ['src']
     main.resources.srcDirs = ['resources']

diff --git a/jphp-core/src/php/runtime/launcher/Launcher.java b/jphp-core/src/php/runtime/launcher/Launcher.java
@@ -22,6 +22,7 @@
 
 import java.io.*;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.*;
 
 public class Launcher {
@@ -322,7 +323,13 @@ public void run(boolean mustBootstrap, boolean disableExtensions) throws Throwab
                 initModule(bootstrap);
 
                 ArrayMemory argv = ArrayMemory.ofStrings(this.args);
-                argv.unshift(Memory.NULL);
+
+                String path = URLDecoder.decode(
+                        Launcher.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath(),
+                        "UTF-8"
+                );
+
+                argv.unshift(StringMemory.valueOf(path));
 
                 environment.getGlobals().put("argv", argv);
                 environment.getGlobals().put("argc", LongMemory.valueOf(argv.size()));

diff --git a/jphp-debugger/build.gradle b/jphp-debugger/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'maven'
+
 dependencies {
     compile project(':jphp-core')
     compile 'commons-codec:commons-codec:1.10'

diff --git a/jphp-json-ext/build.gradle b/jphp-json-ext/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'maven'
+
 dependencies {
     compile project(':jphp-runtime')
     compile 'com.google.code.gson:gson:2.7'

diff --git a/jphp-jsoup-ext/build.gradle b/jphp-jsoup-ext/build.gradle
@@ -1,4 +1,4 @@
-
+apply plugin: 'maven'
 
 dependencies {
     compile project(':jphp-runtime')

diff --git a/jphp-mail-ext/build.gradle b/jphp-mail-ext/build.gradle
@@ -1,3 +1,4 @@
+apply plugin: 'maven'
 
 dependencies {
     compile project(':jphp-runtime')

diff --git a/jphp-runtime/build.gradle b/jphp-runtime/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'maven'
+
 sourceSets {
     main.java.srcDirs = ['src']
 }

diff --git a/jphp-scripting/build.gradle b/jphp-scripting/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'maven'
+
 sourceSets {
     main {
         java {

diff --git a/jphp-sql-ext/build.gradle b/jphp-sql-ext/build.gradle
@@ -1,3 +1,4 @@
+apply plugin: 'maven'
 
 dependencies {
     compile project(':jphp-runtime')

diff --git a/jphp-xml-ext/build.gradle b/jphp-xml-ext/build.gradle
@@ -1,3 +1,4 @@
+apply plugin: 'maven'
 
 dependencies {
     compile project(':jphp-runtime')

diff --git a/jphp-zend-ext/build.gradle b/jphp-zend-ext/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'maven'
+
 sourceSets {
     test.resources.srcDirs = ["src/main/tests"]
 }

diff --git a/sandbox/src/JPHP-INF/.bootstrap.php b/sandbox/src/JPHP-INF/.bootstrap.php
@@ -1 +1 @@
-<?echo "Hello World";
+<?var_dump($argv);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?echo "Hello World";
		<?var_dump($argv);
Expand Down