From 441ce56c24edd017eb287cfe8cb8c00559fa6496 Mon Sep 17 00:00:00 2001 From: houxudong Date: Fri, 26 Aug 2016 20:22:28 +0800 Subject: [PATCH 1/5] add ant build --- .scriptjava/Script.java | 29 +++++++++++++++++++++++++++++ README.md | 14 ++++++++++++-- build.xml | 28 ++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 .scriptjava/Script.java create mode 100644 build.xml diff --git a/.scriptjava/Script.java b/.scriptjava/Script.java new file mode 100644 index 0000000..55b8793 --- /dev/null +++ b/.scriptjava/Script.java @@ -0,0 +1,29 @@ +import scriptjava.IScript; +import java.util.*; +import java.text.*; +import java.io.*; +import static scriptjava.buildins.Buildins.*; +import static scriptjava.buildins.Length.*; +import static scriptjava.buildins.Bool.*; +import static scriptjava.buildins.Reflect.*; +import static scriptjava.buildins.Network.*; +import static scriptjava.buildins.Storage.*; +import static scriptjava.buildins.Exec.*; +import static scriptjava.buildins.Json.*; +import static java.lang.Math.*; +import static scriptjava.buildins.IO.*; +import static scriptjava.buildins.Range.*; +import static scriptjava.buildins.Str.*; +import static scriptjava.buildins.Copy.*; + + +@SuppressWarnings({"unchecked", "finally", "deprecation", "path", "serial", "fallthrough"}) +public class Script implements scriptjava.IScript { + +public void execute() throws Throwable { +print(2); + +} + + +} \ No newline at end of file diff --git a/README.md b/README.md index d184cab..2ca0739 100644 --- a/README.md +++ b/README.md @@ -86,11 +86,21 @@ Before launching the executable make sure, that there is `javac` in the system P ## Building -The main project has no dependencies, so it's a straight-forward process. However, building from IDE (when project is created from the source code) -won't work, as current functionality requires the project's jar in the execution directory (due to build-in imports & IScript) +The main project has no dependencies, so it's a straight-forward process. Tests require `Gson` (for json testing) +build with ant : + +```bash +git clone https://github.com/noties/ScriptJava.git +cd ScriptJava +ant install +java -jar ScriptJava.ja +``` + +enjoy it~ + ## License diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..c722dbb --- /dev/null +++ b/build.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5cb24d2b2e283c645b2bc97de1742090a2890bc0 Mon Sep 17 00:00:00 2001 From: houxudong Date: Fri, 26 Aug 2016 20:23:37 +0800 Subject: [PATCH 2/5] remove --- .scriptjava/Script.java | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .scriptjava/Script.java diff --git a/.scriptjava/Script.java b/.scriptjava/Script.java deleted file mode 100644 index 55b8793..0000000 --- a/.scriptjava/Script.java +++ /dev/null @@ -1,29 +0,0 @@ -import scriptjava.IScript; -import java.util.*; -import java.text.*; -import java.io.*; -import static scriptjava.buildins.Buildins.*; -import static scriptjava.buildins.Length.*; -import static scriptjava.buildins.Bool.*; -import static scriptjava.buildins.Reflect.*; -import static scriptjava.buildins.Network.*; -import static scriptjava.buildins.Storage.*; -import static scriptjava.buildins.Exec.*; -import static scriptjava.buildins.Json.*; -import static java.lang.Math.*; -import static scriptjava.buildins.IO.*; -import static scriptjava.buildins.Range.*; -import static scriptjava.buildins.Str.*; -import static scriptjava.buildins.Copy.*; - - -@SuppressWarnings({"unchecked", "finally", "deprecation", "path", "serial", "fallthrough"}) -public class Script implements scriptjava.IScript { - -public void execute() throws Throwable { -print(2); - -} - - -} \ No newline at end of file From d32936cccd83b619c90ba96b978113733baed381 Mon Sep 17 00:00:00 2001 From: houxudong Date: Fri, 26 Aug 2016 20:24:16 +0800 Subject: [PATCH 3/5] add --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 70380b2..70af72e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,6 @@ /.idea/ /out/ -/binary/.cache/ \ No newline at end of file +/binary/.cache/ + +.scriptjava/ \ No newline at end of file From fc4252a187d369283da68314c33effdbcea76691 Mon Sep 17 00:00:00 2001 From: houxudong Date: Fri, 26 Aug 2016 20:33:31 +0800 Subject: [PATCH 4/5] fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ca0739..5bce43d 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ build with ant : git clone https://github.com/noties/ScriptJava.git cd ScriptJava ant install -java -jar ScriptJava.ja +java -jar build/jar/ScriptJava.jar ``` enjoy it~ From fb5878fc3a87d6382a6fb50b30cbe651ebf0664a Mon Sep 17 00:00:00 2001 From: houxudong Date: Fri, 26 Aug 2016 20:36:51 +0800 Subject: [PATCH 5/5] ignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 70af72e..78276a5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ /out/ /binary/.cache/ -.scriptjava/ \ No newline at end of file +.scriptjava/ +libs/ \ No newline at end of file