Skip to content

Commit 0219037

Browse files
authored
Require build tools in tasks that require them instead of in top level Rakefile (#3109)
1 parent 73073af commit 0219037

7 files changed

+14
-11
lines changed

Rakefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ $:.unshift("#{$GEMS_DIR}/aws-partitions/lib")
1111
$:.unshift("#{$GEMS_DIR}/aws-eventstream/lib")
1212
$:.unshift("#{$GEMS_DIR}/aws-sigv4/lib")
1313

14-
require 'build_tools'
15-
require 'aws-sdk-code-generator'
16-
require 'aws-sdk-core'
14+
task 'require-build-tools' do
15+
require 'build_tools'
16+
end
1717

1818
Dir.glob("#{$REPO_ROOT}/tasks/**/*.rake").each do |task_file|
1919
load(task_file)

build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# frozen_string_literal: true
22

3+
require 'aws-sdk-core'
4+
35
require_relative 'aws-sdk-code-generator/api'
46
require_relative 'aws-sdk-code-generator/apply_docs'
57
require_relative 'aws-sdk-code-generator/codegenerated_plugin'

tasks/build.rake

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'set'
44

55
desc 'Generates the code for every service'
6-
task 'build' do
6+
task 'build' => 'require-build-tools' do
77
BuildTools::Services.each do |service|
88
Rake::Task["build:aws-sdk-#{service.identifier}"].invoke
99
end
@@ -12,7 +12,7 @@ end
1212
desc 'Generates the code for one service, e.g. `rake build build:aws-sdk-dynamodb`'
1313
task 'build:aws-sdk-*'
1414

15-
rule /^build:aws-sdk-\w+$/ do |task|
15+
rule /^build:aws-sdk-\w+$/ => 'require-build-tools' do |task|
1616
identifier = task.name.split('-').last
1717
service = BuildTools::Services[identifier]
1818
files = AwsSdkCodeGenerator::GemBuilder.new(
@@ -27,7 +27,7 @@ end
2727
# Aws::STS is generated directly into the `aws-sdk-core` gem.
2828
# It is need to provide session credentials and assume role support.
2929
# Only building source, but not gemspecs, version file, etc.
30-
task 'build:aws-sdk-sts' do
30+
task 'build:aws-sdk-sts' => 'require-build-tools' do
3131
sts = BuildTools::Services.service('sts')
3232
generator = AwsSdkCodeGenerator::CodeBuilder.new(
3333
aws_sdk_core_lib_path: $CORE_LIB,
@@ -47,7 +47,7 @@ end
4747
# Aws::SSO is generated directly into the `aws-sdk-core` gem.
4848
# It is need to provide SSO Credentials.
4949
# Only building source, but not gemspecs, version file, etc.
50-
task 'build:aws-sdk-sso' do
50+
task 'build:aws-sdk-sso' => 'require-build-tools' do
5151
sso = BuildTools::Services.service('sso')
5252
generator = AwsSdkCodeGenerator::CodeBuilder.new(
5353
aws_sdk_core_lib_path: $CORE_LIB,
@@ -65,7 +65,7 @@ end
6565

6666
# Aws::SSOOIDC is generated directly into the `aws-sdk-core` gem.
6767
# Only building source, but not gemspecs, version file, etc.
68-
task 'build:aws-sdk-ssooidc' do
68+
task 'build:aws-sdk-ssooidc' => 'require-build-tools' do
6969
ssooidc = BuildTools::Services.service('ssooidc')
7070
generator = AwsSdkCodeGenerator::CodeBuilder.new(
7171
aws_sdk_core_lib_path: $CORE_LIB,

tasks/update-aws-sdk-dependencies.rake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
# updates list of service gems dependend on by the aws-sdk gem
4-
task 'update-aws-sdk-dependencies' do
4+
task 'update-aws-sdk-dependencies' => 'require-build-tools' do
55

66
# update the aws-sdk-resources.gemspec
77
BuildTools.replace_lines(

tasks/update-defaults-mode.rake

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# updates the defaults mode configuration
44
task 'update-defaults-mode', [:defaults_file] do |t, args|
5+
Rake::Task['require-build-tools'].invoke
56

67
defaults_file = args[:defaults_file]
78
if defaults_file.nil? || defaults_file.empty?

tasks/update-partition-service-list.rake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
# updates the services in the aws-partitions gem
4-
task 'update-partition-service-list' do
4+
task 'update-partition-service-list' => 'require-build-tools' do
55
lines = []
66
lines << " {\n"
77
BuildTools::Services.sort_by(&:name).each do |svc|

tasks/update-readme.rake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
# updates the table of supported services in the repo README
4-
task 'update-readme' do
4+
task 'update-readme' => 'require-build-tools' do
55

66
# insert one row for each supported service
77
table = []

0 commit comments

Comments
 (0)