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.

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

build下のスクリプトをtoolsに動かしてTypeScriptにする #2361

Merged
merged 12 commits into from
Nov 23, 2024
Merged
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ jobs:
- name: Define Code Signing Envs
if: startsWith(matrix.os, 'windows-') && github.event.inputs.code_signing == 'true'
run: |
bash build/codesign_setup.bash
bash tools/codesign_setup.bash
THUMBPRINT="$(head -n 1 $THUMBPRINT_PATH)"
SIGNTOOL_PATH="$(head -n 1 $SIGNTOOL_PATH_PATH)"
echo "::add-mask::$THUMBPRINT"
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
- name: Reset Code Signing Envs
if: startsWith(matrix.os, 'windows-') && github.event.inputs.code_signing == 'true'
run: |
bash build/codesign_cleanup.bash
bash tools/codesign_cleanup.bash
echo 'WIN_CERTIFICATE_SHA1=' >> $GITHUB_ENV
echo 'WIN_SIGNING_HASH_ALGORITHMS=' >> $GITHUB_ENV
echo 'SIGNTOOL_PATH=' >> $GITHUB_ENV
Expand Down Expand Up @@ -390,7 +390,7 @@ jobs:
- name: Define Code Signing Envs
if: startsWith(matrix.os, 'windows-') && github.event.inputs.code_signing == 'true'
run: |
bash build/codesign_setup.bash
bash tools/codesign_setup.bash
THUMBPRINT="$(head -n 1 $THUMBPRINT_PATH)"
SIGNTOOL_PATH="$(head -n 1 $SIGNTOOL_PATH_PATH)"
echo "::add-mask::$THUMBPRINT"
Expand Down Expand Up @@ -425,7 +425,7 @@ jobs:
- name: Reset Code Signing Envs
if: startsWith(matrix.os, 'windows-') && github.event.inputs.code_signing == 'true'
run: |
bash build/codesign_cleanup.bash
bash tools/codesign_cleanup.bash
echo 'WIN_CERTIFICATE_SHA1=' >> $GITHUB_ENV
echo 'WIN_SIGNING_HASH_ALGORITHMS=' >> $GITHUB_ENV
echo 'SIGNTOOL_PATH=' >> $GITHUB_ENV
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,6 @@ storybook-static/

# Preview Build Output
dist_preview/

# Downloaded binaries
vendored
89 changes: 0 additions & 89 deletions build/download7z.js

This file was deleted.

100 changes: 0 additions & 100 deletions build/generateLicenses.js

This file was deleted.

2 changes: 1 addition & 1 deletion build/installer.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
StrCpy $archiveSize $0

; 展開後の合計サイズを取得
File /oname=$PLUGINSDIR\7za.exe "${BUILD_RESOURCES_DIR}\vendored\7z\7za.exe"
File /oname=$PLUGINSDIR\7za.exe "${PROJECT_DIR}\vendored\7z\7za.exe"
${getUncompressedSizeFrom7z} $0 $1
${If} $0 == "Failed to execute 7za.exe"
${OrIf} $0 == "Failed to open file list"
Expand Down
4 changes: 0 additions & 4 deletions build/vendored/.gitignore

This file was deleted.

Empty file removed build/vendored/7z/.gitkeep
Empty file.
8 changes: 0 additions & 8 deletions build/vendored/README.md

This file was deleted.

6 changes: 3 additions & 3 deletions electron-builder.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ const isArm64 = process.arch === "arm64";
const extraFilePrefix = isMac ? "MacOS/" : "";

const sevenZipFile = fs
.readdirSync(path.resolve(__dirname, "build", "vendored", "7z"))
.readdirSync(path.resolve(__dirname, "vendored", "7z"))
.find(
// Windows: 7za.exe, Linux: 7zzs, macOS: 7zz
(fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName),
);

if (!sevenZipFile) {
throw new Error(
"7z binary file not found. Run `node ./build/download7z.js` first.",
"7z binary file not found. Run `node ./tools/download7z.js` first.",
);
}

Expand Down Expand Up @@ -95,7 +95,7 @@ const builderOptions = {
to: path.join(extraFilePrefix, "vv-engine"),
},
{
from: path.resolve(__dirname, "build", "vendored", "7z", sevenZipFile),
from: path.resolve(__dirname, "vendored", "7z", sevenZipFile),
to: extraFilePrefix + sevenZipFile,
},
],
Expand Down
60 changes: 59 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading