aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test cases/java/2 subdir/sub/meson.build3
-rw-r--r--test cases/java/5 includedirs/meson.build1
-rw-r--r--test cases/java/6 codegen/com/mesonbuild/Config.java.in (renamed from test cases/java/7 codegen/com/mesonbuild/Config.java.in)0
-rw-r--r--test cases/java/6 codegen/com/mesonbuild/Simple.java (renamed from test cases/java/7 codegen/com/mesonbuild/Simple.java)0
-rw-r--r--test cases/java/6 codegen/com/mesonbuild/TextPrinter.java (renamed from test cases/java/6 no includedirs/com/mesonbuild/TextPrinter.java)0
-rw-r--r--test cases/java/6 codegen/com/mesonbuild/meson.build (renamed from test cases/java/7 codegen/com/mesonbuild/meson.build)0
-rw-r--r--test cases/java/6 codegen/meson.build (renamed from test cases/java/7 codegen/meson.build)0
-rw-r--r--test cases/java/6 no includedirs/com/mesonbuild/Simple.java8
-rw-r--r--test cases/java/6 no includedirs/meson.build14
-rw-r--r--test cases/java/7 codegen/com/mesonbuild/TextPrinter.java14
10 files changed, 1 insertions, 39 deletions
diff --git a/test cases/java/2 subdir/sub/meson.build b/test cases/java/2 subdir/sub/meson.build
index 807ca51..2111c06 100644
--- a/test cases/java/2 subdir/sub/meson.build
+++ b/test cases/java/2 subdir/sub/meson.build
@@ -1,6 +1,5 @@
javaprog = jar('myprog',
'com/mesonbuild/Simple.java',
'com/mesonbuild/TextPrinter.java',
- main_class : 'com.mesonbuild.Simple',
- include_directories : include_directories('.'))
+ main_class : 'com.mesonbuild.Simple')
test('subdirtest', javaprog)
diff --git a/test cases/java/5 includedirs/meson.build b/test cases/java/5 includedirs/meson.build
index 0b2942d..cf0b565 100644
--- a/test cases/java/5 includedirs/meson.build
+++ b/test cases/java/5 includedirs/meson.build
@@ -10,6 +10,5 @@ javaprog = jar('myprog',
'com/mesonbuild/TextPrinter.java',
main_class : 'com.mesonbuild.Simple',
include_directories : [ include_directories('com'),
- include_directories('.'),
include_directories('com/mesonbuild') ])
test('subdirtest', javaprog)
diff --git a/test cases/java/7 codegen/com/mesonbuild/Config.java.in b/test cases/java/6 codegen/com/mesonbuild/Config.java.in
index fcc8811..fcc8811 100644
--- a/test cases/java/7 codegen/com/mesonbuild/Config.java.in
+++ b/test cases/java/6 codegen/com/mesonbuild/Config.java.in
diff --git a/test cases/java/7 codegen/com/mesonbuild/Simple.java b/test cases/java/6 codegen/com/mesonbuild/Simple.java
index df3c53d..df3c53d 100644
--- a/test cases/java/7 codegen/com/mesonbuild/Simple.java
+++ b/test cases/java/6 codegen/com/mesonbuild/Simple.java
diff --git a/test cases/java/6 no includedirs/com/mesonbuild/TextPrinter.java b/test cases/java/6 codegen/com/mesonbuild/TextPrinter.java
index 7e330a6..7e330a6 100644
--- a/test cases/java/6 no includedirs/com/mesonbuild/TextPrinter.java
+++ b/test cases/java/6 codegen/com/mesonbuild/TextPrinter.java
diff --git a/test cases/java/7 codegen/com/mesonbuild/meson.build b/test cases/java/6 codegen/com/mesonbuild/meson.build
index 188bedf..188bedf 100644
--- a/test cases/java/7 codegen/com/mesonbuild/meson.build
+++ b/test cases/java/6 codegen/com/mesonbuild/meson.build
diff --git a/test cases/java/7 codegen/meson.build b/test cases/java/6 codegen/meson.build
index f85d45a..f85d45a 100644
--- a/test cases/java/7 codegen/meson.build
+++ b/test cases/java/6 codegen/meson.build
diff --git a/test cases/java/6 no includedirs/com/mesonbuild/Simple.java b/test cases/java/6 no includedirs/com/mesonbuild/Simple.java
deleted file mode 100644
index 05a73ac..0000000
--- a/test cases/java/6 no includedirs/com/mesonbuild/Simple.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mesonbuild;
-
-class Simple {
- public static void main(String [] args) {
- TextPrinter t = new TextPrinter("Printing from Java.");
- t.print();
- }
-}
diff --git a/test cases/java/6 no includedirs/meson.build b/test cases/java/6 no includedirs/meson.build
deleted file mode 100644
index b399211..0000000
--- a/test cases/java/6 no includedirs/meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-# It used to be necessary to pass:
-#
-# include_directories: include_directories('.')
-#
-# to any use of jar() to compile source code with inter-file class
-# dependencies. This is now the default behaviour.
-
-project('noincludedirsjava', 'java')
-
-javaprog = jar('myprog',
- 'com/mesonbuild/Simple.java',
- 'com/mesonbuild/TextPrinter.java',
- main_class : 'com.mesonbuild.Simple')
-test('subdirtest', javaprog)
diff --git a/test cases/java/7 codegen/com/mesonbuild/TextPrinter.java b/test cases/java/7 codegen/com/mesonbuild/TextPrinter.java
deleted file mode 100644
index 7e330a6..0000000
--- a/test cases/java/7 codegen/com/mesonbuild/TextPrinter.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mesonbuild;
-
-class TextPrinter {
-
- private String msg;
-
- TextPrinter(String s) {
- msg = s;
- }
-
- public void print() {
- System.out.println(msg);
- }
-}