diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..655002dc --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,17 @@ +# Change Log +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/) +and this project adheres to [Semantic Versioning](http://semver.org/). + +## [Unreleased] +### Fixed +- Add missing win32 metadata +- Fix capture frame output format to intended JPEG + +## [1.4.0] - 2017-01-28 +### Added +- Show help sheet by pressing H + +### Fixed +- Support # in file path diff --git a/README.md b/README.md index 61de6885..1e740727 100644 --- a/README.md +++ b/README.md @@ -63,13 +63,19 @@ Then: npm start ``` -### Building package +### Release new version ``` +# Commit changes +# Wait for Travis +npm version ... +# Update CHANGELOG.md npm run download-ffmpeg npm run extract-ffmpeg npm run build npm run icon-gen -npm run package # builds all platforms +npm run package +npm run release + ``` ## Credits diff --git a/package.json b/package.json index 8df26b16..c3349656 100644 --- a/package.json +++ b/package.json @@ -19,14 +19,22 @@ "zip": "(cd package && rm -f LosslessCut-*.zip && for f in LosslessCut-*; do zip -r --symlinks \"$f\".zip \"$f\"; done)", "icon-gen": "icon-gen -i src/icon.svg -o ./icon-dist -r", "package": "npm run package:darwin_x64 && npm run package:win32_ia32 && npm run package:win32_x64 && npm run package:linux_ia32 && npm run package:linux_x64 && npm run zip", + "release": "gh-release -a package/LosslessCut-darwin-x64.zip,package/LosslessCut-win32-ia32.zip,package/LosslessCut-win32-x64.zip,package/LosslessCut-linux-ia32.zip,package/LosslessCut-linux-x64.zip", "gifify": "gifify -p 405:299 -r 5@3 Untitled.mov-00.00.00.971-00.00.19.780.mp4", - "lint": "eslint ." + "lint": "eslint .", + "clean": "rm -rf ffmpeg-tmp/extracted ffmpeg-tmp/binaries package", + "clean-ffmpeg": "rm -rf ffmpeg-tmp/archives" }, "author": { "name": "Mikael Finstad", "email": "finstaden@gmail.com", "url": "mifi.no" }, + "repository" : + { + "type" : "git", + "url" : "https://github.com/mifi/lossless-cut.git" + }, "license": "MIT", "devDependencies": { "babel-cli": "^6.18.0", @@ -38,6 +46,7 @@ "eslint-plugin-import": "^1.16.0", "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" }, "dependencies": { diff --git a/scripts/ffmpeg-dl/dl.sh b/scripts/ffmpeg-dl/dl.sh index 0c6539e7..c86c4a42 100755 --- a/scripts/ffmpeg-dl/dl.sh +++ b/scripts/ffmpeg-dl/dl.sh @@ -5,8 +5,15 @@ ffmpeg_win32_ia32=https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-3.1.5-wi ffmpeg_win32_x64=https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-3.1.5-win64-static.zip ffprobe_darwin_x64=http://evermeet.cx/ffmpeg/ffprobe-3.2.7z -mkdir -p ffmpeg-tmp/archives && -(cd ffmpeg-tmp/archives && +OUT_DIR=ffmpeg-tmp/archives + +if [ -d "$OUT_DIR" ]; then + echo "$OUT_DIR exists, skipping download." + exit +fi + +mkdir "$OUT_DIR" && +(cd "$OUT_DIR" && wget -O ffmpeg_linux_ia32.tar.xz "${ffmpeg_linux_ia32}" && wget -O ffmpeg_linux_x64.tar.xz "${ffmpeg_linux_x64}" && wget -O ffmpeg_darwin_x64.7z "${ffmpeg_darwin_x64}" &&