Fix for sdk25#2
Conversation
|
@Brantone , @gildegoma please review. Fix for gildegoma#34 |
rjaros87
force-pushed
the
windows_fix_sdk25
branch
3 times, most recently
from
a54c2e3 to
b2df530
Compare
rjaros87
force-pushed
the
windows_fix_sdk25
branch
from
b2df530 to
47d08e1
Compare
|
Seems like lots of other peripheral changes (ex: remove tailor from Rakefile), and bunch of white space changes, which make it somewhat cumbersome to isolate actual changes to SDK25. |
| task default: [:rubocop, :foodcritic, :knife, :serverspec] | ||
|
|
||
| desc 'Lint Ruby code' | ||
| task :tailor do |
There was a problem hiding this comment.
Rubocop checks the the same and even more.
There was a problem hiding this comment.
and also we execute foodcritic ;)
| jdk_version: 7 | ||
|
|
||
| - name: default | ||
| - name: legacy |
There was a problem hiding this comment.
Suite to check the backward compatibility
| - android-22 | ||
| - sys-img-armeabi-v7a-android-22 | ||
|
|
||
| - name: default |
There was a problem hiding this comment.
Suite to check the latest SDK and default recipe without modification attributes android-sdk
| default['android-sdk']['checksum']['mac_os_x'] = '593544d4ca7ab162705d0032fb0c0c88e75bd0f42412d09a1e8daa3394681dc6' | ||
| default['android-sdk']['checksum']['windows'] = '23d5686ffe489e5a1af95253b153ce9d6f933e5dbabe14c494631234697a0e08' | ||
|
|
||
| if ::Gem::Version.new(node['android-sdk']['version']) < ::Gem::Version.new('25') |
There was a problem hiding this comment.
We check the SDK version and set node['android-sdk']['legacy_sdk'] attribute which will be used in our recipies. Also there are different urls.
| owner node['android-sdk']['owner'] | ||
| group node['android-sdk']['group'] | ||
| backup node['android-sdk']['backup_archive'] | ||
| strip_components node['android-sdk']['legacy_sdk'] ? 1 : 0 |
There was a problem hiding this comment.
Major fix for unix system is just simply extract archive to android-sdk directory without strip directory (by default ark enter to the first directory and then extract the content (default value: 1))
| ::File.rename "#{setup_root}/android-sdk-windows", "#{setup_root}/#{node['android-sdk']['name']}" | ||
| if node['android-sdk']['legacy_sdk'] | ||
| ::File.rename "#{setup_root}/android-sdk-windows", "#{setup_root}/#{node['android-sdk']['name']}" | ||
| else |
There was a problem hiding this comment.
Major fix for windows system
|
Extras are only
Hope my comments will help. |
|
Thank you a lot and again @rjaros87 and @Brantone to collaborate on this issue. ❤️ ❤️ ❤️ |
In order to prepare a more significant switch to ChefDK, the FoodCritic exceptions are now defined in .foodcritic, and no longer in the Rakefile. Enable back FC041 (download are done via the ark cookbook only) Tolerate FC053 as the 'recommends' keyword is still worth to be present, even though Chef tools are not using this meta data.
After four random checks, it seems that the new HTTPS-based repository provides all the Linux package history. The archives are in .zip format, and don't require to strip an `android-sdk-linux` base directory. Since the new .zip archives only contain the 'tools' directory, it is no longer necessary to fix the permissions and ownership for the 'add-ons' or 'platforms' that were present in the .tgz file.
|
Merged with upstream master :) and refactor unix recipe |
| # | ||
| # Fix non-friendly 0750 permissions in order to make android-sdk available to all system users | ||
| # | ||
| %w(add-ons platforms tools).each do |subfolder| |
There was a problem hiding this comment.
we don't need this anymore :) by default in archive tools has 755
3 participants
No description provided.