dev 1.0.190 → 1.0.191

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,6 +1,17 @@
1
1
  module Dev
2
2
  class BoostBuild
3
+
4
+ @@default_toolset=nil
5
+ def self.setDefaultToolset toolset
6
+ @@default_toolset=toolset
7
+ end
8
+
3
9
  def self.defaultToolset
10
+ if(defined?(BOOSTBUILD_DEFAULT_TOOLSET))
11
+ puts_debug "BOOSTBUILD_DEFAULT_TOOLSET=#{BOOSTBUILD_DEFAULT_TOOLSET}"
12
+ return BOOSTBUILD_DEFAULT_TOOLSET
13
+ end
14
+ return @@default_toolset if !@@default_toolset.nil?
4
15
  begin
5
16
  text=`b2 --debug-configuration`
6
17
  toolset=''
@@ -28,10 +28,11 @@ class Project < Hash
28
28
  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")
29
29
  puts_debug "Dev::Project.defaults :dev_root"
30
30
  h[:dev_root]= "#{Dev::Environment.dev_root}"
31
- puts_debug "Dev::Project.defaults A"
32
- if !Dev::BoostBuild.defaultToolset.nil?
31
+ puts_debug "Dev::Project.defaults default_toolset"
32
+ default_toolset = Dev::BoostBuild.defaultToolset
33
+ if !default_toolset.nil?
33
34
  puts_debug "Dev::Project.defaults :toolset"
34
- h[:toolset] = Dev::BoostBuild.defaultToolset
35
+ h[:toolset] = default_toolset
35
36
  ENV["VisualStudioVersion"]="11.0" if h[:toolset]=="msvc-11.0"
36
37
  end
37
38
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dev
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.190
4
+ version: 1.0.191
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: