diff --git a/VERSION.md b/VERSION.md deleted file mode 100755 index 10fa79aa..00000000 --- a/VERSION.md +++ /dev/null @@ -1 +0,0 @@ -3.4.8 \ No newline at end of file diff --git a/build_tools/VERSION.md b/build_tools/VERSION.md new file mode 100755 index 00000000..e0940d40 --- /dev/null +++ b/build_tools/VERSION.md @@ -0,0 +1 @@ +3.4.9 \ No newline at end of file diff --git a/auth.php b/build_tools/auth.php similarity index 100% rename from auth.php rename to build_tools/auth.php diff --git a/build_tools/build.js b/build_tools/build.js new file mode 100755 index 00000000..81d5d1b7 --- /dev/null +++ b/build_tools/build.js @@ -0,0 +1,47 @@ + +var fs = require('fs'); +var copydir = require('copy-dir'); + +var filename, file; +var version = fs.readFileSync("build_tools/VERSION.md", "utf8"); +var build = Math.floor(Date.now() / 1000); +console.log('Building version '+version+' ('+build+')'); + +copydir('src/assets', 'mopidy_iris/static/assets', function(error){ + + if (error){ + console.log('Build failed, could not copy assets', error); + return false; + + } else { + console.log('Copied assets'); + + filename = "mopidy_iris/static/index.html"; + fs.createReadStream("src/index.html").pipe(fs.createWriteStream(filename)); + console.log('Copied HTML'); + + filename = "mopidy_iris/static/index.html"; + file = fs.readFileSync(filename, "utf8"); + file = file.replace("VERSION_HERE", version); + file = file.replace("BUILD_HERE", build); + fs.writeFileSync(filename, file, 'utf8'); + console.log('Setting version in HTML'); + + console.log('Setting version in Python'); + filename = "mopidy_iris/__init__.py"; + file = fs.readFileSync(filename, "utf8"); + file = file.replace(/(?:__version__\ \=\ \')(?:.*)'/, "__version__ = '"+version+"'"); + fs.writeFileSync(filename, file, 'utf8'); + + console.log('Setting version in NPM'); + filename = "package.json"; + file = fs.readFileSync(filename, "utf8"); + file = file.replace(/(?:\"version\"\:\ \")(?:.*)"/, '"version": "'+version+'"'); + fs.writeFileSync(filename, file, 'utf8'); + + console.log('Done!'); + return true; + } +}); + +return false; diff --git a/build.sh b/build_tools/build.sh similarity index 100% rename from build.sh rename to build_tools/build.sh diff --git a/release.sh b/build_tools/release.sh similarity index 100% rename from release.sh rename to build_tools/release.sh diff --git a/mopidy_iris/__init__.py b/mopidy_iris/__init__.py index 8bacd3fb..7dcc54bd 100755 --- a/mopidy_iris/__init__.py +++ b/mopidy_iris/__init__.py @@ -13,7 +13,7 @@ from core import IrisCore from raven import Client logger = logging.getLogger(__name__) -__version__ = '3.4.8' +__version__ = '3.4.9' ## # Core extension class diff --git a/package.json b/package.json index 2bca604e..37d8a345 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mopidy-iris", - "version": "3.4.8", + "version": "3.4.9", "description": "Mopidy HTTP interface", "repository": "https://github.com/jaedb/iris", "author": "James Barnsley ", @@ -10,40 +10,41 @@ }, "main": "app.js", "dependencies": { - "babel-core": "^6.25.0", - "babel-loader": "^7.1.1", + "babel-core": "^6.26.0", + "babel-loader": "^7.1.2", "babel-preset-es2015": "^6.22.0", "babel-preset-react": "^6.22.0", "babel-preset-stage-0": "^6.24.1", "babel-preset-stage-2": "^6.22.0", - "css-loader": "0.28.4", + "copy-dir": "^0.3.0", + "css-loader": "^0.28.7", "expose-loader": "0.7.3", "extract-text-webpack-plugin": "3.0.0", "file-loader": "^0.11.2", - "flux": "^3.1.2", - "jquery": "3.1.1", + "flux": "^3.1.3", + "jquery": "^3.2.1", "mopidy": "^0.5.0", - "node-sass": "^4.5.0", - "react": "15.6.1", - "react-dom": "15.6.1", + "node-sass": "^4.5.3", + "react": "^15.6.2", + "react-dom": "^15.6.2", "react-fontawesome": "*", - "react-ga": "2.1.2", - "react-redux": "5.0.5", - "react-router": "^3.0.5", + "react-ga": "^2.3.4", + "react-lazyload": "2.2.7", + "react-redux": "^5.0.6", + "react-router": "^3.2.0", "redux": "3.7.2", "redux-devtools": "3.4.0", "redux-thunk": "2.2.0", - "sass-loader": "^6.0.2", + "sass-loader": "^6.0.6", "style-loader": "^0.13.2", - "url-loader": "^0.5.8", - "webpack": "^3.5.1", - "webpack-strip": "0.1.0", - "react-lazyload": "2.2.7" + "url-loader": "^0.5.9", + "webpack": "^3.6.0", + "webpack-strip": "0.1.0" }, "scripts": { - "build": "./build.sh", - "dev": "./build.sh && NODE_ENV=development webpack --watch", - "prod": "./build.sh && NODE_ENV=development webpack && NODE_ENV=production webpack --watch", - "release": "./build.sh && NODE_ENV=production webpack && NODE_ENV=development webpack && python setup.py sdist upload -r pypi && ./release.sh" + "build": "node build_tools/build.js", + "dev": "node build_tools/build.js && NODE_ENV=development webpack --watch", + "prod": "node build_tools/build.js && NODE_ENV=development webpack && NODE_ENV=production webpack --watch", + "release": "node build_tools/build.js && NODE_ENV=production webpack && NODE_ENV=development webpack && python setup.py sdist upload -r pypi && build_tools/release.sh" } }