From 1e0a4e0dfe496c25b8d3dd973b8ff9e23a536b83 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Wed, 23 Oct 2013 18:51:12 +0400 Subject: [PATCH] Moved pty4j (with dependencies) from terminal plugin to community --- .idea/libraries/jna.xml | 1 + .idea/libraries/pty4j.xml | 9 +++++ .idea/libraries/purejavacomm.xml | 11 ++++++ build/scripts/layouts.gant | 10 +++--- .../terminal/lib => lib}/jna-platform.jar | Bin .../lib => lib/libpty}/linux/x86/libpty.so | Bin .../lib => lib/libpty}/linux/x86_64/libpty.so | Bin .../libpty}/macosx/x86/libpty.dylib | Bin .../libpty}/macosx/x86_64/libpty.dylib | Bin .../lib => lib/libpty}/win/x86/libwinpty.dll | Bin .../libpty}/win/x86/winpty-agent.exe | Bin .../libpty}/win/x86_64/libwinpty.dll | Bin .../libpty}/win/x86_64/winpty-agent.exe | Bin {plugins/terminal/lib => lib}/pty4j-0.3.jar | Bin .../terminal/lib => lib}/purejavacomm.jar | Bin lib/required_for_dist.txt | 3 ++ .../lib => lib/src}/purejavacomm-src.jar | Bin plugins/terminal/lib/readme.txt | 6 +--- plugins/terminal/terminal.iml | 32 ++---------------- 19 files changed, 34 insertions(+), 38 deletions(-) create mode 100644 .idea/libraries/pty4j.xml create mode 100644 .idea/libraries/purejavacomm.xml rename {plugins/terminal/lib => lib}/jna-platform.jar (100%) rename {plugins/terminal/lib => lib/libpty}/linux/x86/libpty.so (100%) mode change 100755 => 100644 rename {plugins/terminal/lib => lib/libpty}/linux/x86_64/libpty.so (100%) mode change 100755 => 100644 rename {plugins/terminal/lib => lib/libpty}/macosx/x86/libpty.dylib (100%) mode change 100755 => 100644 rename {plugins/terminal/lib => lib/libpty}/macosx/x86_64/libpty.dylib (100%) mode change 100755 => 100644 rename {plugins/terminal/lib => lib/libpty}/win/x86/libwinpty.dll (100%) rename {plugins/terminal/lib => lib/libpty}/win/x86/winpty-agent.exe (100%) rename {plugins/terminal/lib => lib/libpty}/win/x86_64/libwinpty.dll (100%) rename {plugins/terminal/lib => lib/libpty}/win/x86_64/winpty-agent.exe (100%) rename {plugins/terminal/lib => lib}/pty4j-0.3.jar (100%) rename {plugins/terminal/lib => lib}/purejavacomm.jar (100%) rename {plugins/terminal/lib => lib/src}/purejavacomm-src.jar (100%) diff --git a/.idea/libraries/jna.xml b/.idea/libraries/jna.xml index d9fed3852d8f..7a9e4319d055 100644 --- a/.idea/libraries/jna.xml +++ b/.idea/libraries/jna.xml @@ -3,6 +3,7 @@ + diff --git a/.idea/libraries/pty4j.xml b/.idea/libraries/pty4j.xml new file mode 100644 index 000000000000..c35366324432 --- /dev/null +++ b/.idea/libraries/pty4j.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/purejavacomm.xml b/.idea/libraries/purejavacomm.xml new file mode 100644 index 000000000000..52826cccf0e7 --- /dev/null +++ b/.idea/libraries/purejavacomm.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 6d4ce63a38d5..b9a47721ad17 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -120,6 +120,12 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir } } + dir("libpty") { + fileset(dir: "$home/lib/libpty") { + exclude(name: "readme.txt") + } + } + jar("util.jar") { module("util") module("util-rt") @@ -478,10 +484,6 @@ public def layoutCommunityPlugins(String home) { fileset(dir: "$home/plugins/terminal/lib") { include(name: "*.jar") include(name: "*.in") - include(name: "**/*.dll") - include(name: "**/*.exe") - include(name: "**/*.dylib") - include(name: "**/*.so") } } } diff --git a/plugins/terminal/lib/jna-platform.jar b/lib/jna-platform.jar similarity index 100% rename from plugins/terminal/lib/jna-platform.jar rename to lib/jna-platform.jar diff --git a/plugins/terminal/lib/linux/x86/libpty.so b/lib/libpty/linux/x86/libpty.so old mode 100755 new mode 100644 similarity index 100% rename from plugins/terminal/lib/linux/x86/libpty.so rename to lib/libpty/linux/x86/libpty.so diff --git a/plugins/terminal/lib/linux/x86_64/libpty.so b/lib/libpty/linux/x86_64/libpty.so old mode 100755 new mode 100644 similarity index 100% rename from plugins/terminal/lib/linux/x86_64/libpty.so rename to lib/libpty/linux/x86_64/libpty.so diff --git a/plugins/terminal/lib/macosx/x86/libpty.dylib b/lib/libpty/macosx/x86/libpty.dylib old mode 100755 new mode 100644 similarity index 100% rename from plugins/terminal/lib/macosx/x86/libpty.dylib rename to lib/libpty/macosx/x86/libpty.dylib diff --git a/plugins/terminal/lib/macosx/x86_64/libpty.dylib b/lib/libpty/macosx/x86_64/libpty.dylib old mode 100755 new mode 100644 similarity index 100% rename from plugins/terminal/lib/macosx/x86_64/libpty.dylib rename to lib/libpty/macosx/x86_64/libpty.dylib diff --git a/plugins/terminal/lib/win/x86/libwinpty.dll b/lib/libpty/win/x86/libwinpty.dll similarity index 100% rename from plugins/terminal/lib/win/x86/libwinpty.dll rename to lib/libpty/win/x86/libwinpty.dll diff --git a/plugins/terminal/lib/win/x86/winpty-agent.exe b/lib/libpty/win/x86/winpty-agent.exe similarity index 100% rename from plugins/terminal/lib/win/x86/winpty-agent.exe rename to lib/libpty/win/x86/winpty-agent.exe diff --git a/plugins/terminal/lib/win/x86_64/libwinpty.dll b/lib/libpty/win/x86_64/libwinpty.dll similarity index 100% rename from plugins/terminal/lib/win/x86_64/libwinpty.dll rename to lib/libpty/win/x86_64/libwinpty.dll diff --git a/plugins/terminal/lib/win/x86_64/winpty-agent.exe b/lib/libpty/win/x86_64/winpty-agent.exe similarity index 100% rename from plugins/terminal/lib/win/x86_64/winpty-agent.exe rename to lib/libpty/win/x86_64/winpty-agent.exe diff --git a/plugins/terminal/lib/pty4j-0.3.jar b/lib/pty4j-0.3.jar similarity index 100% rename from plugins/terminal/lib/pty4j-0.3.jar rename to lib/pty4j-0.3.jar diff --git a/plugins/terminal/lib/purejavacomm.jar b/lib/purejavacomm.jar similarity index 100% rename from plugins/terminal/lib/purejavacomm.jar rename to lib/purejavacomm.jar diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 111f8821205a..1a6918100cef 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -21,6 +21,7 @@ jgoodies-forms.jar jgoodies-looks-2.4.2.jar jh.jar jna-utils.jar +jna-platform.jar jna.jar jsch-0.1.50.jar jsr166e.jar @@ -39,6 +40,8 @@ oromatcher.jar picocontainer.jar protobuf-2.5.0.jar proxy-vole_20120920.jar +pty4j-0.3.jar +purejavacomm.jar resolver.jar rhino-js-1_7R4.jar sanselan-0.98-snapshot.jar diff --git a/plugins/terminal/lib/purejavacomm-src.jar b/lib/src/purejavacomm-src.jar similarity index 100% rename from plugins/terminal/lib/purejavacomm-src.jar rename to lib/src/purejavacomm-src.jar diff --git a/plugins/terminal/lib/readme.txt b/plugins/terminal/lib/readme.txt index 99b15d4a7d5a..d7a8c1fa3353 100644 --- a/plugins/terminal/lib/readme.txt +++ b/plugins/terminal/lib/readme.txt @@ -1,5 +1 @@ -* JNA - Java Native Access - https://github.com/twall/jna -* pty4j - Java PTY implementation - https://github.com/traff/pty4j -* purejavacomm - we use forked version that fixes JNA and YourKit Profiler incompatibility - https://github.com/traff/purejavacomm -* jediterm-pty - PTY terminal from https://github.com/traff/jediterm -* libwinpty.dll and winpty-agent.exe - Windows PTY native implementation used by pty4j, we use forked version from https://github.com/traff/winpty +* jediterm-pty - PTY terminal from https://github.com/traff/jediterm \ No newline at end of file diff --git a/plugins/terminal/terminal.iml b/plugins/terminal/terminal.iml index 59daabb61b81..ce9ede14fcf9 100644 --- a/plugins/terminal/terminal.iml +++ b/plugins/terminal/terminal.iml @@ -10,35 +10,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -49,6 +20,9 @@ + + +