From 953289ca7fe6343067a966ac3763ef06f5207178 Mon Sep 17 00:00:00 2001 From: nothingismagick Date: Mon, 12 Apr 2021 14:55:00 +0200 Subject: [PATCH] chore/licenses (#1461) --- .changes/config.json | 2 +- .husky/pre-commit | 5 +++++ .scripts/utils/batch_to_exe.cmd | 5 +++++ core/tauri/src/api/mod.rs | 1 + maskfile.md | 8 +++++++- tooling/create-tauri-app/bin/create-tauri-app.js | 3 +++ tooling/create-tauri-app/package.json | 2 +- tooling/create-tauri-app/src/dependency-manager.ts | 4 ++++ tooling/create-tauri-app/src/index.ts | 4 ++++ tooling/create-tauri-app/src/shell.ts | 4 ++++ tooling/create-tauri-app/src/types/deps.ts | 4 ++++ 11 files changed, 39 insertions(+), 3 deletions(-) diff --git a/.changes/config.json b/.changes/config.json index 247d7d511..3349dba76 100644 --- a/.changes/config.json +++ b/.changes/config.json @@ -176,7 +176,7 @@ ] }, "create-tauri-app": { - "path": "./cli/create-tauri-app", + "path": "./tooling/create-tauri-app", "manager": "javascript", "dependencies": [ "cli.js" diff --git a/.husky/pre-commit b/.husky/pre-commit index ae76c9bdd..f0fdbcd6a 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,9 @@ #!/bin/sh + +# Copyright 2019-2021 Tauri Programme within The Commons Conservancy +# SPDX-License-Identifier: Apache-2.0 +# SPDX-License-Identifier: MIT + . "$(dirname "$0")/_/husky.sh" cd tooling/api diff --git a/.scripts/utils/batch_to_exe.cmd b/.scripts/utils/batch_to_exe.cmd index d53449e47..44b207b4f 100644 --- a/.scripts/utils/batch_to_exe.cmd +++ b/.scripts/utils/batch_to_exe.cmd @@ -1,4 +1,9 @@ @ECHO OFF + +REM Copyright 2019-2021 Tauri Programme within The Commons Conservancy +REM SPDX-License-Identifier: Apache-2.0 +REM SPDX-License-Identifier: MIT + ECHO Make EXE From BAT ECHO. ECHO. diff --git a/core/tauri/src/api/mod.rs b/core/tauri/src/api/mod.rs index b051fc28a..4d9b9911a 100644 --- a/core/tauri/src/api/mod.rs +++ b/core/tauri/src/api/mod.rs @@ -4,6 +4,7 @@ //! The Tauri API interface. #![warn(missing_docs)] +// #![feature(const_int_pow)] /// The App API module allows you to manage application processes. pub mod app; diff --git a/maskfile.md b/maskfile.md index 5538651c7..c88f5f297 100644 --- a/maskfile.md +++ b/maskfile.md @@ -1,8 +1,14 @@ # Shorthand Commands + + ## prepare -> Setup all stuffs needed for running the examples +> Setup all stuff needed for running the examples ```sh git clone --recursive git@github.com:tauri-apps/examples.git \ diff --git a/tooling/create-tauri-app/bin/create-tauri-app.js b/tooling/create-tauri-app/bin/create-tauri-app.js index 7b73ee56e..6828c3ebb 100644 --- a/tooling/create-tauri-app/bin/create-tauri-app.js +++ b/tooling/create-tauri-app/bin/create-tauri-app.js @@ -1,4 +1,7 @@ #!/usr/bin/env node +// Copyright 2019-2021 Tauri Programme within The Commons Conservancy +// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: MIT const parseArgs = require("minimist"); const inquirer = require("inquirer"); diff --git a/tooling/create-tauri-app/package.json b/tooling/create-tauri-app/package.json index 3e60a1d50..3463faa50 100644 --- a/tooling/create-tauri-app/package.json +++ b/tooling/create-tauri-app/package.json @@ -6,7 +6,7 @@ "create-tauri-app": "./bin/create-tauri-app.js" }, "repository": "git+https://github.com/tauri-apps/tauri.git", - "license": "MIT", + "license": "MIT OR Apache-2.0", "bugs": { "url": "https://github.com/tauri-apps/tauri/issues" }, diff --git a/tooling/create-tauri-app/src/dependency-manager.ts b/tooling/create-tauri-app/src/dependency-manager.ts index e3bc7378d..ab86d14d6 100644 --- a/tooling/create-tauri-app/src/dependency-manager.ts +++ b/tooling/create-tauri-app/src/dependency-manager.ts @@ -1,3 +1,7 @@ +// Copyright 2019-2021 Tauri Programme within The Commons Conservancy +// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: MIT + import { ManagementType, Result } from "./types/deps"; import { shell } from "./shell"; import { existsSync } from "fs"; diff --git a/tooling/create-tauri-app/src/index.ts b/tooling/create-tauri-app/src/index.ts index fd41703aa..ece356ca3 100644 --- a/tooling/create-tauri-app/src/index.ts +++ b/tooling/create-tauri-app/src/index.ts @@ -1,3 +1,7 @@ +// Copyright 2019-2021 Tauri Programme within The Commons Conservancy +// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: MIT + import { map, find } from "lodash"; import { TauriBuildConfig } from "./types/config"; import { reactjs, reactts } from "./recipes/react"; diff --git a/tooling/create-tauri-app/src/shell.ts b/tooling/create-tauri-app/src/shell.ts index faddc0f48..e3a2e7c01 100644 --- a/tooling/create-tauri-app/src/shell.ts +++ b/tooling/create-tauri-app/src/shell.ts @@ -1,3 +1,7 @@ +// Copyright 2019-2021 Tauri Programme within The Commons Conservancy +// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: MIT + import execa from "execa"; export const shell = async ( diff --git a/tooling/create-tauri-app/src/types/deps.ts b/tooling/create-tauri-app/src/types/deps.ts index fe15c0287..6cf06569f 100644 --- a/tooling/create-tauri-app/src/types/deps.ts +++ b/tooling/create-tauri-app/src/types/deps.ts @@ -1,3 +1,7 @@ +// Copyright 2019-2021 Tauri Programme within The Commons Conservancy +// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: MIT + export enum ManagementType { Install, InstallDev,