Skip to content
This repository has been archived by the owner on Nov 19, 2018. It is now read-only.

Commit

Permalink
Merge branch 'fix-5.11'
Browse files Browse the repository at this point in the history
* fix-5.11:
  Bump v5.11.0
  Update build command
  • Loading branch information
feryardiant committed Aug 18, 2016
2 parents 96325d8 + f5f7276 commit 8c7b727
Show file tree
Hide file tree
Showing 66 changed files with 84,846 additions and 90,514 deletions.
25 changes: 10 additions & 15 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ if [ -z $1 ]; then
fi

version=$1
cmt_msg="Bump v${version}"
commit="Bump v${version}"

e '33;0' 'Entering FineUploader/fine-uploader src directory'
cd src
git checkout -qf master
cd src && git checkout -qf master

if [ -f 'npm-debug.log' ]; then
e '33;0' "Seems you've got an error in previous build"
Expand All @@ -32,8 +31,7 @@ if [ -f 'npm-debug.log' ]; then
fi

e '33;0' "Check out version $version"
git pull -q origin && \
git checkout -qb "v${version}" $version
git pull -q origin && git checkout -qb "v${version}" $version

if [[ $2 == '--reinstall-dep' ]]; then
e '33;0' 'Removing existing node_modules dir'
Expand All @@ -42,35 +40,32 @@ fi

if [ ! -d 'node_modules' ]; then
e '33;0' 'Installing dependencies'
npm install --quiet;
npm install -q;
fi

e '33;0' 'Build FineUploader/fine-uploader'
grunt build_stripped
make build

e '33;0' 'Clean up dist folder'
rm -rf ../dist/*

e '33;0' 'Copying build files'
cp -rf _build/* ../dist/
cp -rf client/html/templates/ ../dist/templates
cp -rf _build/* ../dist/ && cp -rf client/html/templates/ ../dist/templates

e '33;0' 'Back to master branch'
git checkout master && \
git branch -D "v${version}"
git checkout master && git branch -D "v${version}"

e '33;0' 'Update version number'
cd ..
sed -i -e "s/[0-9].[0-9].[0-9]/${version}/" bower.json
sed -i -e "s/[0-9].[0-9].[0-9]/${version}/" README.md
sed -i -e "s/[0-9].[0-9].[0-9]/${version}/" build.sh

e '33;0' "${cmt_msg}"
git add -A && \
git commit -am "${cmt_msg}" -q
e '33;0' "${commit}"
git add -A && git commit -am "${commit}" -q

if [[ $2 = '--release-tag' ]] || [[ $3 = '--release-tag' ]]; then
git tag -s $version -m "${cmt_msg}"
git tag -s $version -m "${commit}"
fi

e '32;0' 'Done!'
21 changes: 21 additions & 0 deletions dist/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2013-present, Widen Enterprises, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit 8c7b727

Please sign in to comment.