dev 1.0.189 → 1.0.190
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/dev/BoostBuild.rb +1 -1
- data/lib/dev/Project.rb +19 -6
- metadata +1 -1
data/lib/dev/BoostBuild.rb
CHANGED
@@ -23,7 +23,7 @@ class BoostBuild
|
|
23
23
|
link="shared" if filename.include?(".so")
|
24
24
|
result = " <link>" + link + " "
|
25
25
|
variant = "release"
|
26
|
-
variant = "debug" if filename.include?("d.")
|
26
|
+
variant = "debug" if filename.include?("d.") || filename.include?("-gd-")
|
27
27
|
#result = result + " <variant>release " if !flags.include?("d")
|
28
28
|
#result = result + " <variant>debug " if flags.include?("d")
|
29
29
|
result = result + " <variant>#{variant} "
|
data/lib/dev/Project.rb
CHANGED
@@ -12,9 +12,12 @@ class Project < Hash
|
|
12
12
|
end
|
13
13
|
|
14
14
|
def defaults
|
15
|
+
puts_debug "Dev::Project.defaults begin"
|
15
16
|
system_call = Dev::SystemCall.new("semver init") if(!File.exist?(".semver"))
|
16
17
|
h=Hash.new
|
18
|
+
puts_debug "Dev::Project.defaults :scm_uri"
|
17
19
|
h[:scm_uri] = get_default_scm_uri if !get_default_scm_uri.nil?
|
20
|
+
puts_debug "Dev::Project.defaults :scm_type"
|
18
21
|
h[:scm_type] = get_default_scm_type if !get_default_scm_type.nil?
|
19
22
|
h[:directory]=Rake.original_dir()
|
20
23
|
h[:fullname]=get_default_value_fullname
|
@@ -23,21 +26,31 @@ class Project < Hash
|
|
23
26
|
h[:version]= "#{SemVer.find.major}.#{SemVer.find.minor}.#{SemVer.find.patch}"
|
24
27
|
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
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")
|
26
|
-
|
29
|
+
puts_debug "Dev::Project.defaults :dev_root"
|
27
30
|
h[:dev_root]= "#{Dev::Environment.dev_root}"
|
31
|
+
puts_debug "Dev::Project.defaults A"
|
28
32
|
if !Dev::BoostBuild.defaultToolset.nil?
|
33
|
+
puts_debug "Dev::Project.defaults :toolset"
|
29
34
|
h[:toolset] = Dev::BoostBuild.defaultToolset
|
30
35
|
ENV["VisualStudioVersion"]="11.0" if h[:toolset]=="msvc-11.0"
|
31
36
|
end
|
32
37
|
|
33
|
-
|
34
|
-
["
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
+
puts_debug "Dev::Project.defaults :type"
|
39
|
+
h[:type]="gem"
|
40
|
+
puts_debug "Dev::Project.defaults B"
|
41
|
+
if(defined?(DEV_FILE_COUNT))
|
42
|
+
h[:type]=get_default_value_type
|
43
|
+
h[:file_count]=Hash.new
|
44
|
+
["rb","spec","feature","cs","cpp","h","hpp","vcxproj","csproj"].each{ |ext|
|
45
|
+
count=Dir.glob("**/*.#{ext}").count
|
46
|
+
h[:file_count][ext.to_sym]=count if count > 0
|
47
|
+
}
|
48
|
+
end
|
38
49
|
|
50
|
+
puts_debug "Dev::Project.defaults C"
|
39
51
|
h[:paths] = Dev::Paths.new
|
40
52
|
h[:dep]=Deps.new
|
53
|
+
puts_debug "Dev::Project.defaults end"
|
41
54
|
return h
|
42
55
|
end
|
43
56
|
|