Skip to content

Commit

Permalink
Coverting Rhino to a Maven-managed dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
bobbylight committed Nov 16, 2014
1 parent 4acbe19 commit 6101b6e
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 572 deletions.
2 changes: 0 additions & 2 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="lib" path="lib/rhino/js-14.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
<classpathentry combineaccessrules="false" kind="src" path="/AutoComplete"/>
Expand Down
17 changes: 10 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
archivesBaseName = 'languagesupport'

dependencies {
compile group: 'org.mozilla', name: 'rhino', version: '1.7R4'
testCompile group: 'junit', name: 'junit', version: '4.11'
}

Expand All @@ -15,8 +16,7 @@ compileJava {
sourceCompatibility javaVersion
targetCompatibility javaVersion
classpath += files("${projectDir.absolutePath}/../RSyntaxTextArea/build/classes/main",
"${projectDir.absolutePath}/../AutoComplete/build/classes/main",
"${projectDir.absolutePath}/lib/rhino/js-14.jar")
"${projectDir.absolutePath}/../AutoComplete/build/classes/main")
options.debug = true
options.debugOptions.debugLevel = 'source,vars,lines'
// Most folks will compile with the latest JDK available, but official builds
Expand All @@ -35,7 +35,7 @@ compileJava {

ext.sharedManifest = manifest {
attributes('Main-Class': 'org.fife.rsta.ac.demo.DemoApp',
'Class-Path': 'rsyntaxtextarea.jar autocomplete.jar js-14.jar',
'Class-Path': 'rsyntaxtextarea.jar autocomplete.jar rhino-1.7R4.jar',
'Specification-Title': 'RSyntaxTextArea Language Support',
'Specification-Version': version,
'Implementation-Title': 'org.fife.ui',
Expand All @@ -51,12 +51,11 @@ distributions {
main {
baseName = 'language_support'
contents {
from { [ 'build/libs', 'lib/rhino', 'distfiles',
from { [ 'build/libs', // The built jar
configurations.runtime, // all runtime dependencies (e.g. rhino)
'../RSyntaxTextArea/build/libs/RSyntaxTextArea-2.5.4.jar',
'../AutoComplete/build/libs/AutoComplete-2.5.4.jar',
'RSTALanguageSupport.License.txt', 'readme.txt' ] }
rename 'build-date', 'Rhino.build-date'
rename 'LICENSE.txt', 'Rhino.LICENSE.txt'
rename 'RSyntaxTextArea-.*\\.jar', 'rsyntaxtextarea.jar'
rename 'AutoComplete-.*\\.jar', 'autocomplete.jar'
rename 'languagesupport-.*\\.jar', 'language_support.jar'
Expand All @@ -72,11 +71,15 @@ srcDistZip.classifier = 'src'
srcDistZip {
from projectDir
include 'src/**/*'
include 'data/**/*'
include 'build.gradle'
include '.classpath'
include '.project'
include 'gradle.properties'
include 'README.md'
include 'gradlew*'
include 'gradle/**/*'
include 'README.*'
include 'readme*'
include '.settings/**'
}

Expand Down
184 changes: 0 additions & 184 deletions build.xml

This file was deleted.

Loading

0 comments on commit 6101b6e

Please sign in to comment.