dev 1.0.189 → 1.0.190

data/lib/dev/BoostBuild.rb

@@ -23,7 +23,7 @@ class BoostBuild
 	link="shared" if filename.include?(".so")
     result =  " <link>" + link + " " 
 	variant = "release"
-	variant = "debug" if filename.include?("d.")
+	variant = "debug" if filename.include?("d.") || filename.include?("-gd-")
 	#result = result + " <variant>release " if !flags.include?("d")
 	#result = result + " <variant>debug " if flags.include?("d")
 	result = result + " <variant>#{variant} "

data/lib/dev/Project.rb

@@ -12,9 +12,12 @@ class Project < Hash
   end
 
   def defaults
+    puts_debug "Dev::Project.defaults begin"
     system_call = Dev::SystemCall.new("semver init") if(!File.exist?(".semver"))  
 	h=Hash.new
+	puts_debug "Dev::Project.defaults :scm_uri"
 	h[:scm_uri] = get_default_scm_uri if !get_default_scm_uri.nil?
+	puts_debug "Dev::Project.defaults :scm_type"
 	h[:scm_type] = get_default_scm_type if !get_default_scm_type.nil?
 	h[:directory]=Rake.original_dir()
 	h[:fullname]=get_default_value_fullname
@@ -23,21 +26,31 @@ class Project < Hash
 	h[:version]= "#{SemVer.find.major}.#{SemVer.find.minor}.#{SemVer.find.patch}"
 	h[:src_glob]="**/{*.{rb,feature,spec,cs,c,m,cpp,cxx,h,hpp,i,jam,csproj,vcproj,snk,vcxproj,xcodeproj,plist,xib,sln,filters,xaml,xml,resx,settings,txt,png,bmp,ico},Jamfile,.semver,Gemfile,README,LICENSE}"
 	h[:src_glob]="**/{*.{rb,feature,spec,cs,c,m,cpp,cxx,h,hpp,i,jam,csproj,vcproj,snk,vcxproj,xcodeproj,plist,pch,strings,storyboard,xib,sln,filters,xaml,xml,resx,settings,txt,png,bmp,ico},Jamfile,.semver,Gemfile,README,LICENSE}" if RUBY_PLATFORM.include?("darwin")
-	h[:type]=get_default_value_type
+	puts_debug "Dev::Project.defaults :dev_root"
 	h[:dev_root]= "#{Dev::Environment.dev_root}"
+	puts_debug "Dev::Project.defaults A"
 	if !Dev::BoostBuild.defaultToolset.nil?
+	  puts_debug "Dev::Project.defaults :toolset"
 	  h[:toolset] = Dev::BoostBuild.defaultToolset 
 	  ENV["VisualStudioVersion"]="11.0" if h[:toolset]=="msvc-11.0"
 	end
 	
-	h[:file_count]=Hash.new
-	["rb","spec","feature","cs","cpp","h","hpp","vcxproj","csproj"].each{ |ext|
-	  count=Dir.glob("**/*.#{ext}").count
-	  h[:file_count][ext.to_sym]=count if count > 0
-	}
+	puts_debug "Dev::Project.defaults :type"
+	h[:type]="gem"
+	puts_debug "Dev::Project.defaults B"
+	if(defined?(DEV_FILE_COUNT))
+	  h[:type]=get_default_value_type
+	  h[:file_count]=Hash.new
+	  ["rb","spec","feature","cs","cpp","h","hpp","vcxproj","csproj"].each{ |ext|
+	    count=Dir.glob("**/*.#{ext}").count
+	    h[:file_count][ext.to_sym]=count if count > 0
+	  }
+	end
 
+	puts_debug "Dev::Project.defaults C"
 	h[:paths] = Dev::Paths.new
 	h[:dep]=Deps.new
+	puts_debug "Dev::Project.defaults end"
 	return h
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.189
+  version: 1.0.190
   prerelease: 
 platform: ruby
 authors: