Skip to content

Commit 62f1c97

Browse files
committed
Load ourselves the default build properties in core/pom.rb.
* This allows Eclipse to generate a correct Constants.java.
1 parent 9221325 commit 62f1c97

File tree

2 files changed

+55
-11
lines changed

2 files changed

+55
-11
lines changed

core/pom.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@
2626
'jruby.test.memory.permgen' => '2G',
2727
'jruby.compile.memory' => '2G' )
2828

29+
IO.foreach(File.join(basedir, '..', 'default.build.properties')) do |line|
30+
line.chomp!
31+
# skip comments
32+
next if line =~ /(^\W*#|^$)/
33+
# build const name
34+
name, value = line.split("=", 2)
35+
properties name => value
36+
end
37+
2938
jar 'org.ow2.asm:asm:${asm.version}'
3039
jar 'org.ow2.asm:asm-commons:${asm.version}'
3140
jar 'org.ow2.asm:asm-analysis:${asm.version}'

core/pom.xml

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,57 @@
1010
<artifactId>jruby-core</artifactId>
1111
<name>JRuby Core</name>
1212
<properties>
13+
<version.ruby>2.2.0</version.ruby>
14+
<prawn.dir>${test.dir}/prawn</prawn.dir>
15+
<spec.tags.dir>${spec.dir}/tags</spec.tags.dir>
16+
<pkg.dir>${build.dir}/pkg</pkg.dir>
17+
<unsafe.jar>${settings.localRepository}/com/headius/unsafe-mock/${unsafe.version}/unsafe-mock-${unsafe.version}.jar</unsafe.jar>
18+
<spec.dir>spec</spec.dir>
1319
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
14-
<jruby.basedir>${basedir}/..</jruby.basedir>
15-
<unsafe.version>8.0</unsafe.version>
16-
<main.basedir>${project.parent.basedir}</main.basedir>
20+
<jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
21+
<installer.gems>${jruby.win32ole.gem}</installer.gems>
22+
<tesla.dump.readonly>true</tesla.dump.readonly>
23+
<prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
24+
<version.ruby.minor>0</version.ruby.minor>
25+
<tzdata.version>2013d</tzdata.version>
26+
<version.ruby.patchlevel>0</version.ruby.patchlevel>
27+
<install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
28+
<jay.bin>jay</jay.bin>
29+
<dest.lib.dir>${lib.dir}</dest.lib.dir>
30+
<rails.git.repo>git://github.com/rails/rails.git</rails.git.repo>
31+
<build.dir>target</build.dir>
1732
<maven.test.skip>true</maven.test.skip>
33+
<rubyspec.1.8.dir>${rubyspec.dir}/1.8</rubyspec.1.8.dir>
34+
<jruby.launch.memory>1024M</jruby.launch.memory>
35+
<jruby.compile.memory>2G</jruby.compile.memory>
36+
<version.ruby.major>2.2</version.ruby.major>
37+
<unsafe.version>8.0</unsafe.version>
38+
<release.dir>release</release.dir>
39+
<lib.dir>lib</lib.dir>
40+
<rails.dir>${test.dir}/rails</rails.dir>
41+
<tesla.dump.pom>pom.xml</tesla.dump.pom>
42+
<parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
43+
<jruby.basedir>${basedir}/..</jruby.basedir>
44+
<rubyspec.dir>${spec.dir}/ruby</rubyspec.dir>
45+
<version.ruby.revision>48765</version.ruby.revision>
46+
<jruby.test.memory>3G</jruby.test.memory>
47+
<mspec.dir>${spec.dir}/mspec</mspec.dir>
1848
<build.date>${maven.build.timestamp}</build.date>
49+
<main.basedir>${project.parent.basedir}</main.basedir>
1950
<tzdata.scope>provided</tzdata.scope>
20-
<unsafe.jar>${settings.localRepository}/com/headius/unsafe-mock/${unsafe.version}/unsafe-mock-${unsafe.version}.jar</unsafe.jar>
21-
<jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
22-
<jruby.test.memory>3G</jruby.test.memory>
23-
<tesla.dump.pom>pom.xml</tesla.dump.pom>
24-
<tzdata.version>2013d</tzdata.version>
25-
<Constants.java>org/jruby/runtime/Constants.java</Constants.java>
26-
<tesla.dump.readonly>true</tesla.dump.readonly>
51+
<test.results.dir>${build.dir}/test-results</test.results.dir>
52+
<prawn.stable.version>0.4.1</prawn.stable.version>
53+
<mspec.tar.file>${build.dir}/mspec.tgz</mspec.tar.file>
54+
<build.lib.dir>test/target</build.lib.dir>
2755
<anno.sources>${project.basedir}/target/generated-sources</anno.sources>
28-
<jruby.compile.memory>2G</jruby.compile.memory>
56+
<rake.args></rake.args>
57+
<test.dir>test</test.dir>
58+
<jflex.bin>jflex</jflex.bin>
59+
<jruby.win32ole.gem>jruby-win32ole</jruby.win32ole.gem>
60+
<mspec.bin>${mspec.dir}/bin/mspec</mspec.bin>
61+
<jruby.gem.home>lib/ruby/gems/shared</jruby.gem.home>
62+
<Constants.java>org/jruby/runtime/Constants.java</Constants.java>
63+
<test.classes.dir>${test.dir}/target/test-classes</test.classes.dir>
2964
</properties>
3065
<dependencies>
3166
<dependency>

0 commit comments

Comments
 (0)