Skip to content

Commit

Permalink
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions install/jruby.install4j
Original file line number Diff line number Diff line change
@@ -132,8 +132,8 @@
<components />
</files>
<launchers>
<launcher name="irb (2.2)" id="261" external="false" excludeFromMenu="false" menuName="" icnsFile="" pngIcon16File="./icon16.png" pngIcon32File="./icon32.png" macServiceDependencies="" swtApp="false" fileset="">
<executable name="irb (2.2)" type="1" iconSet="true" iconFile="" executableDir="" redirectStderr="true" stderrFile="error.log" stderrMode="overwrite" redirectStdout="false" stdoutFile="output.log" stdoutMode="overwrite" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="true" workingDirectory="." singleInstance="false" serviceStartType="2" serviceDependencies="" serviceDescription="" jreLocation="" executionLevel="asInvoker" checkConsoleParameter="false" globalSingleInstance="false">
<launcher name="irb (2.3)" id="261" external="false" excludeFromMenu="false" menuName="" icnsFile="" pngIcon16File="./icon16.png" pngIcon32File="./icon32.png" macServiceDependencies="" swtApp="false" fileset="">
<executable name="irb (2.3)" type="1" iconSet="true" iconFile="" executableDir="" redirectStderr="true" stderrFile="error.log" stderrMode="overwrite" redirectStdout="false" stdoutFile="output.log" stdoutMode="overwrite" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="true" workingDirectory="." singleInstance="false" serviceStartType="2" serviceDependencies="" serviceDescription="" jreLocation="" executionLevel="asInvoker" checkConsoleParameter="false" globalSingleInstance="false">
<versionInfo include="false" fileVersion="" fileDescription="" legalCopyright="" internalName="" productName="" />
</executable>
<splashScreen show="false" autoOff="true" alwaysOnTop="true" width="0" height="0" bitmapFile="./jruby-logo.png" java6SplashScreen="false">
2 changes: 1 addition & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ def initialize( name, version, default_spec = true )
ImportedGem.new( 'jar-dependencies', '${jar-dependencies.version}' ),
ImportedGem.new( 'racc', '${racc.version}'),
ImportedGem.new( 'net-telnet', '0.1.1'),
#ImportedGem.new( 'did_you_mean', '1.0.0'),
#ImportedGem.new( 'did_you_mean', '1.0.1'),
]

project 'JRuby Lib Setup' do
6 changes: 5 additions & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -288,10 +288,10 @@ module Commands

def help
puts 'jt checkout name checkout a different Git branch and rebuild'
puts 'jt bootstrap run the build system\'s bootstrap phase'
puts 'jt build [options] build'
puts 'jt build truffle [options] build only the Truffle part, assumes the rest is up-to-date'
puts 'jt rebuild [options] clean and build'
puts ' --no-tests don\'t run JUnit unit tests'
puts 'jt clean clean'
puts 'jt irb irb'
puts 'jt rebuild clean and build'
@@ -359,6 +359,10 @@ def checkout(branch)
rebuild
end

def bootstrap
mvn '-DskipTests', '-Pbootstrap-no-launcher'
end

def build(project = nil)
opts = %w[-DskipTests]
case project

0 comments on commit f7d805a

Please sign in to comment.