Changeset 94

Timestamp:

07/24/08 19:47:42 (3 months ago)

Author:

deveiant

Message:

Updated build system

Location:

branches/rakefile-work

Files:

• Rakefile (modified) (3 diffs)
• Rakefile.local (modified) (1 diff)
• convertdb.rb (modified) (1 diff)
• project.yml (modified) (1 diff)
• utils.rb (modified) (1 diff)

branches/rakefile-work/Rakefile

@@ -58 +58 @@
 SPECDIR       = BASEDIR + 'spec'
 SPEC_FILES    = Pathname.glob( SPECDIR + '**/*_spec.rb' ).delete_if {|item| item =~ /\.svn/ }
-SPEC_EXCLUDES = 'spec,/Library/Ruby,/var/lib,/usr/local/lib'
 
 TESTDIR       = BASEDIR + 'tests'
-TEST_FILES    = Pathname.glob( TESTDIR + '**/*.tests.rb' )
+TEST_FILES    = Pathname.glob( TESTDIR + '**/*.tests.rb' ).delete_if {|item| item =~ /\.svn/ }
 
 RELEASE_FILES = FileList[ TEXT_FILES + SPEC_FILES + TEST_FILES + LIB_FILES + EXT_FILES ]
 
-
+COVERAGE_MINIMUM = ENV['COVERAGE_MINIMUM'] ? Float( ENV['COVERAGE_MINIMUM'] ) : 85.0
+RCOV_EXCLUDES = 'spec,tests,/Library/Ruby,/var/lib,/usr/local/lib'
 RCOV_OPTS = [
-    '--exclude', SPEC_EXCLUDES,
+    '--exclude', RCOV_EXCLUDES,
     '--xrefs',
     '--save',
-    '--callsites'
+    '--callsites',
+    #'--aggregate', 'coverage.data' # <- doesn't work as of 0.8.1.2.0
   ]
 
+
+# Subversion constants -- directory names for releases and tags
+SVN_TRUNK_DIR    = 'trunk'
+SVN_RELEASES_DIR = 'releases'
+SVN_BRANCHES_DIR = 'branches'
+SVN_TAGS_DIR     = 'tags'
 
 ### Load some task libraries that need to be loaded early
@@ -105 +112 @@
 # Gem dependencies: gemname => version
 DEPENDENCIES = {
-#   'mongrel'       => '',
 }
 
 # Non-gem requirements: packagename => version
 REQUIREMENTS = {
-#   'Apache'  => '>= 2.2.6',
+    'bdb' => '>= 0.6.5',
 }
 
@@ -120 +126 @@
     gem.summary           = PKG_SUMMARY
     gem.description       = <<-EOD
-
     A Ruby implementation of the WordNet lexical dictionary
-
     EOD
 

branches/rakefile-work/Rakefile.local

@@ -21 +21 @@
 
 RELEASE_FILES.include( 'examples/*.rb' )
+
 
 ### Tasks

branches/rakefile-work/convertdb.rb

@@ -111 +111 @@
         default = nil
         wndirs = Pathname.glob( Pathname.getwd + 'WordNet-*' )
-        unless wndirs.empty?
-            default = wndirs.first
+        localdict = Pathname.getwd + 'dict'
+        if !wndirs.empty?
+            default = wndirs.first + 'dict'
+        elsif localdict.exist?
+            default = localdict
         else
-            default = '/usr/local/WordNet-3.0'
-        end
-
-        # :TODO: Do some more intelligent searching here
+            default = '/usr/local/WordNet-3.0/dict'
+        end
+
         message "Where can I find the WordNet data files?\n"
-        datadir = prompt_with_default( "Data directory", default + "/dict" )
+        datadir = prompt_with_default( "Data directory", default )
         datadir = Pathname.new( datadir )
 

branches/rakefile-work/project.yml

@@ -5 +5 @@
 project_name: WordNet
 author_email: ged@FaerieMUD.org
+
+project_dependencies:
+
+project_requirements:
+  bdb: >= 0.6.5
+

branches/rakefile-work/utils.rb

@@ -292 +292 @@
 
 
+    ### Display a description of a potentially-dangerous task, and prompt
+    ### for confirmation. If the user answers with anything that begins
+    ### with 'y', yield to the block, else raise with an error.
+    def ask_for_confirmation( description )
+        puts description
+
+        answer = prompt_with_default( "Continue?", 'n' ) do |input|
+            input =~ /^[yn]/i
+        end
+
+        case answer
+        when /^y/i
+            yield
+        else
+            error "Aborted."
+            fail
+        end
+    end
+
+
     ### Search for the program specified by the given <tt>progname</tt> in the
     ### user's <tt>PATH</tt>, and return the full path to it, or <tt>nil</tt> if