From 27f74eed26999001bb5c94fb43863bf4a1d1e36b Mon Sep 17 00:00:00 2001 From: Jakub Jankiewicz Date: Thu, 8 Dec 2016 21:02:47 +0100 Subject: [PATCH] New version --- .npmignore | 1 + Makefile | 2 +- Makefile.in | 47 +++++++++++++++++++ bower.in | 4 +- ...0.1.0.css => jquery.filebrowser-0.2.0.css} | 0 ...n.css => jquery.filebrowser-0.2.0.min.css} | 0 ...r-0.1.0.js => jquery.filebrowser-0.2.0.js} | 0 ...min.js => jquery.filebrowser-0.2.0.min.js} | 0 version | 10 ++++ 9 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 Makefile.in rename css/{jquery.filebrowser-0.1.0.css => jquery.filebrowser-0.2.0.css} (100%) rename css/{jquery.filebrowser-0.1.0.min.css => jquery.filebrowser-0.2.0.min.css} (100%) rename js/{jquery.filebrowser-0.1.0.js => jquery.filebrowser-0.2.0.js} (100%) rename js/{jquery.filebrowser-0.1.0.min.js => jquery.filebrowser-0.2.0.min.js} (100%) create mode 100644 version diff --git a/.npmignore b/.npmignore index caf8f98..6cbed30 100644 --- a/.npmignore +++ b/.npmignore @@ -8,3 +8,4 @@ examples bin css/jquery.filebrowser-*.css js/jquery.filebrowser-*.js +version \ No newline at end of file diff --git a/Makefile b/Makefile index c43caa0..24510fa 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=0.1.0 +VERSION=0.2.0 COMPRESS=uglifyjs SED=sed CP=cp diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..8b16c2d --- /dev/null +++ b/Makefile.in @@ -0,0 +1,47 @@ +VERSION={{VERSION}} +COMPRESS=uglifyjs +SED=sed +CP=cp +RM=rm +CAT=cat +DATE=`date -uR` + + +ALL: Makefile .$(VERSION) js/jquery.filebrowser-$(VERSION).js js/jquery.filebrowser.js js/jquery.filebrowser-$(VERSION).min.js js/jquery.filebrowser.min.js css/jquery.filebrowser-$(VERSION).css css/jquery.filebrowser-$(VERSION).min.css css/jquery.filebrowser.min.css css/jquery.filebrowser.css README.md bower.json package.json + +.$(VERSION): Makefile + touch .$(VERSION) + +bower.json: bower.in .$(VERSION) + $(SED) -e "s/{{VER}}/$(VERSION)/g" bower.in > bower.json + +package.json: package.in .$(VERSION) + $(SED) -e "s/{{VER}}/$(VERSION)/g" package.in > package.json + +js/jquery.filebrowser-$(VERSION).js: js/jquery.filebrowser-src.js .$(VERSION) + $(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s/{{DATE}}/$(DATE)/g" js/jquery.filebrowser-src.js > js/jquery.filebrowser-$(VERSION).js + +js/jquery.filebrowser.js: js/jquery.filebrowser-$(VERSION).js + $(CP) js/jquery.filebrowser-$(VERSION).js js/jquery.filebrowser.js + +js/jquery.filebrowser-$(VERSION).min.js: js/jquery.filebrowser-$(VERSION).js + $(COMPRESS) -o js/jquery.filebrowser-$(VERSION).min.js --comments --mangle -- js/jquery.filebrowser-$(VERSION).js + +js/jquery.filebrowser.min.js: js/jquery.filebrowser-$(VERSION).min.js + $(CP) js/jquery.filebrowser-$(VERSION).min.js js/jquery.filebrowser.min.js + +css/jquery.filebrowser-$(VERSION).css: css/jquery.filebrowser-src.css .$(VERSION) + $(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s/{{DATE}}/$(DATE)/g" css/jquery.filebrowser-src.css > css/jquery.filebrowser-$(VERSION).css + +css/jquery.filebrowser.css: css/jquery.filebrowser-$(VERSION).css .$(VERSION) + $(CP) css/jquery.filebrowser-$(VERSION).css css/jquery.filebrowser.css + +css/jquery.filebrowser.min.css: css/jquery.filebrowser-$(VERSION).min.css + $(CP) css/jquery.filebrowser-$(VERSION).min.css css/jquery.filebrowser.min.css + +css/jquery.filebrowser-$(VERSION).min.css: css/jquery.filebrowser-$(VERSION).css + java -jar bin/yuicompressor-2.4.8.jar css/jquery.filebrowser-$(VERSION).css -o css/jquery.filebrowser-$(VERSION).min.css + $(SED) -i -e 's/0,100%/0%,100%/g' css/jquery.filebrowser-$(VERSION).min.css + +README.md: README.in .$(VERSION) + $(SED) -e "s/{{VER}}/$(VERSION)/g" < README.in > README.md diff --git a/bower.in b/bower.in index 4af48ef..1f53b40 100644 --- a/bower.in +++ b/bower.in @@ -12,11 +12,13 @@ "README.in", "bower.in", "Makefile", + "Makefile.in", ".gitignore", ".npmignore", "package.in", "package.json", - "bin" + "bin", + "version" ], "dependencies": { diff --git a/css/jquery.filebrowser-0.1.0.css b/css/jquery.filebrowser-0.2.0.css similarity index 100% rename from css/jquery.filebrowser-0.1.0.css rename to css/jquery.filebrowser-0.2.0.css diff --git a/css/jquery.filebrowser-0.1.0.min.css b/css/jquery.filebrowser-0.2.0.min.css similarity index 100% rename from css/jquery.filebrowser-0.1.0.min.css rename to css/jquery.filebrowser-0.2.0.min.css diff --git a/js/jquery.filebrowser-0.1.0.js b/js/jquery.filebrowser-0.2.0.js similarity index 100% rename from js/jquery.filebrowser-0.1.0.js rename to js/jquery.filebrowser-0.2.0.js diff --git a/js/jquery.filebrowser-0.1.0.min.js b/js/jquery.filebrowser-0.2.0.min.js similarity index 100% rename from js/jquery.filebrowser-0.1.0.min.js rename to js/jquery.filebrowser-0.2.0.min.js diff --git a/version b/version new file mode 100644 index 0000000..7175751 --- /dev/null +++ b/version @@ -0,0 +1,10 @@ +#!/bin/bash + +VERSION=`grep VERSION= Makefile | sed -e 's/VERSION=\(.*\)/\1/'` +if [ $1 != $VERSION ]; then + sed -e "s/{{VERSION}}/"$1"/" Makefile.in > Makefile + git mv css/jquery.filebrowser-${VERSION}.css css/jquery.filebrowser-${1}.css + git mv css/jquery.filebrowser-${VERSION}.min.css css/jquery.filebrowser-${1}.min.css + git mv js/jquery.filebrowser-${VERSION}.js js/jquery.filebrowser-${1}.js + git mv js/jquery.filebrowser-${VERSION}.min.js js/jquery.filebrowser-${1}.min.js +fi