1
0
mirror of https://github.com/mifi/lossless-cut.git synced 2024-11-22 02:12:30 +01:00

Upgrade build process

Use babel-preset-env
Upgrade icon-gen
add package.lock (i also tried yarn but it doesnt work well with electron packager)
extract version field in bash scripts
This commit is contained in:
Mikael Finstad 2018-02-17 17:42:59 +01:00
parent 5bf0c15d3e
commit 305fae7a94
6 changed files with 6248 additions and 17 deletions

View File

@ -1,3 +1,8 @@
{
"presets": ["es2015", "react"]
"presets": [
["env", {
"targets": { "electron": "1.8" }
}],
"react"
]
}

View File

@ -47,11 +47,11 @@ https://github.com/mifi/lossless-cut/blob/41d6991c11b0a82b08344fd22a1ea094af2174
## Development building / running
This app is built using Electron. Make sure you have at least node v4 with npm 3. The app uses ffmpeg from PATH when developing.
This app is built using Electron. Make sure you have at least node v6 and yarn installed. The app uses ffmpeg from PATH when developing.
```
git clone https://github.com/mifi/lossless-cut.git
cd lossless-cut
npm install
yarn
```
### Running

6221
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -37,7 +37,7 @@
"license": "MIT",
"devDependencies": {
"babel-cli": "^6.18.0",
"babel-preset-es2015": "^6.18.0",
"babel-preset-env": "^1.6.1",
"babel-preset-react": "^6.16.0",
"electron-packager": "^8.1.0",
"eslint": "^3.8.0",
@ -46,7 +46,7 @@
"eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.4.1",
"gh-release": "^2.2.1",
"icon-gen": "git+https://github.com/mifi/npm-icon-gen.git#ca9a098482d09bd378328bc1810ec2846429d109"
"icon-gen": "^1.2.0"
},
"dependencies": {
"bluebird": "^3.4.6",

View File

@ -1,10 +1,12 @@
#!/usr/bin/env bash
ffmpeg_version=3.4.2
ffmpeg_linux_ia32=https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-32bit-static.tar.xz
ffmpeg_linux_x64=https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz
ffmpeg_darwin_x64=http://evermeet.cx/ffmpeg/ffmpeg-3.4.1.7z
ffmpeg_win32_ia32=https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-3.4.1-win32-static.zip
ffmpeg_win32_x64=https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-3.4.1-win64-static.zip
ffprobe_darwin_x64=http://evermeet.cx/ffmpeg/ffprobe-3.4.1.7z
ffmpeg_darwin_x64=http://evermeet.cx/ffmpeg/ffmpeg-"${ffmpeg_version}".7z
ffmpeg_win32_ia32=https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-"${ffmpeg_version}"-win32-static.zip
ffmpeg_win32_x64=https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-"${ffmpeg_version}"-win64-static.zip
ffprobe_darwin_x64=http://evermeet.cx/ffmpeg/ffprobe-"${ffmpeg_version}".7z
OUT_DIR=ffmpeg-tmp/archives

View File

@ -1,3 +1,6 @@
#!/usr/bin/env bash
ffmpeg_version=3.4.2
(
mkdir -p ffmpeg-tmp/extracted &&
cd ffmpeg-tmp/extracted &&
@ -19,14 +22,14 @@ mkdir -p binaries/linux_x64 &&
mkdir -p binaries/win32_ia32 &&
mkdir -p binaries/win32_x64 &&
mkdir -p binaries/darwin_x64 &&
mv extracted/linux_ia32/ffmpeg-3.4.1-32bit-static/ffmpeg binaries/linux_ia32 &&
mv extracted/linux_ia32/ffmpeg-3.4.1-32bit-static/ffprobe binaries/linux_ia32 &&
mv extracted/linux_x64/ffmpeg-3.4.1-64bit-static/ffmpeg binaries/linux_x64 &&
mv extracted/linux_x64/ffmpeg-3.4.1-64bit-static/ffprobe binaries/linux_x64 &&
mv extracted/win32_ia32/ffmpeg-3.4.1-win32-static/bin/ffmpeg.exe binaries/win32_ia32 &&
mv extracted/win32_ia32/ffmpeg-3.4.1-win32-static/bin/ffprobe.exe binaries/win32_ia32 &&
mv extracted/win32_x64/ffmpeg-3.4.1-win64-static/bin/ffmpeg.exe binaries/win32_x64 &&
mv extracted/win32_x64/ffmpeg-3.4.1-win64-static/bin/ffprobe.exe binaries/win32_x64 &&
mv extracted/linux_ia32/ffmpeg-"${ffmpeg_version}"-32bit-static/ffmpeg binaries/linux_ia32 &&
mv extracted/linux_ia32/ffmpeg-"${ffmpeg_version}"-32bit-static/ffprobe binaries/linux_ia32 &&
mv extracted/linux_x64/ffmpeg-"${ffmpeg_version}"-64bit-static/ffmpeg binaries/linux_x64 &&
mv extracted/linux_x64/ffmpeg-"${ffmpeg_version}"-64bit-static/ffprobe binaries/linux_x64 &&
mv extracted/win32_ia32/ffmpeg-"${ffmpeg_version}"-win32-static/bin/ffmpeg.exe binaries/win32_ia32 &&
mv extracted/win32_ia32/ffmpeg-"${ffmpeg_version}"-win32-static/bin/ffprobe.exe binaries/win32_ia32 &&
mv extracted/win32_x64/ffmpeg-"${ffmpeg_version}"-win64-static/bin/ffmpeg.exe binaries/win32_x64 &&
mv extracted/win32_x64/ffmpeg-"${ffmpeg_version}"-win64-static/bin/ffprobe.exe binaries/win32_x64 &&
mv extracted/darwin_x64/ffmpeg binaries/darwin_x64 &&
mv extracted/darwin_x64/ffprobe binaries/darwin_x64 &&
echo Done