This change makes the java-example app universal so that it can be used with
any
Java runtime module like so:
./scripts/build image=java,java-example
./scripts/build image=openjdk8-fedora,java-example
./scripts/build image=openjdk8-zulu-compact1,java-example
./scripts/build image=openjdk8-zulu-compact2,java-example
./scripts/build image=openjdk8-zulu-compact3,java-example
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
java-compact1-example/Hello.java | 5 -----
java-compact1-example/Makefile | 7 -------
java-compact1-example/module.py | 5 -----
java-compact1-example/usr.manifest | 1 -
java-compact2-example/Hello.java | 5 -----
java-compact2-example/Makefile | 7 -------
java-compact2-example/module.py | 5 -----
java-compact2-example/usr.manifest | 1 -
java-compact3-example/Hello.java | 5 -----
java-compact3-example/Makefile | 7 -------
java-compact3-example/module.py | 5 -----
java-compact3-example/usr.manifest | 1 -
java-example/module.py | 2 +-
13 files changed, 1 insertion(+), 55 deletions(-)
delete mode 100644 java-compact1-example/Hello.java
delete mode 100644 java-compact1-example/Makefile
delete mode 100644 java-compact1-example/module.py
delete mode 100644 java-compact1-example/usr.manifest
delete mode 100644 java-compact2-example/Hello.java
delete mode 100644 java-compact2-example/Makefile
delete mode 100644 java-compact2-example/module.py
delete mode 100644 java-compact2-example/usr.manifest
delete mode 100644 java-compact3-example/Hello.java
delete mode 100644 java-compact3-example/Makefile
delete mode 100644 java-compact3-example/module.py
delete mode 100644 java-compact3-example/usr.manifest
diff --git a/java-compact1-example/Hello.java b/java-compact1-example/Hello.java
deleted file mode 100644
index a605554..0000000
--- a/java-compact1-example/Hello.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Hello {
- public static void main(String[] args) {
- System.out.println("Hello, World!");
- }
-}
diff --git a/java-compact1-example/Makefile b/java-compact1-example/Makefile
deleted file mode 100644
index 8a385c9..0000000
--- a/java-compact1-example/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-module: Hello.class
-
-%.class: %.java
- javac -target 7 -source 7 $^
-
-clean:
- rm -rf *.class
diff --git a/java-compact1-example/module.py b/java-compact1-example/module.py
deleted file mode 100644
index 216cf35..0000000
--- a/java-compact1-example/module.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from osv.modules import api
-
-api.require('openjdk8-zulu-compact1')
-
-default = api.run('/java.so -cp /java-example Hello')
diff --git a/java-compact1-example/usr.manifest
b/java-compact1-example/usr.manifest
deleted file mode 100644
index f62abc7..0000000
--- a/java-compact1-example/usr.manifest
+++ /dev/null
@@ -1 +0,0 @@
-/java-example/Hello.class: ${MODULE_DIR}/Hello.class
diff --git a/java-compact2-example/Hello.java b/java-compact2-example/Hello.java
deleted file mode 100644
index a605554..0000000
--- a/java-compact2-example/Hello.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Hello {
- public static void main(String[] args) {
- System.out.println("Hello, World!");
- }
-}
diff --git a/java-compact2-example/Makefile b/java-compact2-example/Makefile
deleted file mode 100644
index 8a385c9..0000000
--- a/java-compact2-example/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-module: Hello.class
-
-%.class: %.java
- javac -target 7 -source 7 $^
-
-clean:
- rm -rf *.class
diff --git a/java-compact2-example/module.py b/java-compact2-example/module.py
deleted file mode 100644
index f17ac37..0000000
--- a/java-compact2-example/module.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from osv.modules import api
-
-api.require('openjdk8-zulu-compact2')
-
-default = api.run('/java.so -cp /java-example Hello')
diff --git a/java-compact2-example/usr.manifest
b/java-compact2-example/usr.manifest
deleted file mode 100644
index f62abc7..0000000
--- a/java-compact2-example/usr.manifest
+++ /dev/null
@@ -1 +0,0 @@
-/java-example/Hello.class: ${MODULE_DIR}/Hello.class
diff --git a/java-compact3-example/Hello.java b/java-compact3-example/Hello.java
deleted file mode 100644
index a605554..0000000
--- a/java-compact3-example/Hello.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Hello {
- public static void main(String[] args) {
- System.out.println("Hello, World!");
- }
-}
diff --git a/java-compact3-example/Makefile b/java-compact3-example/Makefile
deleted file mode 100644
index 8a385c9..0000000
--- a/java-compact3-example/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-module: Hello.class
-
-%.class: %.java
- javac -target 7 -source 7 $^
-
-clean:
- rm -rf *.class
diff --git a/java-compact3-example/module.py b/java-compact3-example/module.py
deleted file mode 100644
index 05cb1f4..0000000
--- a/java-compact3-example/module.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from osv.modules import api
-
-api.require('openjdk8-zulu-compact3')
-
-default = api.run('/java.so -cp /java-example Hello')
diff --git a/java-compact3-example/usr.manifest
b/java-compact3-example/usr.manifest
deleted file mode 100644
index f62abc7..0000000
--- a/java-compact3-example/usr.manifest
+++ /dev/null
@@ -1 +0,0 @@
-/java-example/Hello.class: ${MODULE_DIR}/Hello.class
diff --git a/java-example/module.py b/java-example/module.py
index 747612f..848bbba 100644
--- a/java-example/module.py
+++ b/java-example/module.py
@@ -2,4 +2,4 @@ from osv.modules import api
api.require('java')
-default = api.run_java(classpath=['/java-example'], args=['Hello'])
+default = api.run('/java.so -cp /java-example Hello')
--
2.7.4
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
