Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unbitrot MMeta #4

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org/"

gem 'bitescript', '>= 0.1.2', :path => '../bitescript'
gem 'bitescript', '>= 0.1.2'
gem 'mirah', '>= 0.1', :path => '../mirah'

gem 'rake'
File renamed without changes.
10 changes: 5 additions & 5 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ end

file 'dist/mmeta-runtime.jar' => Dir.glob('mmeta/*.{java,mirah}') + ['build/runtime', 'dist'] do
ENV['BS_CHECK_CLASSES'] = 'true'
mirahc('mmeta/ast.mirah', :dest => 'build/runtime')
ant.javac :srcDir=>'mmeta', :destDir=>'build/runtime', :debug=>true
mirahc('mmeta/ast.mirah', :dest => 'build/runtime', :options => ['--jvm', '1.5'])
ant.javac :srcDir=>'mmeta', :destDir=>'build/runtime', :debug=>true, :target => '1.5', :source => '1.5'
ant.jar :destfile=>'dist/mmeta-runtime.jar', :basedir=>'build/runtime'
end

Expand All @@ -29,7 +29,7 @@ file 'build/boot/mmeta/MMetaParser.class' => ['boot/parser.mirah', 'build/boot/m
mirahc('build/boot/mmeta/parser.mirah',
:dir => 'build/boot',
:dest => 'build/boot',
:options => ['--classpath', 'dist/mmeta-runtime.jar'])
:options => ['--jvm', '1.5', '--classpath', 'dist/mmeta-runtime.jar'])
end

file 'build/boot/mmeta/MMetaCompiler.class' => ['boot/compiler.mirah', 'build/boot/mmeta', 'dist/mmeta-runtime.jar' ] do
Expand All @@ -38,7 +38,7 @@ file 'build/boot/mmeta/MMetaCompiler.class' => ['boot/compiler.mirah', 'build/bo
:dir => 'build/boot',
:dest => 'build/boot',
:options => [
'--classpath', 'build/boot:dist/mmeta-runtime.jar:javalib/hapax-2.3.5-autoindent.jar'
'--jvm', '1.5', '--classpath', 'build/boot:dist/mmeta-runtime.jar:javalib/hapax-2.3.5-autoindent.jar'
])
end

Expand Down Expand Up @@ -67,7 +67,7 @@ namespace :test do
ant.javac :srcDir => 'build/test',
:classpath => 'dist/mmeta-runtime.jar',
:debug => true
mirahc 'test',
mirahc 'build/test',
:dir=>'build',
:dest=>'build',
:options=>[
Expand Down
Loading