Changeset 6053

Show
Ignore:
Timestamp:
11/13/06 16:22:41
Author:
jan
Message:

some cleanups

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/README

    r6050 r6053  
    3030== Installation 
    3131 
    32 You need to have rubygems installed. On Debian systems (testing) this is a simple as 
     32You need to have Ruby and rubygems installed. On Debian systems (testing) this is a simple as: 
    3333   
    3434  % apt-get install rubygems 

  • trunk/lib/jerbil/apt_task.rb

    r6031 r6053  
    11require 'rake' 
    2 require 'rake/tasklib' 
    3 require File.dirname(__FILE__) + '/java_helper' 
    4 require File.dirname(__FILE__) + '/javac_task' 
     2require 'jerbil/java_helper' 
     3require 'jerbil/javac_task' 
    54 
    65module Jerbil 

  • trunk/lib/jerbil/hibernate_task.rb

    r6050 r6053  
     1require 'rake' 
    12require 'rake/tasklib' 
     3require 'jerbil/java_helper' 
    24require 'yaml' 
    35require 'set' 
    4 require File.dirname(__FILE__) + '/java_helper' 
    5  
    66 
    77module Jerbil  

  • trunk/lib/jerbil/jar_task.rb

    r6029 r6053  
    1 require 'rake' 
    21require 'rake/tasklib' 
     2require 'jerbil/java_helper' 
    33 
    44module Jerbil 

  • trunk/lib/jerbil/java_helper.rb

    r6031 r6053  
    88end 
    99 
    10 # for some really weird reasons schemaexport fails on mac os x 
    11 # if java is not running in debug mode 
    12 $JAVA_DEBUG = RUBY_PLATFORM =~ /darwin/i || false 
    13 $IS_WINDOWS = RUBY_PLATFORM =~ /mswin|mingw/i 
    14 $JAVA_PATH_SEPERATOR = $IS_WINDOWS ? ';' : ':' 
    15 $DIR_SEP = $IS_WINDOWS ? "\\" : "/" 
    16 $DIR_SEP_FOR_SUBSTITUTION = $IS_WINDOWS ? "\\\\" : "/" 
    17  
    1810module Jerbil 
    19  
     11  # for some really weird reasons schemaexport fails on mac os x 
     12  # if java is not running in debug mode 
     13  JAVA_DEBUG = ::RUBY_PLATFORM =~ /darwin/i || false 
     14  IS_WINDOWS = RUBY_PLATFORM =~ /mswin|mingw/i 
     15  JAVA_PATH_SEPERATOR = IS_WINDOWS ? ';' : ':' 
     16  DIR_SEP = IS_WINDOWS ? "\\" : "/" 
     17  DIR_SEP_FOR_SUBSTITUTION = IS_WINDOWS ? "\\\\" : "/" 
     18   
    2019  # The JavaHelper module provides common helper functionality needed across different 
    2120  # classes. 
    …… 
    9089      jvmargs = []     
    9190      jvmargs << "-Djava.util.logging.config.file=#{loggingprops.to_s}" unless loggingprops.nil?  
    92    
    93       if $JAVA_DEBUG 
     91        
     92      if JAVA_DEBUG || ENV['JAVA_DEBUG'] 
    9493        jvmargs += [ 
    9594        "-Xdebug", 
    …… 
    192191    def to_classnames 
    193192      # remove the initial directory and separator 
    194       sub = srcdir + $DIR_SEP_FOR_SUBSTITUTION 
     193      sub = srcdir + DIR_SEP_FOR_SUBSTITUTION 
    195194      paths = self.pathmap("%{^#{sub},}X") 
    196195       
    197       paths.gsub!($DIR_SEP, ".") 
     196      paths.gsub!(DIR_SEP, ".") 
    198197      paths.gsub!("/", "." ) 
    199198    end 
    …… 
    279278     
    280279    def sourcepath 
    281       @java_files.collect{|jf| jf.srcdir}.join($JAVA_PATH_SEPERATOR) 
     280      @java_files.collect{|jf| jf.srcdir}.join(JAVA_PATH_SEPERATOR) 
    282281    end 
    283282     
    …… 
    324323    # Returns the filelist formatted as Java classpath. 
    325324    # ("/tmp/foo.jar:/tmp/baz.jar") 
    326     def to_cp   
    327       self.join($JAVA_PATH_SEPERATOR) 
     325    def to_cp(sep = Jerbil::JAVA_PATH_SEPERATOR) 
     326      self.join(sep) 
    328327    end 
    329328  end 

  • trunk/lib/jerbil/java_task.rb

    r6031 r6053  
    11require 'rake' 
    22require 'rake/tasklib' 
     3require 'jerbil/java_helper' 
    34 
    45module Jerbil 

  • trunk/lib/jerbil/javac_task.rb

    r6031 r6053  
    11require 'rake' 
    22require 'rake/tasklib' 
    3 require File.dirname(__FILE__) + '/java_helper' 
     3require 'jerbil/java_helper' 
    44 
    55module Jerbil 
    …… 
    4343         
    4444        # must do this to prevent javac bombing out on the file package-info.java 
    45         # due to known javac bug 6198196 - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6198196 
    46         # $IS_WINDOWS is defined in the java_helper file - bit icky, I know, but it works 
    47         java_files.gsub!( "/", "\\" ) if $IS_WINDOWS 
     45        # due to known javac bug 6198196 - 
     46        # http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6198196 
     47        java_files.gsub!( "/", "\\" ) if Jerbil::IS_WINDOWS 
    4848                
    4949        parms += extra_args.collect {|a|a.to_s} unless extra_args.nil? 

  • trunk/lib/jerbil/javadoc_task.rb

    r6029 r6053  
    11require 'rake' 
    22require 'rake/tasklib' 
     3require 'jerbil/java_helper' 
    34 
    45module Jerbil 

  • trunk/lib/jerbil/jibx_task.rb

    r6029 r6053  
    11require 'rake' 
    22require 'rake/tasklib' 
    3 require File.dirname(__FILE__) + '/java_helper' 
     3require 'jerbil/java_helper' 
    44 
    55module Jerbil 

  • trunk/lib/jerbil/testng_task.rb

    r6031 r6053  
    22require 'rake/tasklib' 
    33require 'set' 
    4 require File.dirname(__FILE__) + '/java_helper' 
     4require 'jerbil/java_helper' 
    55 
    66module Jerbil 

  • trunk/test/test_java_helper.rb

    r6029 r6053  
    3131   
    3232    def test_to_cp 
    33       flist = FileList["ab.jar", "cd.jar", "ef.jar"] 
    34       $JAVA_PATH_SEPERATOR = ":" 
    35       assert_equal 'ab.jar:cd.jar:ef.jar', flist.to_cp 
    36       $JAVA_PATH_SEPERATOR = ";" 
    37       assert_equal 'ab.jar;cd.jar;ef.jar', flist.to_cp 
     33      flist = FileList["ab.jar", "cd.jar", "ef.jar"]           
     34      assert_equal 'ab.jar:cd.jar:ef.jar', flist.to_cp(':') 
     35      assert_equal 'ab.jar;cd.jar;ef.jar', flist.to_cp(';') 
    3836    end 
    3937  end