diff --git a/DEPENDENCIES b/DEPENDENCIES new file mode 100644 index 0000000..058c7da --- /dev/null +++ b/DEPENDENCIES @@ -0,0 +1,22 @@ +Besides the tarball, you need a few external deps. + +For your distribution: + +First, install libc6:i386 for 64-bit systems. + +Debian: sudo apt-get install $(./convmlv.sh -K 0) +Ubuntu: sudo apt-get install $(./convmlv.sh -K 1) +Fedora: sudo yum install $(./convmlv.sh -K 2) +Mac (Homebrew): brew install $(./convmlv.sh -K 3) + +For Python (make sure you're using python3): + +sudo python3 -m pip install $ (./convmlv -Y) + + +Binary Source Code: + +mlv2badpixels.sh: http://www.magiclantern.fm/forum/index.php?topic=16054 +raw2dng: http://www.magiclantern.fm/forum/index.php?topic=5404.0 +mlv_dump: http://www.magiclantern.fm/forum/index.php?topic=7122.0 +cr2hdr: http://www.magiclantern.fm/forum/index.php?topic=7139.0 diff --git a/convmlv.sh b/convmlv.sh index 768319a..891879f 100755 --- a/convmlv.sh +++ b/convmlv.sh @@ -900,7 +900,8 @@ parseArgs() { #Amazing new argument parsing!!! OUTDIR=$val ;; version) - echo -e "convmlv v${VERSION}" + echo -e "${VERSION}" + exit 0 ;; help) help @@ -983,7 +984,8 @@ parseArgs() { #Amazing new argument parsing!!! v) - echo -e "convmlv v${VERSION}" + echo -e "${VERSION}" + exit 0 ;; h) help @@ -2370,7 +2372,7 @@ for ARG in "${FILE_ARGS_ITER[@]}"; do #Go through FILE_ARGS_ITER array, copied f oldFiles="${TMP}/orig_dng" find $oldFiles -name "*.dng" | xargs -I '{}' mv {} $DNG #Preserve the original, unprocessed DNGs. else - find $TMP -name "*.dng" | xargs -I '{}' mv {} $DNG + find $TMP -name "*.dng" | xargs -I '{}' mv {} $DNGv fi fi diff --git a/mkrelease.sh b/mkrelease.sh new file mode 100755 index 0000000..2d1ec5b --- /dev/null +++ b/mkrelease.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +VERSION="2_0_1" + +#HOW TO USE (Linux and Mac): +# 1. Update version above. +# 2. Put mlv2badpixels.sh, mlv_dump, raw2dng, and cr2hdr into a "binaries" folder in the repository. +# 3. Run this script, with one argument representing the path to the binaries. +# 4. A release tarball will automatically be created in "release" in the repository. + +## It's reccommended that BINPATH is a folder in REP_PATH. + +REP_PATH="$(pwd)" +BINPATH="${REP_PATH}/binaries" +RELEASE="${REP_PATH}/release" + +mkdir -p "$RELEASE" + +if [[ $OSTYPE == "linux-gnu" ]]; then + PLATFORM="linux" +elif [[ $OSTYPE == "darwin11" ]]; then + PLATFORM="mac" +else + echo "Platform not yet supported! Contact me at contact@sofusrose.com." +fi + +cd "$BINPATH" +tar -czvf $RELEASE/convmlv-${VERSION}-${PLATFORM}.tar.gz ../balance.py mlv2badpixels.sh mlv_dump raw2dng cr2hdr ../sRange.py ../CHANGELOG ../licence ../convmlv.sh ../color-core/ ../color-ext ../DEPENDENCIES ../docs/MANPAGE ../docs/docs.pdf ../docs/workflow.txt