Skip to content

Commit

Permalink
Load ourselves the default build properties in core/pom.rb.
Browse files Browse the repository at this point in the history 
* This allows Eclipse to generate a correct Constants.java.
@eregon
eregon committed Dec 15, 2014
1 parent 9221325 commit 62f1c97
Showing 2 changed files with 55 additions and 11 deletions.
9 changes: 9 additions & 0 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,15 @@
'jruby.test.memory.permgen' => '2G',
'jruby.compile.memory' => '2G' )

IO.foreach(File.join(basedir, '..', 'default.build.properties')) do |line|
line.chomp!
# skip comments
next if line =~ /(^\W*#|^$)/
# build const name
name, value = line.split("=", 2)
properties name => value
end

jar 'org.ow2.asm:asm:${asm.version}'
jar 'org.ow2.asm:asm-commons:${asm.version}'
jar 'org.ow2.asm:asm-analysis:${asm.version}'
57 changes: 46 additions & 11 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -10,22 +10,57 @@
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
<properties>
<version.ruby>2.2.0</version.ruby>
<prawn.dir>${test.dir}/prawn</prawn.dir>
<spec.tags.dir>${spec.dir}/tags</spec.tags.dir>
<pkg.dir>${build.dir}/pkg</pkg.dir>
<unsafe.jar>${settings.localRepository}/com/headius/unsafe-mock/${unsafe.version}/unsafe-mock-${unsafe.version}.jar</unsafe.jar>
<spec.dir>spec</spec.dir>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<jruby.basedir>${basedir}/..</jruby.basedir>
<unsafe.version>8.0</unsafe.version>
<main.basedir>${project.parent.basedir}</main.basedir>
<jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
<installer.gems>${jruby.win32ole.gem}</installer.gems>
<tesla.dump.readonly>true</tesla.dump.readonly>
<prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
<version.ruby.minor>0</version.ruby.minor>
<tzdata.version>2013d</tzdata.version>
<version.ruby.patchlevel>0</version.ruby.patchlevel>
<install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
<jay.bin>jay</jay.bin>
<dest.lib.dir>${lib.dir}</dest.lib.dir>
<rails.git.repo>git://github.com/rails/rails.git</rails.git.repo>
<build.dir>target</build.dir>
<maven.test.skip>true</maven.test.skip>
<rubyspec.1.8.dir>${rubyspec.dir}/1.8</rubyspec.1.8.dir>
<jruby.launch.memory>1024M</jruby.launch.memory>
<jruby.compile.memory>2G</jruby.compile.memory>
<version.ruby.major>2.2</version.ruby.major>
<unsafe.version>8.0</unsafe.version>
<release.dir>release</release.dir>
<lib.dir>lib</lib.dir>
<rails.dir>${test.dir}/rails</rails.dir>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
<jruby.basedir>${basedir}/..</jruby.basedir>
<rubyspec.dir>${spec.dir}/ruby</rubyspec.dir>
<version.ruby.revision>48765</version.ruby.revision>
<jruby.test.memory>3G</jruby.test.memory>
<mspec.dir>${spec.dir}/mspec</mspec.dir>
<build.date>${maven.build.timestamp}</build.date>
<main.basedir>${project.parent.basedir}</main.basedir>
<tzdata.scope>provided</tzdata.scope>
<unsafe.jar>${settings.localRepository}/com/headius/unsafe-mock/${unsafe.version}/unsafe-mock-${unsafe.version}.jar</unsafe.jar>
<jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
<jruby.test.memory>3G</jruby.test.memory>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<tzdata.version>2013d</tzdata.version>
<Constants.java>org/jruby/runtime/Constants.java</Constants.java>
<tesla.dump.readonly>true</tesla.dump.readonly>
<test.results.dir>${build.dir}/test-results</test.results.dir>
<prawn.stable.version>0.4.1</prawn.stable.version>
<mspec.tar.file>${build.dir}/mspec.tgz</mspec.tar.file>
<build.lib.dir>test/target</build.lib.dir>
<anno.sources>${project.basedir}/target/generated-sources</anno.sources>
<jruby.compile.memory>2G</jruby.compile.memory>
<rake.args></rake.args>
<test.dir>test</test.dir>
<jflex.bin>jflex</jflex.bin>
<jruby.win32ole.gem>jruby-win32ole</jruby.win32ole.gem>
<mspec.bin>${mspec.dir}/bin/mspec</mspec.bin>
<jruby.gem.home>lib/ruby/gems/shared</jruby.gem.home>
<Constants.java>org/jruby/runtime/Constants.java</Constants.java>
<test.classes.dir>${test.dir}/target/test-classes</test.classes.dir>
</properties>
<dependencies>
<dependency>

0 comments on commit 62f1c97

Please sign in to comment.