Permalink
Browse files

build-config.xml: You suck

  • Loading branch information...
1 parent 615e5af commit 61b1f7fe86c7490d02e1c9c50d7e08aa992bb6b4 @enebo enebo committed Oct 23, 2009
Showing with 4 additions and 13 deletions.
  1. +1 −2 Rakefile
  2. +0 −8 build-config.xml
  3. +0 −2 build.xml
  4. +3 −0 default.build.properties
  5. +0 −1 install/jruby.install4j
View
@@ -173,9 +173,8 @@ namespace :maven do
end
task :installer do
- version = ENV['VERSION'] || abort("Pass the version in with VERSION={version}")
ant "dist"
- sh "/Applications/install4j\\ 4/bin/install4jc -m win32 -D jruby.version=1.5.0dev install/jruby.install4j" do |ok,res|
+ sh "/Applications/install4j\\ 4/bin/install4jc -m win32 -D jruby.version=#{VERSION_JRUBY} install/jruby.install4j" do |ok,res|
$stderr.puts "** Something went wrong: #{res}" unless ok
end
end
View
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<jruby>
- <version>
- <jruby>1.5.0dev</jruby>
- <ruby major="1.8" minor="7"/>
- </version>
-</jruby>
View
@@ -52,7 +52,6 @@
<!-- Initializes the build -->
<target name="init">
- <xmlproperty file="build-config.xml" keepRoot="false" collapseAttributes="true"/>
<tstamp><format property="build.date" pattern="yyyy-MM-dd"/></tstamp>
<property environment="env"/>
<property name="version.ruby" value="${version.ruby.major}.${version.ruby.minor}"/>
@@ -1352,7 +1351,6 @@
<include name="build_lib/**"/>
<include name="Rakefile"/>
<include name="build.xml"/>
- <include name="build-config.xml"/>
<include name="ivy/**"/>
<include name="nbproject/*"/>
<include name=".project"/>
View
@@ -30,3 +30,6 @@ jruby.launch.memory=512M
jruby.test.memory=512M
jruby.test.jvm=java
ruby.executable=/usr/bin/ruby
+version.jruby=1.5.0dev
+version.ruby.major=1.8
+version.ruby.minor=7
View
@@ -41,7 +41,6 @@
<entry location="bench" fileType="regular" />
<entry location="bin" fileType="regular" />
<entry location="build" fileType="regular" />
- <entry location="build-config.xml" fileType="regular" />
<entry location="build.xml" fileType="regular" />
<entry location="build_lib" fileType="regular" />
<entry location="default.build.properties" fileType="regular" />

0 comments on commit 61b1f7f

Please sign in to comment.