changeset 1453:96b757be9de2

Including jline in the build. Native sources based on http://cr.openjdk.java.net/~sherman/rl/ Reviewed-by: iris
author jlahoda
date Thu, 28 May 2015 08:58:11 +0200
parents 8838e6f7ac27
children bcc2e862f25a
files make/CompileJavaModules.gmk modules.xml
diffstat 2 files changed, 29 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk	Sun Apr 26 17:38:41 2015 +0200
+++ b/make/CompileJavaModules.gmk	Thu May 28 08:58:11 2015 +0200
@@ -282,11 +282,13 @@
 
 ################################################################################
 
-JDK_JSHELL_EXPAND_JLINE:
-	$(UNZIP) -o -d "$(JDK_OUTPUTDIR)/modules/jdk.jshell/" "$(JLINE2LIB)"
+jdk.jline_ADD_JAVAC_FLAGS := -Xlint:none -Xlint:-deprecation -Xlint:-unchecked
+jdk.jline_EXCLUDE_FILES += jdk/internal/jline/AnsiWindowsTerminal.java
+jdk.jline_COPY := .properties
 
-jdk.jshell_ADD_JAVAC_FLAGS := -classpath "$(JLINE2LIB)" -Xlint:none
-jdk.jshell_COPY_EXTRA += JDK_JSHELL_EXPAND_JLINE
+################################################################################
+
+jdk.jshell_ADD_JAVAC_FLAGS := -Xlint:none
 
 ################################################################################
 
--- a/modules.xml	Sun Apr 26 17:38:41 2015 +0200
+++ b/modules.xml	Thu May 28 08:58:11 2015 +0200
@@ -761,6 +761,28 @@
     </export>
   </module>
   <module>
+    <name>jdk.jline</name>
+    <depend>java.base</depend>
+    <depend>java.desktop</depend> <!--unnecessary???-->
+    <depend>java.datatransfer</depend> <!--for jline -->
+    <export>
+      <name>jdk.internal.jline</name>
+      <to>jdk.jshell</to>
+    </export>
+    <export>
+      <name>jdk.internal.jline.console</name>
+      <to>jdk.jshell</to>
+    </export>
+    <export>
+      <name>jdk.internal.jline.console.completer</name>
+      <to>jdk.jshell</to>
+    </export>
+    <export>
+      <name>jdk.internal.jline.console.history</name>
+      <to>jdk.jshell</to>
+    </export>
+  </module>
+  <module>
     <name>jdk.jshell</name>
     <depend>java.base</depend>
     <depend re-exports="true">java.compiler</depend> <!-- reexport for Diagnostic! -->
@@ -769,6 +791,7 @@
     <depend>java.datatransfer</depend> <!--for jline -->
     <depend>java.prefs</depend>
     <depend>jdk.jdi</depend>
+    <depend>jdk.jline</depend>
     <export>
       <name>jdk.jshell</name>
     </export>