瀏覽代碼

HPCC-21337 Fix javaembed build error (source/target version)

Previous fix mised one instance that needed -source.

Also remove registred TM symbol as it caused Java some issues.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 6 年之前
父節點
當前提交
7e4bd9442a
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      plugins/javaembed/CMakeLists.txt
  2. 1 1
      plugins/javaembed/HpccClassLoader.java
  3. 1 1
      plugins/javaembed/HpccUtils.java

+ 1 - 1
plugins/javaembed/CMakeLists.txt

@@ -53,7 +53,7 @@ if(JAVAEMBED)
         set(java_sources HpccClassLoader.java HpccUtils.java)
         set(java_classes ${CMAKE_CURRENT_BINARY_DIR}/com/HPCCSystems/HpccClassLoader.class ${CMAKE_CURRENT_BINARY_DIR}/com/HPCCSystems/HpccUtils.class)
         add_custom_command ( OUTPUT ${java_classes}
-            COMMAND ${Java_JAVAC_EXECUTABLE} ${java_sources} -d ${CMAKE_CURRENT_BINARY_DIR} -target 1.8
+            COMMAND ${Java_JAVAC_EXECUTABLE} ${java_sources} -d ${CMAKE_CURRENT_BINARY_DIR} -source 1.8 -target 1.8
             DEPENDS ${java_sources}
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         )

+ 1 - 1
plugins/javaembed/HpccClassLoader.java

@@ -1,6 +1,6 @@
 /*##############################################################################
 
-    HPCC SYSTEMS software Copyright (C) 2018 HPCC Systems®.
+    HPCC SYSTEMS software Copyright (C) 2018 HPCC Systems(R).
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

+ 1 - 1
plugins/javaembed/HpccUtils.java

@@ -1,6 +1,6 @@
 /*##############################################################################
 
-    HPCC SYSTEMS software Copyright (C) 2014 HPCC Systems®.
+    HPCC SYSTEMS software Copyright (C) 2014 HPCC Systems(R).
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.