Skip to content
Browse files

Single source all properties

  • Loading branch information...
1 parent 9e78a9e commit b9cb730b2521bd4a02884b04703ae2a2215e3c5a @enebo enebo committed Dec 16, 2009
Showing with 22 additions and 11 deletions.
  1. +9 −2 build.xml
  2. +6 −2 default.build.properties
  3. +7 −7 src/org/jruby/jruby.properties
View
11 build.xml
@@ -147,10 +147,17 @@
<include name="**/*.properties"/>
</fileset>
<filterset>
- <filter token="os.arch" value="${os.arch}"/>
+ <filter token="version.ruby.major" value="${version.ruby.major}"/>
+ <filter token="version.ruby" value="${version.ruby}"/>
+ <filter token="version.ruby.patchlevel" value="${version.ruby.patchlevel}"/>
+ <filter token="version.ruby1_9.major" value="${version.ruby1_9.major}"/>
+ <filter token="version.ruby1_9" value="${version.ruby1_9}"/>
+ <filter token="version.ruby1_9.patchlevel" value="${version.ruby1_9.patchlevel}"/>
+ <filter token="build.date" value="${build.date}"/>
+ <filter token="version.jruby" value="${version.jruby}"/>
<filter token="java.specification.version" value="${java.specification.version}"/>
<filter token="javac.version" value="${javac.version}"/>
- <filter token="build.date" value="${build.date}"/>
+ <filter token="os.arch" value="${os.arch}"/>
</filterset>
</copy>
</target>
View
8 default.build.properties
@@ -33,7 +33,11 @@ jruby.test.memory=512M
jruby.test.jvm=java
ruby.executable=/usr/bin/ruby
install4j.executable=/Applications/install4j\ 4/bin/install4jc
-version.jruby=1.5.0.dev
+version.ruby=1.8.7
version.ruby.major=1.8
version.ruby.minor=7
-
+version.ruby.patchlevel=174
+version.ruby1_9.major=1.9
+version.ruby1_9=1.9.2dev
+version.ruby1_9.patchlevel=24787
+version.jruby=1.5.0.dev
View
14 src/org/jruby/jruby.properties
@@ -1,11 +1,11 @@
-version.ruby.major=1.8
-version.ruby=1.8.7
-version.ruby.patchlevel=174
-version.ruby1_9.major=1.9
-version.ruby1_9=1.9.2dev
-version.ruby1_9.patchlevel=24787
+version.ruby.major=@version.ruby.major@
+version.ruby=@version.ruby@
+version.ruby.patchlevel=@version.ruby.patchlevel@
+version.ruby1_9.major=@version.ruby1_9.major@
+version.ruby1_9=@version.ruby1_9@
+version.ruby1_9.patchlevel=@version.ruby1_9.patchlevel@
release.date=@build.date@
-version.jruby=1.5.0.dev
+version.jruby=@version.jruby@
build.jruby=java@java.specification.version@
target.jruby=java@javac.version@
revision.jruby=$Revision: 6586 $

0 comments on commit b9cb730

Please sign in to comment.
Something went wrong with that request. Please try again.