dev 2.0.277 → 2.0.278

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 146daee863f81f1b823571f15288d04522835575
4
- data.tar.gz: ec8da05dca82c57235ed2ad487a905c4653b04d1
3
+ metadata.gz: 2394738a29b12d89c8f4b9f0e5bf3cc84f3fb85f
4
+ data.tar.gz: 40995828f5b50f99633d824974acf993394a02ee
5
5
  SHA512:
6
- metadata.gz: e432c8c6eb9ef3d47525d60695f47adbea52d13f65dd6aea292078350eacd45fc515ad1bc0614dd91177f616112d655db2a619c7ddcfff3e89ae19dd2188ed4b
7
- data.tar.gz: b3b66211a314844ac328190f936b6e91e520e67f818a7741c51973c329a721ae050d2d53ccdf4b6b9a756a26bb9d5e6d7e1196cf2797aa253d80c830e337cb17
6
+ metadata.gz: 7111b8f62022bb0bbfb739fe824c8ee33975464b2a5ef8b27a048342bd21c85ec07a63e4d152c30abbc5f7ab3a70aa7faecef4d5d327dcc923c3eff9895e0438
7
+ data.tar.gz: 774e422e13ef1923fe9eb071d2e254ebf8a4e7ec40adaa2486d45b4e812d60b8901b55d0386eca5c79a684ad8403a1be847af7654b2e2e1c4270bc0522487b85
@@ -1,3 +1,3 @@
1
1
  puts __FILE__ if defined?(DEBUG)
2
2
 
3
- ['git','msbuild','nuget','svn','wix'].each{|name| require_relative("apps/#{name}.rb")}
3
+ ['git','msbuild','nuget','svn','wix','xcodebuild'].each{|name| require_relative("apps/#{name}.rb")}
@@ -10,8 +10,10 @@ class MSBuild < Hash
10
10
  if(File.exists?("C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\msbuild.exe"))
11
11
  self[:vs14]="C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\msbuild.exe"
12
12
  else
13
- puts "C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\msbuild.exe was not found."
14
- puts "MSBUILD[:vs14]='PATH_TO_MSBUILD' may be used to specify msbuild path."
13
+ if(Environment.windows?)
14
+ puts "C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\msbuild.exe was not found."
15
+ puts "MSBUILD[:vs14]='PATH_TO_MSBUILD' may be used to specify msbuild path."
16
+ end
15
17
  end
16
18
  self[:vs9]="C:\\Windows\\Microsoft.NET\\Framework\\v3.5\\msbuild.exe" if(File.exists?("C:\\Windows\\Microsoft.NET\\Framework\\v3.5\\msbuild.exe"))
17
19
  self[:vs10]="C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\msbuild.exe" if(File.exists?("C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\msbuild.exe"))
@@ -7,6 +7,7 @@ class Wix
7
7
  def self.get_build_commands wxs_file
8
8
  build_commands=nil
9
9
  if(File.exists?(wxs_file))
10
+ if(Environment.windows?)
10
11
  ext='msi'
11
12
  ext='exe' if(IO.read(wxs_file).include?('<Bundle'))
12
13
  extensions=''
@@ -21,6 +22,7 @@ class Wix
21
22
  else
22
23
  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj #{extensions}"
23
24
  end
25
+ end
24
26
  end
25
27
  build_commands
26
28
  end
@@ -0,0 +1,13 @@
1
+ #COMMANDS[:build]=['xcodebuild clean -scheme Hydrogen -destination "name=iPhone 6"',
2
+ # 'xcodebuild build -scheme Hydrogen -destination "name=iPhone 6"']
3
+ # COMMANDS[:test]=['xcodebuild test -scheme Hydrogen -destination "name=iPhone 6"'] if RUBY_PLATFORM.include?('darwin')
4
+
5
+ class XCodeBuild < Hash
6
+ def self.get_build_commands xcodeproj_filename
7
+ build_commands=Array.new
8
+ name=xcodeproj_filename.gsub('.xcodeproj','')
9
+ build_commands << "xcodebuild clean -scheme #{name} -destination \"name=iPhone 6\""
10
+ build_commands << "xcodebuild build -scheme #{name} -destination \"name=iPhone 6\""
11
+ build_commands
12
+ end
13
+ end
@@ -104,7 +104,7 @@ class Environment < Hash
104
104
 
105
105
  def colorize?
106
106
  colorize=true
107
- if windows?
107
+ if Environment.windows?
108
108
  if(`gem list win32console`.include?('win32console'))
109
109
  require 'ansi/code'
110
110
  else
@@ -132,10 +132,38 @@ class Environment < Hash
132
132
  true
133
133
  end
134
134
 
135
- def windows?
135
+ def self.OS
136
+ if windows?
137
+ return "windows"
138
+ else
139
+ if mac?
140
+ return "mac"
141
+ else
142
+ if linux?
143
+ return "linux"
144
+ else
145
+ return "unix"
146
+ end
147
+ end
148
+ end
149
+ end
150
+
151
+ def self.windows?
136
152
  Gem.win_platform?
137
153
  end
138
154
 
155
+ def self.mac?
156
+ (/darwin/ =~ RUBY_PLATFORM) != nil
157
+ end
158
+
159
+ def self.unix?
160
+ !windows?
161
+ end
162
+
163
+ def self.linux?
164
+ unix? and not mac?
165
+ end
166
+
139
167
  #def self.configuration
140
168
  # config="#{Environment.home}/dev.config.rb"
141
169
  # if(!File.exists?(config))
@@ -7,8 +7,9 @@ SOURCE.include('**/*.{cs,xaml,resx,settings}')
7
7
  SOURCE.include('**/*.{c,h}')
8
8
  SOURCE.include('**/*.{cpp,hpp}')
9
9
  SOURCE.include('**/*.{swift}')
10
- SOURCE.include('**/*.{xcodeproj}')
10
+ SOURCE.include('**/*.{xcodeproj,plist,storyboard,json}')
11
11
  SOURCE.include('**/*.{csproj,sln,nuspec,config,snk}')
12
+ SOURCE.include('**/*.{jpeg}')
12
13
  SOURCE.include('**/*.{wxs}')
13
14
  SOURCE.exclude('bin','obj','lib')
14
15
  SOURCE.exclude('**/obj/**/*.*')
@@ -4,7 +4,6 @@ require_relative('../base/environment.rb')
4
4
 
5
5
  desc 'performs build commands'
6
6
  task :build do Tasks.execute_task :build;end
7
- #task :build do Tasks.execute_task :build;end
8
7
 
9
8
  SLN_FILES=FileList.new('*.sln','*/*.sln','*/*/*.sln')
10
9
  NUGET_FILES=FileList.new('**/*.nuspec')
@@ -20,57 +19,69 @@ class Build < Array
20
19
  add_quiet("gem build #{gemspec}") if !File.exist?(Gemspec.gemfile gemspec)
21
20
  }
22
21
 
23
- puts "Build scanning for sln files" if Environment.default.debug?
24
- SLN_FILES.each{|sln_file|
22
+ # Windows
23
+ if(Environment.windows?)
24
+ puts "Build scanning for sln files" if Environment.default.debug?
25
+ SLN_FILES.each{|sln_file|
25
26
  puts " #{sln_file}" if Environment.default.debug?
26
27
  build_commands = MSBuild.get_build_commands sln_file
27
28
  if(!build_commands.nil?)
28
29
  build_commands.each{|c|
29
30
  puts " build command #{c} discovered." if Environment.default.debug?
30
- #self.add c
31
31
  add_quiet(c)
32
32
  }
33
33
  else
34
34
  puts " no build command discovered." if Environment.default.debug?
35
35
  end
36
- }
36
+ }
37
37
 
38
- puts "Build scanning for nuget files" if Environment.default.debug?
39
- NUGET_FILES.each{|nuget_file|
38
+ puts "Build scanning for nuget files" if Environment.default.debug?
39
+ NUGET_FILES.each{|nuget_file|
40
40
  build_commands = Nuget.get_build_commands nuget_file
41
41
  if(!build_commands.nil?)
42
42
  build_commands.each{|c|
43
43
  add_quiet(c)
44
- #self.add c
45
44
  }
46
45
  end
47
- }
46
+ }
48
47
 
49
- puts "Build scanning for wxs <Product> files" if Environment.default.debug?
50
- WXS_FILES.each{|wxs_file|
48
+ puts "Build scanning for wxs <Product> files" if Environment.default.debug?
49
+ WXS_FILES.each{|wxs_file|
51
50
  if(IO.read(wxs_file).include?('<Product'))
52
51
  build_commands = Wix.get_build_commands wxs_file
53
52
  if(!build_commands.nil?)
54
53
  build_commands.each{|c|
55
- #self.add c
56
54
  add_quiet(c)
57
55
  }
58
56
  end
59
57
  end
60
- }
58
+ }
61
59
 
62
- puts "Build scanning for wxs <Bundle> files" if Environment.default.debug?
63
- WXS_FILES.each{|wxs_file|
60
+ puts "Build scanning for wxs <Bundle> files" if Environment.default.debug?
61
+ WXS_FILES.each{|wxs_file|
64
62
  if(IO.read(wxs_file).include?('<Bundle'))
65
63
  build_commands = Wix.get_build_commands wxs_file
66
64
  if(!build_commands.nil?)
67
65
  build_commands.each{|c|
68
- #self.add c
69
66
  add_quiet(c)
70
67
  }
71
68
  end
72
69
  end
73
- }
70
+ }
71
+ end
72
+
73
+ # Mac
74
+ if(Environment.mac?)
75
+ puts "Build scanning for xcodeproj folders" if Environment.default.debug?
76
+ Dir.glob('**/*.xcodeproj').each{|dir|
77
+ build_commands = XCodeBuild.get_build_commands dir
78
+ if(!build_commands.nil)
79
+ build_commands.each{|c|
80
+ add_quiet(c)
81
+ }
82
+ end
83
+ }
84
+ end
74
85
  #end
75
86
  end
76
87
  end
@@ -2,7 +2,7 @@ puts __FILE__ if defined?(DEBUG)
2
2
 
3
3
  require 'rake/clean'
4
4
  # Clean Files
5
- CLEAN.include('**/*.{sdf,sud,ncb,cache,user,wixobj,wixpdb}')
5
+ CLEAN.include('**/*.{sdf,sud,ncb,cache,user,wixobj,wixpdb,nupkg}')
6
6
 
7
7
  # Clean Folders
8
8
  CLEAN.include('obj') if File.exists?('obj')
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dev
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.277
4
+ version: 2.0.278
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lou Parslow
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-04 00:00:00.000000000 Z
11
+ date: 2015-10-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -67,6 +67,7 @@ files:
67
67
  - lib/apps/nuget.rb
68
68
  - lib/apps/svn.rb
69
69
  - lib/apps/wix.rb
70
+ - lib/apps/xcodebuild.rb
70
71
  - lib/base.rb
71
72
  - lib/base/array.rb
72
73
  - lib/base/command.rb
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
124
125
  version: '0'
125
126
  requirements: []
126
127
  rubyforge_project:
127
- rubygems_version: 2.4.5
128
+ rubygems_version: 2.4.5.1
128
129
  signing_key:
129
130
  specification_version: 4
130
131
  summary: dev