Browse Source

jruby support in script. We ought to have a task to add these declarations.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278277 13f79535-47bb-0310-9956-ffa450edef68
master
Steve Loughran 20 years ago
parent
commit
8be3ac4c48
2 changed files with 15 additions and 5 deletions
  1. +4
    -5
      src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
  2. +11
    -0
      src/main/org/apache/tools/ant/util/ScriptRunner.java

+ 4
- 5
src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java View File

@@ -311,10 +311,7 @@ public class ScriptDef extends DefBase {
* @deprecated use executeScript(attribute, elements, instance) instead
*/
public void executeScript(Map attributes, Map elements) {
runner.addBean("attributes", attributes);
runner.addBean("elements", elements);
runner.addBean("project", getProject());
runner.executeScript("scriptdef_" + name);
executeScript(attributes, elements,null);
}

/**
@@ -330,7 +327,9 @@ public class ScriptDef extends DefBase {
runner.addBean("attributes", attributes);
runner.addBean("elements", elements);
runner.addBean("project", getProject());
runner.addBean("self", instance);
if(instance!=null) {
runner.addBean("self", instance);
}
runner.executeScript("scriptdef_" + name);
}



+ 11
- 0
src/main/org/apache/tools/ant/util/ScriptRunner.java View File

@@ -47,6 +47,17 @@ public class ScriptRunner {
new String[] {"groovy", "gy"});
}

// Register Jruby ourselves, since BSF does not
// natively support it (yet).
// This "hack" can be removed once BSF has been
// modified to support Jruby or more dynamic
// registration.
static {
BSFManager.registerScriptingEngine("ruby",
"org.jruby.javasupport.bsf.JRubyEngine",
new String[]{"ruby","rb"});
}

/** Script language */
private String language;



Loading…
Cancel
Save