From ec0b3b17894228f25718d607b459bd608feacffb Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sat, 16 Aug 2014 13:21:28 +0200
Subject: [PATCH 1/5] Back to develop.
---
CHANGELOG.md | 5 +++++
package.json | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 490dffb4..e92462ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
**h5ai** uses [semantic versioning](http://semver.org/).
+## develop branch
+
+* ...
+
+
## v0.26.0 - *2014-08-16*
* removes True Type fonts
diff --git a/package.json b/package.json
index ebcfdce8..30c3ef00 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "h5ai",
"version": "0.26.0",
- "develop": false,
+ "develop": true,
"description": "a modern HTTP web server index",
"homepage": "http://larsjung.de/h5ai/",
"bugs": "https://github.com/lrsjng/h5ai/issues",
From dbdb4e01fffc3ebcd547c2ee521d390727037bc6 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sat, 16 Aug 2014 13:35:03 +0200
Subject: [PATCH 2/5] Fix comment.
---
makefile.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/makefile.js b/makefile.js
index 34a0c968..b5bf7545 100644
--- a/makefile.js
+++ b/makefile.js
@@ -85,7 +85,7 @@ module.exports = function (make) {
make.target('build', ['check-version'], 'build all updated files').sync(function () {
- var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.url + ' */';
+ var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.homepage + ' */';
$(src + ': _h5ai/client/js/*.js')
.newerThan(mapSrc, $(src + ': _h5ai/client/js/**'))
From 91bce0abb49e1a20f1eb63f9ff48abaea0007c4c Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sat, 16 Aug 2014 13:52:45 +0200
Subject: [PATCH 3/5] Update build process.
---
makefile.js | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/makefile.js b/makefile.js
index b5bf7545..43291c6a 100644
--- a/makefile.js
+++ b/makefile.js
@@ -21,19 +21,6 @@ module.exports = function (make) {
make.defaults('build');
- make.before(function () {
-
- var moment = make.moment();
-
- make.env = {
- pkg: pkg,
- stamp: moment.format('YYYY-MM-DD HH:mm:ss')
- };
-
- $.info({ method: 'before', message: pkg.version + ' ' + make.env.stamp });
- });
-
-
make.target('check-version', [], 'add git info to dev builds').async(function (done, fail) {
if (!pkg.develop) {
@@ -85,29 +72,32 @@ module.exports = function (make) {
make.target('build', ['check-version'], 'build all updated files').sync(function () {
- var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.homepage + ' */';
+ var env = {pkg: pkg};
+ var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.homepage + ' */\n';
$(src + ': _h5ai/client/js/*.js')
.newerThan(mapSrc, $(src + ': _h5ai/client/js/**'))
.includify()
- .uglifyjs({header: header})
+ .uglifyjs()
+ .wrap(header)
.WRITE(mapSrc);
$(src + ': _h5ai/client/css/*.less')
.newerThan(mapSrc, $(src + ': _h5ai/client/css/**'))
.less()
- .cssmin({header: header})
+ .cssmin()
+ .wrap(header)
.WRITE(mapSrc);
$(src + ': **/*.jade')
.newerThan(mapSrc)
- .handlebars(make.env)
+ .handlebars(env)
.jade()
.WRITE(mapSrc);
$(src + ': **, ! _h5ai/client/js/**, ! _h5ai/client/css/**, ! **/*.jade')
.newerThan(mapSrc)
- .handlebars(make.env)
+ .handlebars(env)
.WRITE(mapSrc);
$(src + ': _h5ai/client/css/fonts/**')
@@ -122,27 +112,32 @@ module.exports = function (make) {
make.target('build-uncompressed', ['check-version'], 'build all updated files without compression').sync(function () {
+ var env = {pkg: pkg};
+ var header = '/* ' + pkg.name + ' ' + pkg.version + ' - ' + pkg.homepage + ' */\n';
+
$(src + ': _h5ai/client/js/*.js')
.newerThan(mapSrc, $(src + ': _h5ai/client/js/**'))
.includify()
// .uglifyjs()
+ .wrap(header)
.WRITE(mapSrc);
$(src + ': _h5ai/client/css/*.less')
.newerThan(mapSrc, $(src + ': _h5ai/client/css/**'))
.less()
// .cssmin()
+ .wrap(header)
.WRITE(mapSrc);
$(src + ': **/*.jade')
.newerThan(mapSrc)
- .handlebars(make.env)
+ .handlebars(env)
.jade()
.WRITE(mapSrc);
$(src + ': **, ! _h5ai/client/js/**, ! _h5ai/client/css/**, ! **/*.jade')
.newerThan(mapSrc)
- .handlebars(make.env)
+ .handlebars(env)
.WRITE(mapSrc);
$(src + ': _h5ai/client/css/fonts/**')
From a17d31eee9496b54473c4f55fd52a4f51925cde6 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sun, 17 Aug 2014 00:40:57 +0200
Subject: [PATCH 4/5] Fix links.
---
CHANGELOG.md | 2 +-
src/_h5ai/conf/options.json | 2 +-
src/_h5ai/conf/types.json | 2 +-
src/_h5ai/index.html.jade | 4 ++--
src/_h5ai/server/php/inc/page.php.jade | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e92462ea..78de9cd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
## develop branch
-* ...
+* fixes links
## v0.26.0 - *2014-08-16*
diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json
index 484c1b55..ea181c42 100644
--- a/src/_h5ai/conf/options.json
+++ b/src/_h5ai/conf/options.json
@@ -1,6 +1,6 @@
/*
{{pkg.name}} {{pkg.version}}
-{{pkg.url}}
+{{pkg.homepage}}
Options
*/
diff --git a/src/_h5ai/conf/types.json b/src/_h5ai/conf/types.json
index 97603f38..914eeb7f 100644
--- a/src/_h5ai/conf/types.json
+++ b/src/_h5ai/conf/types.json
@@ -1,6 +1,6 @@
/*
{{pkg.name}} {{pkg.version}}
-{{pkg.url}}
+{{pkg.homepage}}
File types mapped to file extensions
*/
diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade
index 101f7d23..072a9aa3 100644
--- a/src/_h5ai/index.html.jade
+++ b/src/_h5ai/index.html.jade
@@ -19,7 +19,7 @@ html.no-js.browser( lang="en" )
body#h5ai-info
h1
- a( href="{{pkg.url}}" ) {{pkg.name}}
+ a( href="{{pkg.homepage}}" ) {{pkg.name}}
div#support
| show your love and support for h5ai with a small donation
@@ -38,6 +38,6 @@ html.no-js.browser( lang="en" )
a( href="http://browsehappy.com" ) modern browsers
| ! ⚡
span.right
- a( href="{{pkg.url}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
+ a( href="{{pkg.homepage}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
| powered by {{pkg.name}} {{pkg.version}}
span.center
diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade
index 71b0bee5..8841b8a5 100644
--- a/src/_h5ai/server/php/inc/page.php.jade
+++ b/src/_h5ai/server/php/inc/page.php.jade
@@ -13,8 +13,8 @@ html.no-js.browser( lang="en" )
head
meta( charset="utf-8" )
meta( http-equiv="X-UA-Compatible", content="IE=edge" )
- title index · powered by {{pkg.name}} {{pkg.version}} ({{pkg.url}})
- meta( name="description", content="index - powered by {{pkg.name}} {{pkg.version}} ({{pkg.url}})" )
+ title index · powered by {{pkg.name}} {{pkg.version}} ({{pkg.homepage}})
+ meta( name="description", content="index - powered by {{pkg.name}} {{pkg.version}} ({{pkg.homepage}})" )
meta( name="viewport", content="width=device-width, initial-scale=1" )
link( rel="shortcut icon", href!="#{app_href}client/images/favicon/favicon-16-32.ico" )
link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/favicon/favicon-152.png" )
@@ -35,7 +35,7 @@ html.no-js.browser( lang="en" )
a( href="http://browsehappy.com" ) modern browsers
| ! ⚡
span.right
- a( href="{{pkg.url}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
+ a( href="{{pkg.homepage}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
| powered by {{pkg.name}} {{pkg.version}}
span.center
From a79034ebc861313668ab503863ee38491ff5bb94 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sun, 17 Aug 2014 00:44:23 +0200
Subject: [PATCH 5/5] Prepare release.
---
CHANGELOG.md | 2 +-
package.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78de9cd9..33d618fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
**h5ai** uses [semantic versioning](http://semver.org/).
-## develop branch
+## v0.26.1 - *2014-08-17*
* fixes links
diff --git a/package.json b/package.json
index 30c3ef00..c1e404ee 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "h5ai",
- "version": "0.26.0",
- "develop": true,
+ "version": "0.26.1",
+ "develop": false,
"description": "a modern HTTP web server index",
"homepage": "http://larsjung.de/h5ai/",
"bugs": "https://github.com/lrsjng/h5ai/issues",