rake-delphi 0.0.32 → 0.0.33
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/rake/delphi/android/sdk.rb +5 -6
- data/lib/rake/delphi/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6c119e5e4ece30a32ff3711de76435085b2537a5
|
|
4
|
+
data.tar.gz: e5637e98253cd6c1a19f5d4ea0618c81beb4f501
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b4cd5c00f5acd60e9ca67e94fe2af7ac18ccb5e49a9c5f9b391f2a33a7836d8b0f39d77d68c35f6caf89986d732145902e269a51c1a9fd972eae3b8a3c44f97b
|
|
7
|
+
data.tar.gz: 1e6222bc2efdf3b4dbbba47658764860f221c3c26922320eb1607ab1c3b5fd24edb0b253302f53c213f4d86ac464449b35eb4bc7ad684ecea2ad4aa229f04b30
|
data/Gemfile.lock
CHANGED
|
@@ -19,9 +19,6 @@ module Rake
|
|
|
19
19
|
:zipalign => 'SDKZipAlignPath',
|
|
20
20
|
:jdk_path => 'JDKJarsignerPath'
|
|
21
21
|
}
|
|
22
|
-
REG_KEYS = {::Win32::Registry::HKEY_CURRENT_USER => 'HKCU',
|
|
23
|
-
::Win32::Registry::HKEY_LOCAL_MACHINE => 'HKLM'}
|
|
24
|
-
|
|
25
22
|
PROPERTIES.keys.each do |prop|
|
|
26
23
|
attr_accessor prop
|
|
27
24
|
end
|
|
@@ -34,11 +31,14 @@ module Rake
|
|
|
34
31
|
def read_default_config
|
|
35
32
|
begin
|
|
36
33
|
require 'win32/registry'
|
|
34
|
+
@reg_keys = {::Win32::Registry::HKEY_CURRENT_USER => 'HKCU',
|
|
35
|
+
::Win32::Registry::HKEY_LOCAL_MACHINE => 'HKLM'}
|
|
36
|
+
|
|
37
37
|
[::Win32::Registry::HKEY_CURRENT_USER, \
|
|
38
38
|
::Win32::Registry::HKEY_LOCAL_MACHINE].each do |regRoot|
|
|
39
39
|
begin
|
|
40
40
|
key = 'Default_Android'
|
|
41
|
-
Logger.trace(Logger::DEBUG, "Finding #{
|
|
41
|
+
Logger.trace(Logger::DEBUG, "Finding #{@reg_keys[regRoot]}\\#{@platform_SDKs}\\#{key}")
|
|
42
42
|
regRoot.open(@platform_SDKs) do |reg|
|
|
43
43
|
reg_typ, reg_val = reg.read(key)
|
|
44
44
|
Logger.trace(Logger::DEBUG, "Found '#{reg_val}'")
|
|
@@ -61,14 +61,13 @@ module Rake
|
|
|
61
61
|
return unless default_android
|
|
62
62
|
reg_default = @platform_SDKs + '\\' + default_android
|
|
63
63
|
begin
|
|
64
|
-
require 'win32/registry'
|
|
65
64
|
PROPERTIES.each do |prop, reg_key|
|
|
66
65
|
next unless reg_key
|
|
67
66
|
# current user values have precedence over local machine
|
|
68
67
|
[::Win32::Registry::HKEY_CURRENT_USER, \
|
|
69
68
|
::Win32::Registry::HKEY_LOCAL_MACHINE].each do |regRoot|
|
|
70
69
|
begin
|
|
71
|
-
Logger.trace(Logger::DEBUG, "Finding '#{reg_key}' for '#{prop}' in '#{
|
|
70
|
+
Logger.trace(Logger::DEBUG, "Finding '#{reg_key}' for '#{prop}' in '#{@reg_keys[regRoot]}\\#{reg_default}'")
|
|
72
71
|
regRoot.open(reg_default) do |reg|
|
|
73
72
|
reg_typ, reg_val = reg.read(reg_key)
|
|
74
73
|
Logger.trace(Logger::DEBUG, "Value=#{reg_val}")
|
data/lib/rake/delphi/version.rb
CHANGED