Ver código fonte

Don't include vim temp-files in release tarball

and bump post-release version number
JC Brand 5 anos atrás
pai
commit
e866248227
4 arquivos alterados com 13 adições e 7 exclusões
  1. 5 0
      Makefile
  2. 6 6
      RELEASE.md
  3. 1 1
      src/headless/converse-core.js
  4. 1 0
      webpack.html

+ 5 - 0
Makefile

@@ -62,6 +62,10 @@ serve: stamp-npm
 serve_bg: stamp-npm
 	$(HTTPSERVE) -p $(HTTPSERVE_PORT) -c-1 -s &
 
+.PHONY: notemps
+notemps:
+	find -name "*~" -exec rm {} \;
+
 ########################################################################
 ## Translation machinery
 
@@ -98,6 +102,7 @@ release:
 	make pot
 	make po
 	make build
+	make notemps
 	npm pack
 
 .PHONY: postrelease

+ 6 - 6
RELEASE.md

@@ -1,18 +1,18 @@
 # Release checklist
 
 1. Run `make check` to check that all tests pass.
-2. Run `make release VERSION=6.0.0`
+2. Run `make release VERSION=6.0.1`
 3. Do a `git diff` to check if things look sane.
 4. Do a quick manual test with the `dist` files (via `index.html`)
-5. `git commit -am "Release 6.0.0"`
-6. `git tag -s v6.0.0 -m "Release 6.0.0"`
+5. `git commit -am "Release 6.0.1"`
+6. `git tag -s v6.0.1 -m "Release 6.0.1"`
 7. Run `git push && git push --tags`
 8. Update https://conversejs.org
     * `cd /home/conversejs/converse.js`
-    * `git clone --branch v6.0.0 git@github.com:conversejs/converse.js.git 6.0.0`
-    * `cd 6.0.0 && ASSET_PATH=https://cdn.conversejs.org/6.0.0/dist/ make dist`
+    * `git clone --branch v6.0.1 git@github.com:conversejs/converse.js.git 6.0.1`
+    * `cd 6.0.1 && ASSET_PATH=https://cdn.conversejs.org/6.0.1/dist/ make dist`
     * `cd .. && git pull && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist`
 9. Update release page on Github
 11. Run `npm publish && cd src/headless/ && npm publish`
 12. Update the repository on weblate
-13. Decide on next release number and run `make postrelease VERSION=6.0.1`
+13. Decide on next release number and run `make postrelease VERSION=6.0.2`

+ 1 - 1
src/headless/converse-core.js

@@ -112,7 +112,7 @@ const _converse = {
     'promises': {}
 }
 
-_converse.VERSION_NAME = "v6.0.0";
+_converse.VERSION_NAME = "v6.0.1dev";
 
 Object.assign(_converse, Backbone.Events);
 

+ 1 - 0
webpack.html

@@ -18,6 +18,7 @@
         }
     });
     converse.initialize({
+        show_send_button: true,
         auto_away: 300,
         auto_register_muc_nickname: true,
         loglevel: 'debug',