dev 1.0.182 → 1.0.184
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev/BoostBuild.rb +7 -0
- data/lib/dev/Project.rb +2 -2
- data/lib/dev/Tasks.rb +1 -1
- metadata +1 -1
data/lib/dev/BoostBuild.rb
CHANGED
@@ -48,6 +48,13 @@ class BoostBuild
|
|
48
48
|
File.open(jamfilename,'w') { |jamfile|
|
49
49
|
Dir.glob("*boost_*").each {|f|
|
50
50
|
jamfile.puts getJamfileLine(f)
|
51
|
+
|
52
|
+
# add <link>shared
|
53
|
+
line = getJamefileLine(f)
|
54
|
+
if(line.include?("<link>static"))
|
55
|
+
line = line.gsub("<link>static","<link>shared")
|
56
|
+
jamfile.puts line
|
57
|
+
end
|
51
58
|
}
|
52
59
|
}
|
53
60
|
end
|
data/lib/dev/Project.rb
CHANGED
@@ -21,8 +21,8 @@ class Project < Hash
|
|
21
21
|
h[:group]=get_default_value_group
|
22
22
|
h[:name]=get_default_value_name
|
23
23
|
h[:version]= "#{SemVer.find.major}.#{SemVer.find.minor}.#{SemVer.find.patch}"
|
24
|
-
h[:src_glob]="**/{*.{rb,feature,spec,cs,c,m,cpp,h,hpp,i,csproj,vcproj,snk,vcxproj,xcodeproj,plist,xib,sln,filters,xaml,xml,resx,settings,txt,png,bmp,ico},Jamfile,.semver,Gemfile,README,LICENSE}"
|
25
|
-
h[:src_glob]="**/{*.{rb,feature,spec,cs,c,m,cpp,h,hpp,i,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")
|
24
|
+
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}"
|
25
|
+
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")
|
26
26
|
h[:type]=get_default_value_type
|
27
27
|
h[:dev_root]= "#{Dev::Environment.dev_root}"
|
28
28
|
if !Dev::BoostBuild.defaultToolset.nil?
|
data/lib/dev/Tasks.rb
CHANGED
@@ -74,7 +74,7 @@ def generate_tasks(project)
|
|
74
74
|
if(!defined?(DEV_NO_DEFAULT_TASK))
|
75
75
|
Rake.application.instance_variable_get('@tasks').delete('default')
|
76
76
|
task_list=""
|
77
|
-
["check","add","setup","replace","compile","post_compile","test","commit","update"].each {|t|
|
77
|
+
["check","add","setup","replace","pre_compile","compile","post_compile","test","commit","update"].each {|t|
|
78
78
|
if(hash.has_key?(t.to_sym) || task_exists?(t) || (CMD.has_key?(t.to_sym) && CMD[t.to_sym].count > 0) )
|
79
79
|
task_list = "#{task_list}," if task_list.length > 0
|
80
80
|
task_list = "#{task_list} :#{t}"
|