Permalink
Browse files

More renames to get the jar and complete jar moved over to the "Mirah…

…" name. A bit of additional renaming to move some of the src artifacts to new org.mirah namespace.
  • Loading branch information...
1 parent fc6ce44 commit 37eac8716faa735fc97b4b0f7bd297b90bdd7060 @headius headius committed Aug 2, 2010
@@ -2,7 +2,7 @@
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.jruby.duby.editor" default="netbeans" basedir=".">
- <description>Builds, tests, and runs the project org.jruby.duby.editor.</description>
+<project name="org.mirah.editor" default="netbeans" basedir=".">
+ <description>Builds, tests, and runs the project org.mirah.editor.</description>
<import file="nbproject/build-impl.xml"/>
</project>
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-OpenIDE-Module: org.jruby.duby.editor
+OpenIDE-Module: org.mirah.editor
OpenIDE-Module-Layer: org/jruby/duby/editor/layer.xml
OpenIDE-Module-Localizing-Bundle: org/jruby/duby/editor/Bundle.properties
OpenIDE-Module-Specification-Version: 1.0
@@ -3,7 +3,7 @@
*** GENERATED FROM project.xml - DO NOT EDIT ***
*** EDIT ../build.xml INSTEAD ***
-->
-<project name="org.jruby.duby.editor-impl" basedir="..">
+<project name="org.mirah.editor-impl" basedir="..">
<fail message="Please build using Ant 1.7.1 or higher.">
<condition>
<not>
@@ -3,11 +3,11 @@
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.jruby.duby.editor</code-name-base>
+ <code-name-base>org.mirah.editor</code-name-base>
<suite-component/>
<module-dependencies>
<dependency>
- <code-name-base>org.jruby.duby.compiler</code-name-base>
+ <code-name-base>org.mirah.compiler</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.jruby.duby.editor;
+package org.mirah.editor;
import java.io.IOException;
import org.openide.filesystems.FileObject;
@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
-package org.jruby.duby.editor;
+package org.mirah.editor;
/**
*
@@ -1,4 +1,4 @@
-package org.jruby.duby.editor;
+package org.mirah.editor;
import org.netbeans.api.lexer.Language;
import org.netbeans.modules.csl.api.Formatter;
@@ -1,9 +1,9 @@
-package org.jruby.duby.editor;
+package org.mirah.editor;
import java.util.ArrayList;
import java.util.List;
-import org.jruby.duby.ParseError;
-import org.jruby.duby.ParseResult;
+import org.mirah.ParseError;
+import org.mirah.ParseResult;
import org.jruby.runtime.builtin.IRubyObject;
import org.jrubyparser.SourcePosition;
import org.jrubyparser.lexer.SyntaxException;
@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
-package org.jruby.duby.editor;
+package org.mirah.editor;
import java.io.StringReader;
import java.util.ArrayList;
@@ -12,8 +12,8 @@
import javax.swing.event.ChangeListener;
import org.jruby.Ruby;
import org.jruby.RubyInstanceConfig;
-import org.jruby.duby.DubyCompiler;
-import org.jruby.duby.ParseResult;
+import org.mirah.DubyCompiler;
+import org.mirah.ParseResult;
import org.jruby.exceptions.RaiseException;
import org.jruby.javasupport.JavaEmbedUtils;
import org.jrubyparser.CompatVersion;
@@ -43,7 +43,7 @@
<folder name="text">
<folder name="x-duby">
<file name="language.instance">
- <attr name="instanceClass" stringvalue="org.jruby.duby.editor.DubyLanguage"/>
+ <attr name="instanceClass" stringvalue="org.mirah.editor.DubyLanguage"/>
</file>
</folder>
</folder>
@@ -104,7 +104,7 @@
<folder name="Factories">
<file name="DubyDataLoader.instance">
<attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/jruby/duby/editor/duby-icon.png"/>
- <attr name="dataObjectClass" stringvalue="org.jruby.duby.editor.DubyDataObject"/>
+ <attr name="dataObjectClass" stringvalue="org.mirah.editor.DubyDataObject"/>
<attr name="instanceCreate" methodvalue="org.openide.loaders.DataLoaderPool.factory"/>
<attr name="mimeType" stringvalue="text/x-duby"/>
</file>
@@ -115,14 +115,14 @@
<folder name="Services">
<folder name="MIMEResolver">
<file name="DubyResolver.xml" url="DubyResolver.xml">
- <attr name="SystemFileSystem.localizingBundle" stringvalue="org.jruby.duby.editor.Bundle"/>
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.mirah.editor.Bundle"/>
</file>
</folder>
</folder>
<folder name="Templates">
<folder name="Other">
<file name="DubyTemplate.duby" url="DubyTemplate.duby">
- <attr name="SystemFileSystem.localizingBundle" stringvalue="org.jruby.duby.editor.Bundle"/>
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.mirah.editor.Bundle"/>
<attr name="template" boolvalue="true"/>
</file>
</folder>
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.jruby.duby.editor;
+package org.mirah.editor;
import junit.framework.TestCase;
import org.openide.filesystems.FileObject;
@@ -2,7 +2,7 @@
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.jruby.duby.compiler" default="netbeans" basedir=".">
- <description>Builds, tests, and runs the project org.jruby.duby.compiler.</description>
+<project name="org.mirah.compiler" default="netbeans" basedir=".">
+ <description>Builds, tests, and runs the project org.mirah.compiler.</description>
<import file="nbproject/build-impl.xml"/>
</project>
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-OpenIDE-Module: org.jruby.duby.compiler
+OpenIDE-Module: org.mirah.compiler
OpenIDE-Module-Localizing-Bundle: org/jruby/duby/compiler/Bundle.properties
OpenIDE-Module-Specification-Version: 1.0
@@ -3,7 +3,7 @@
*** GENERATED FROM project.xml - DO NOT EDIT ***
*** EDIT ../build.xml INSTEAD ***
-->
-<project name="org.jruby.duby.compiler-impl" basedir="..">
+<project name="org.mirah.compiler-impl" basedir="..">
<fail message="Please build using Ant 1.7.1 or higher.">
<condition>
<not>
@@ -3,7 +3,7 @@
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.jruby.duby.compiler</code-name-base>
+ <code-name-base>org.mirah.compiler</code-name-base>
<suite-component/>
<module-dependencies>
<dependency>
@@ -17,7 +17,7 @@
</dependency>
</module-dependencies>
<public-packages>
- <package>org.jruby.duby</package>
+ <package>org.mirah</package>
<package>org.jrubyparser</package>
<package>org.jrubyparser.ast</package>
<package>org.jrubyparser.lexer</package>
@@ -1,5 +1,5 @@
modules=\
- ${project.org.jruby.duby.editor}:\
- ${project.org.jruby.duby.compiler}
-project.org.jruby.duby.compiler=DubyCompiler
-project.org.jruby.duby.editor=Duby Editor
+ ${project.org.mirah.editor}:\
+ ${project.org.mirah.compiler}
+project.org.mirah.compiler=DubyCompiler
+project.org.mirah.editor=Duby Editor
View
@@ -32,55 +32,54 @@ task :compile => :init do
JRuby::Compiler.compile_argv([
'-t', 'build',
'--javac',
- 'src/org/jruby/duby/duby_command.rb'
+ 'src/org/mirah/mirah_command.rb'
])
- # build the Duby sources
- puts "Compiling Duby sources"
+ # build the Mirah sources
+ puts "Compiling Mirah sources"
Dir.chdir 'src' do
classpath = Duby::Env.encode_paths([
'javalib/jruby-complete.jar',
'javalib/JRubyParser.jar',
- 'dist/duby.jar',
'build',
'/usr/share/ant/lib/ant.jar'
])
Duby.compile(
'-c', classpath,
'-d', '../build',
- 'org/jruby/duby',
+ 'org/mirah',
'duby/lang',
'mirah'
)
end
end
task :jar => :compile do
- ant.jar :jarfile => 'dist/duby.jar' do
+ ant.jar :jarfile => 'dist/mirah.jar' do
fileset :dir => 'lib'
fileset :dir => 'build'
fileset :dir => '.', :includes => 'bin/*'
fileset :dir => '../bitescript/lib'
manifest do
- attribute :name => 'Main-Class', :value => 'org.jruby.duby.DubyCommand'
+ attribute :name => 'Main-Class', :value => 'org.mirah.MirahCommand'
end
end
end
namespace :jar do
task :complete => :jar do
- ant.jar :jarfile => 'dist/duby-complete.jar' do
- zipfileset :src => 'dist/duby.jar'
+ ant.jar :jarfile => 'dist/mirah-complete.jar' do
+ zipfileset :src => 'dist/mirah.jar'
zipfileset :src => 'javalib/jruby-complete.jar'
zipfileset :src => 'javalib/JRubyParser.jar'
manifest do
- attribute :name => 'Main-Class', :value => 'org.jruby.duby.DubyCommand'
+ attribute :name => 'Main-Class', :value => 'org.mirah.MirahCommand'
end
end
end
task :bootstrap => :compile do
- ant.jar :jarfile => 'javalib/duby-bootstrap.jar' do
+ ant.jar :jarfile => 'javalib/mirah-bootstrap.jar' do
fileset :dir => 'build'
end
end
@@ -1,5 +1,5 @@
<project name="test">
- <taskdef name="dubyc" classname="org.jruby.duby.ant.Compile"/>
+ <taskdef name="dubyc" classname="org.mirah.ant.Compile"/>
<target name="blah">
<dubyc src="examples/fib.duby" target="build"/>
View
Binary file not shown.
View
@@ -312,6 +312,8 @@ def expand_files(files)
end
end
+Mirah = Duby
+
if __FILE__ == $0
Duby.run(ARGV[0], *ARGV[1..-1])
end
@@ -789,7 +789,7 @@ def bootstrap_dynamic
def @class.bootstrapped; true; end
method = @class.build_method("<clinit>", :public, :static, [], Java::void)
method.start
- method.ldc org.jruby.duby.DynalangBootstrap
+ method.ldc org.mirah.DynalangBootstrap
method.ldc "bootstrap"
method.invokestatic java.dyn.Linkage, "registerBootstrapMethod", [method.void, java.lang.Class, method.string]
method.returnvoid
View
@@ -1,12 +1,12 @@
require 'mirah'
module Duby
class NbCompiler
- include org.jruby.duby.DubyCompiler
+ include org.mirah.DubyCompiler
class ParseResult
- ParseError = org.jruby.duby.ParseError
+ ParseError = org.mirah.ParseError
- include org.jruby.duby.ParseResult
+ include org.mirah.ParseResult
attr_reader :ast, :errors
def initialize(ast, errors)
@@ -1,7 +1,7 @@
import org.jrubyparser.SourcePosition
class ParseError
- def initialize(message => String, position => SourcePosition)
+ def initialize(message:String, position:SourcePosition)
@message = message
@position = position
end
@@ -30,7 +30,7 @@ interface ParseResult do
end
interface DubyCompiler do
- def parse(text => String)
+ def parse(text:String)
returns ParseResult
end
end
@@ -1,4 +1,4 @@
-package org.jruby.duby;
+package org.mirah;
import org.dynalang.dynalink.*;
import org.dynalang.dynalink.beans.*;
@@ -1,7 +1,7 @@
import org.apache.tools.ant.Task
import org.apache.tools.ant.types.Path
import java.io.File
-import org.jruby.duby.DubyCommand
+import org.mirah.MirahCommand
import java.util.ArrayList
class Compile < Task
@@ -14,7 +14,7 @@ class Compile < Task
def execute; returns void
handleOutput("compiling Duby source in #{@src} to #{@target}")
- DubyCommand.compile(
+ MirahCommand.compile(
['-d', @target, '--cd', @dir, '-c', @classpath.toString, @src])
end
@@ -2,27 +2,27 @@
require 'mirah'
java_import 'java.util.List'
-java_package "org.jruby.duby"
-class DubyCommand
+java_package "org.mirah"
+class MirahCommand
java_signature "void main(String[])"
def self.main(args)
rb_args = args.to_a
command = rb_args.shift.to_s
case command
when "compile"
- DubyCommand.compile(rb_args)
+ MirahCommand.compile(rb_args)
when "run"
- DubyCommand.run(rb_args)
+ MirahCommand.run(rb_args)
end
end
java_signature 'void compile(List args)'
def self.compile(args)
- Duby.compile(*args)
+ Mirah.compile(*args)
end
java_signature 'void run(List args)'
def self.run(args)
- Duby.run(*args)
+ Mirah.run(*args)
end
end

0 comments on commit 37eac87

Please sign in to comment.