From b8e3198ba8e9fe98cdda85e90f517b94d4452b5e Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 5 Nov 2014 23:46:04 +0400 Subject: [PATCH] version 1.1.8 --- ChangeLog.txt | 2 +- build | 2 +- .../ext/menu_tools/generate_settings_menu.js | 6 ++ package.json | 10 +-- tool/release.sh | 74 +++++++++++++++++++ 5 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 tool/release.sh diff --git a/ChangeLog.txt b/ChangeLog.txt index 86399b5e..cad1e517 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,4 @@ - +2014.11.08 Version 1.1.8 * API Changes - `editor.commands.commandKeyBinding` now contains direct map from keys to commands instead of grouping them by hashid diff --git a/build b/build index 17c02716..7fafd126 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 17c02716b7f116c7920f8ef07c8c2b0e20d77ec0 +Subproject commit 7fafd126c2d26bdec899274eb5c2080c7a081d47 diff --git a/lib/ace/ext/menu_tools/generate_settings_menu.js b/lib/ace/ext/menu_tools/generate_settings_menu.js index 16d3a76c..9ae09da5 100644 --- a/lib/ace/ext/menu_tools/generate_settings_menu.js +++ b/lib/ace/ext/menu_tools/generate_settings_menu.js @@ -91,6 +91,12 @@ module.exports.generateSettingsMenu = function generateSettingsMenu (editor) { elements.forEach(function(element) { topmenu.appendChild(element); }); + + var el = topmenu.appendChild(document.createElement('div')); + var version = "1.1.7"; + el.style.padding = "1em"; + el.textContent = "Ace version " + version; + return topmenu; } /** diff --git a/package.json b/package.json index e7a166dc..a4a9f50b 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "ace", "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE", - "version": "1.1.7", - "homepage" : "http://github.com/ajaxorg/ace", + "version": "1.1.8", + "homepage": "http://github.com/ajaxorg/ace", "engines": {"node": ">= 0.6.0"}, "author": "Fabian Jakobs ", "main": "lib/ace", - "repository" : { - "type" : "git", - "url" : "http://github.com/ajaxorg/ace.git" + "repository": { + "type": "git", + "url": "http://github.com/ajaxorg/ace.git" }, "dependencies": { "mime": "1.2.x" diff --git a/tool/release.sh b/tool/release.sh new file mode 100644 index 00000000..961b53e9 --- /dev/null +++ b/tool/release.sh @@ -0,0 +1,74 @@ +pause() { + while true; do + read -p "$1 " yn + case $yn in + [Yy]* ) break;; + [Nn]* ) exit;; + * ) echo "Please answer yes or no.";; + esac + done +} + +read -p "enter version number for the build " VERSION_NUM + +cd `dirname $0`/.. +SOURCE=`pwd` + +node -e " + var fs = require('fs'); + var version = '$VERSION_NUM'; + function replaceVersion(str) { + return str.replace(/(['\"]?version['\"]?\s*[:=]\s*['\"])[\\d.\\w\\-](['\"])/, function(_, m1, m2) { + return m1 + version + m2; + }); + } + function update(path, replace) { + var pkg = fs.readFileSync(path, 'utf8'); + pkg = (replace || replaceVersion)(pkg); + fs.writeFileSync(path, pkg, 'utf8'); + } + update('package.json'); + update('build/package.json'); + update('./lib/ace/ext/menu_tools/generate_settings_menu.js'); + update('ChangeLog.txt', function(str) { + var date='"`date +%Y.%m.%d`"'; + return date + ' Version ' + version + '\n' + str.replace(/^\d+.*/, '').replace(/^\n/, ''); + }); +" + + + +node Makefile.dryice.js full +cd build +git add . +git commit --all -m "package `date +%d.%m.%y`" + + +echo "build task completed." +pause "continue creating the tag for v$VERSION_NUM [y/n]" +if [[ ${VERSION_NUM} != *"-"* ]]; then + git tag "v"$VERSION_NUM +fi + +pause "continue pushing to github? [y/n]" + +git push --progress --tags "origin" HEAD:gh-pages HEAD:master + +echo "build repository updated" + +pause "continue update ace repo? [y/n]" +cd .. + + +echo "new commit added" +pause "continue creating the tag for v$VERSION_NUM [y/n]" +if [[ ${VERSION_NUM} != *"-"* ]]; then + git tag "v"$VERSION_NUM +fi + +pause "continue pushing to github? [y/n]" + +echo git push --progress --tags "origin" HEAD:gh-pages HEAD:master +echo "All done!" +pause "May I go now? [y/n]" +