Changeset 6010

Show
Ignore:
Timestamp:
11/07/06 22:24:36
Author:
jan
Message:

gemmification

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Rakefile

    r5890 r6010  
    4747  s.summary = 'Jerbil java build system' 
    4848  s.name = 'jerbil' 
    49   s.homepage = 'http://www2.trampolinesystems.com/code/jerbil' 
     49  s.homepage = 'http://code.trampolinesystems.com/jerbil' 
    5050  s.version = read_version 
    5151  s.add_dependency('rjb', '>= 1.0') 
    …… 
    5353  s.requirements << 'rjb' 
    5454  s.requirements << 'JDK 5.0' 
    55   files = FileList['lib/*.rb', 'samples/**/*',  
     55  files = FileList['lib/*.rb', 'lib/jerbil/*.rb', 'samples/**/*',  
    5656                   'test/*.rb', 'classloader/*' 'COPYING', 'ChangeLog', 'README'] 
    5757   

  • trunk/lib/jerbil.rb

    r5889 r6010  
    1 $:.unshift File.join( File.dirname(__FILE__),  "lib" ) 
     1#$:.unshift File.join( File.dirname(__FILE__),  "lib" ) 
    22 
    3 require 'java_helper' 
    4 require 'javac_task' 
    5 require 'java_task' 
    6 require 'javadoc_task' 
    7 require 'testng_task' 
    8 require 'jar_task' 
    9 require 'apt_task' 
    10 require 'jibx_task' 
    11 require 'hibernate_task' 
    12 require 'hibernate_task2' 
     3require 'jerbil/java_helper' 
     4require 'jerbil/javac_task' 
     5require 'jerbil/java_task' 
     6require 'jerbil/javadoc_task' 
     7require 'jerbil/testng_task' 
     8require 'jerbil/jar_task' 
     9require 'jerbil/apt_task' 
     10require 'jerbil/jibx_task' 
     11require 'jerbil/hibernate_task' 
     12require 'jerbil/hibernate_task2' 

  • trunk/lib/jerbil/java_helper.rb

    r6008 r6010  
    6767    $VERBOSE = true 
    6868    #include build jars and custom classloader 
    69     classpath.include(File.join(File.dirname(__FILE__), "../buildsupport/*.jar")) 
    70     classpath.include(File.join(File.dirname(__FILE__), "../classloader")) unless build_dir.nil? 
     69     
     70    java_home = ENV['JAVA_HOME'] 
     71    classpath.include(File.join(java_home, "lib", "tools.jar")) if java_home 
     72     
     73    classpath.include(File.join(File.dirname(__FILE__), "../../buildsupport/*.jar")) 
     74    classpath.include(File.join(File.dirname(__FILE__), "../../classloader")) unless build_dir.nil? 
    7175     
    7276    jvmargs = []     
    …… 
    97101      raise 
    98102    end 
     103     
     104    #TODO: test javac main and raise if not found 
    99105  end 
    100106end 

  • trunk/test/test_build.rb

    r5865 r6010  
    33$:.unshift File.join( File.dirname(__FILE__), "..", "lib" ) 
    44 
    5 require 'java_helper' 
     5require 'jerbil/java_helper' 
    66require 'test/unit' 
    77require 'yaml' 

  • trunk/test/test_java_helper.rb

    r5843 r6010  
    44 
    55require 'test/unit' 
    6 require 'java_helper' 
     6require 'jerbil/java_helper' 
    77 
    88class TestJavaHelper < Test::Unit::TestCase