Work on getting a working build for 0.8
This commit is contained in:
parent
180d175e54
commit
7e95d3d01d
|
@ -25,8 +25,8 @@ module.exports = function(grunt) {
|
|||
"*/"
|
||||
},
|
||||
minify: {
|
||||
dest: 'converse.min.css',
|
||||
src: ['converse.css']
|
||||
dest: 'css/converse.min.css',
|
||||
src: ['css/converse.css']
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
8
Makefile
8
Makefile
|
@ -11,7 +11,7 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./d
|
|||
# the i18n builder cannot share the environment and doctrees with the others
|
||||
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
|
||||
|
||||
.PHONY: all help clean html epub changes linkcheck gettext po pot po2json merge release css
|
||||
.PHONY: all help clean html epub changes linkcheck gettext po pot po2json merge release css minjs
|
||||
|
||||
all: dev
|
||||
|
||||
|
@ -45,6 +45,12 @@ po2json:
|
|||
########################################################################
|
||||
## Release management
|
||||
|
||||
minjs:
|
||||
./node_modules/requirejs/bin/r.js -o src/build.js && ./node_modules/requirejs/bin/r.js -o src/build-no-locales-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-no-otr.js
|
||||
|
||||
mincss:
|
||||
grunt cssmin
|
||||
|
||||
release:
|
||||
sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ bower.json
|
||||
sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ package.json
|
||||
|
|
11
builds/converse-no-locales-no-otr.min.js
vendored
11
builds/converse-no-locales-no-otr.min.js
vendored
File diff suppressed because one or more lines are too long
11
builds/converse-no-otr.min.js
vendored
11
builds/converse-no-otr.min.js
vendored
File diff suppressed because one or more lines are too long
11
builds/converse.min.js
vendored
11
builds/converse.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -11,7 +11,7 @@
|
|||
<link type="text/css" rel="stylesheet" media="screen" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" />
|
||||
<link type="text/css" rel="stylesheet" media="screen" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" />
|
||||
<link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
|
||||
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
|
||||
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" />
|
||||
<script data-main="main" src="components/requirejs/require.js"></script>
|
||||
|
||||
<script src="../components/jquery/dist/jquery.min.js"></script>
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
"underscore": "components/underscore/underscore",
|
||||
"backbone": "components/backbone/backbone",
|
||||
"backbone.localStorage": "components/backbone.localStorage/backbone.localStorage",
|
||||
"backbone.overview": "components/backbone.overview/backbone.overview",
|
||||
"strophe": "components/strophe/strophe",
|
||||
"strophe.muc": "components/strophe.muc/index",
|
||||
"strophe.roster": "components/strophe.roster/index",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"underscore": "components/underscore/underscore",
|
||||
"backbone": "components/backbone/backbone",
|
||||
"backbone.localStorage": "components/backbone.localStorage/backbone.localStorage",
|
||||
"backbone.overview": "components/backbone.overview/backbone.overview",
|
||||
"strophe": "components/strophe/strophe",
|
||||
"strophe.muc": "components/strophe.muc/index",
|
||||
"strophe.roster": "components/strophe.roster/index",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"underscore": "components/underscore/underscore",
|
||||
"backbone": "components/backbone/backbone",
|
||||
"backbone.localStorage": "components/backbone.localStorage/backbone.localStorage",
|
||||
"backbone.overview": "components/backbone.overview/backbone.overview",
|
||||
"strophe": "components/strophe/strophe",
|
||||
"strophe.muc": "components/strophe.muc/index",
|
||||
"strophe.roster": "components/strophe.roster/index",
|
||||
|
|
Loading…
Reference in New Issue
Block a user