Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate LICENSE files in create_dist #8560

Merged
merged 1 commit into from
Mar 10, 2020
Merged

Generate LICENSE files in create_dist #8560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions lib/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const config = require('../lib/config')
const licensing = require('../lib/licensing')
const util = require('../lib/util')
const path = require('path')
const fs = require('fs-extra')
Expand Down Expand Up @@ -94,10 +93,6 @@ const build = (buildConfig = config.defaultBuildConfig, options) => {
touchOverriddenFiles()
touchOverriddenVectorIconFiles()
util.updateBranding()
if (buildConfig === 'Release') {
// TODO(bsclifton): uncomment when we can address problem
// licensing.updateLicenses()
}

if (config.xcode_gen_target) {
util.generateXcodeWorkspace()
Expand Down
2 changes: 2 additions & 0 deletions lib/createDist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const config = require('../lib/config')
const licensing = require('../lib/licensing')
const util = require('../lib/util')
const path = require('path')
const fs = require('fs-extra')
Expand All @@ -14,6 +15,7 @@ const createDist = (buildConfig = config.defaultBuildConfig, options) => {
}

util.updateBranding()
licensing.updateLicenses()
fs.removeSync(path.join(config.outputDir, 'dist'))
config.buildTarget = 'create_dist'
util.buildTarget()
Expand Down