dev 1.0.179 → 1.0.180

data/lib/dev/BoostBuild.rb

@@ -14,22 +14,26 @@ class BoostBuild
   end
 
   def self.getLibraryProperties(filename)
-    words=filename.split('-')
-	flags=words[2];
-	flags = flags + "-" + words[3] if words.length == 5
-	result="<toolset>" + getToolset(words[1])
+    #words=filename.split('-')
+	#flags=words[2] if words.length == 4
+	#flags = flags + "-" + words[3] if words.length == 5
+	#result="<toolset>" + getToolset(words[1]) if words.length==4
 	link="static"
 	link="shared" if filename.index("lib") != 0
 	link="shared" if filename.include?(".so")
-    result = result + " <link>" + link + " " 
-	result = result + " <variant>release " if !flags.include?("d")
-	result = result + " <variant>debug " if flags.include?("d")
-	result = result + " <threading>multi " if flags.include?("mt")
-	result = result + " <threading>single " if !flags.include?("mt")
-	#result = result + " <runtime-link>shared " if !flags.include?("s")
-	result = result + " <runtime-link>static " if flags.include?("s")
-	#result = result + " <runtime-debugging>off " if !flags.include?("g")
-	result = result + " <runtime-debugging>on " if flags.include?("g")
+    result =  " <link>" + link + " " 
+	variant = "release"
+	variant = "debug" if filename.include?("d.")
+	#result = result + " <variant>release " if !flags.include?("d")
+	#result = result + " <variant>debug " if flags.include?("d")
+	result = result + " <variant>#{variant} "
+	threading="single"
+	threading="multi" if filename.include?("-mt")
+	#result = result + " <threading>multi " if flags.include?("mt")
+	#result = result + " <threading>single " if !flags.include?("mt")
+	result = result + " <threading>#{threading}"
+	#result = result + " <runtime-link>static " if flags.include?("s")
+	result = result + " <runtime-debugging>on " if filename.include?('-gd') #if flags.include?("g")
 	result = result + ";"
   end
 

data/lib/dev/Database.rb

@@ -36,10 +36,15 @@ class Database
 	  columns="#{columns}#{s.to_s} text"
 	}
 	@db.execute("create table Results(#{columns});") if ! table_names.include? "Results"
+	@db.close
+	@db=nil
   end
 
   def set_branch_uri(name,uri)
+    @db = SQLite3::Database.new Dev::Database.filename
     @db.execute("insert or replace into Branches (Name,Uri) VALUES ('#{name}','#{uri}');")
+	@db.close
+	@db=nil
   end
 
   def has_result(h)
@@ -61,7 +66,10 @@ class Database
 	  values="#{values}'#{sval}'"
 	}
 	#puts "insert or replace into Results (#{columns}) VALUES (#{values});"
+	@db = SQLite3::Database.new Dev::Database.filename
 	@db.execute("insert or replace into Results (#{columns}) VALUES (#{values});")
+	@db.close
+	@db=nil
   end
 
   def get_results(where_hash)
@@ -80,7 +88,7 @@ class Database
 	  columns="#{columns}#{s.to_s}"
 	}
 
-	
+	@db = SQLite3::Database.new Dev::Database.filename
 	@db.execute("select #{columns} from Results where #{where};") do |row|
 	  h=Hash.new
 	  index = 0
@@ -91,15 +99,20 @@ class Database
 	  }
 	  array << h if !h.empty?
 	end
+	@db.close
+	@db=nil
 	  
 	return array
   end
 
   def get_branch_uri(name)
     uri=""
+	@db = SQLite3::Database.new Dev::Database.filename
     @db.execute("select Uri from Branches where Name='#{name}';") do |row|
 	  uri=eval(row[0].to_s)[0]
 	end
+	@db.close
+	@db=nil
 	return uri
   end
 
@@ -107,9 +120,12 @@ class Database
     names=Array.new
 	sql="select Name from Branches where Name LIKE '#{pattern}';"
 	sql="select Name from Branches;" if pattern.nil? || pattern.length==0
+	@db = SQLite3::Database.new Dev::Database.filename
 	@db.execute(sql) do |row|
 	  names << row[0] if(row[0].length > 0)
 	end
+	@db.close
+	@db=nil
 	return names
   end
 end # class Database

data/lib/dev/cmd/Build.rb

@@ -35,6 +35,7 @@ class Build
 	  # store results to database
 	
 	  db.add_result(result)
+	  db=nil
 	end
 
 
@@ -49,15 +50,14 @@ class Build
 
   def self.status(branch)
     db=Dev::Database.new
-    #puts "status of branch " + branch.foreground(:green) + "@#{h[:revision]}"
 	h=Dev::Cmd::Build.get_branch_hash(branch)
 	puts "status of branch " + branch.foreground(:green) + "@#{h[:revision]}"
-    #Hash.print_hash("",h)
 
 	# do any results exist for latest revision?
 	results=db.get_results({:uri=>"#{h[:uri]}", :revision=>"#{h[:revision]}"})
 	#resultss=db.get_results({:branch=>h[:branch]})
 	#results=db.get_results({:uri=>"#{h[:uri]}"})
+	db=nil
 
 	puts "  no results" if results.empty?
 
@@ -73,7 +73,7 @@ class Build
   end
 
   def self.work(branch)
-    db=Dev::Database.new
+    #db=Dev::Database.new
 
     puts " "
     puts "working on branch " + branch.foreground(:green)
@@ -97,6 +97,7 @@ class Build
     db=Dev::Database.new
     h=Hash.new
 	h[:uri]=db.get_branch_uri(branch)
+	db=nil
 	h[:revision]=Dev::Svn.last_changed_revision(h[:uri])
 	h[:dir]="#{Dev::Environment.dev_root}/exp/#{branch}@#{h[:revision]}"
 	h[:user]="#{Dev::Environment.user}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.179
+  version: 1.0.180
   prerelease: 
 platform: ruby
 authors:
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dev
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: dev