Skip to content

add licenses file #6056

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

Open
avacreeth wants to merge 1 commit into
base: staging
Choose a base branch
from
+5 −3
Open

add licenses file #6056

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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ yarn-error.log
.env
.awcache/
AGREEMENT
LICENSES
license_en.txt
.pnp.*
.yarn/*
Expand Down
2 changes: 1 addition & 1 deletion electron-builder/base.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const base = {
},
win: {
executableName: 'Streamlabs OBS',
extraFiles: ['LICENSE', 'AGREEMENT', 'shared-resources/**/*', '!shared-resources/README'],
extraFiles: ['LICENSE', 'AGREEMENT', 'LICENSES', 'shared-resources/**/*', '!shared-resources/README'],
rfc3161TimeStampServer: 'http://timestamp.digicert.com',
timeStampServer: 'http://timestamp.digicert.com',
signDlls: true,
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@
"commit": "commit",
"postinstall": "node ./scripts/postinstall.js",
"tail-obs-logs": "node bin/tail-obs-logs.js",
"generate-agreement": "cat BASEAGREEMENT > AGREEMENT && yarn licenses generate-disclaimer >> AGREEMENT",
"generate-agreement:mac": "cat BASEAGREEMENT > license_en.txt && yarn licenses generate-disclaimer >> license_en.txt",
"generate-licenses": "yarn licenses generate-disclaimer > LICENSES",
"generate-agreement": "yarn generate-licenses && cat BASEAGREEMENT LICENSES > AGREEMENT",
"generate-agreement:mac": "yarn generate-licenses && cat BASEAGREEMENT LICENSES > license_en.txt",
"beta": "SLD_USE_BETA=true electron .",
"qa": "rm -rf node_modules/ && yarn install && yarn compile && yarn start",
"qa:beta": "rm -rf node_modules/ && yarn install && yarn compile && yarn beta"
Expand Down
Loading