From 530fd9afece1c6d214bb1d751750345fc918ee43 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 6 Jan 2014 11:12:28 +0100 Subject: [PATCH 1/6] removed old sjcl git submodule --- .gitmodules | 3 --- Dependencies/sjcl | 1 - 2 files changed, 4 deletions(-) delete mode 160000 Dependencies/sjcl diff --git a/.gitmodules b/.gitmodules index 7ec72a16..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "Dependencies/sjcl"] - path = Dependencies/sjcl - url = git://github.com/bitwiseshiftleft/sjcl.git diff --git a/Dependencies/sjcl b/Dependencies/sjcl deleted file mode 160000 index 1a6c455c..00000000 --- a/Dependencies/sjcl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1a6c455cad62db24d80b3b8ea6fe2def6a440fb9 From 997568ce39b7b80dde33481c8e30cc1c30c3d67d Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 6 Jan 2014 11:12:53 +0100 Subject: [PATCH 2/6] removed empty git submodules file --- .gitmodules | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29b..00000000 From 2985be05e42bdcc9a4f7b44c6dd7f10e83b4fb96 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 6 Jan 2014 11:14:25 +0100 Subject: [PATCH 3/6] remove Makefile since we use grunt for everything now --- Makefile | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index e1646bc2..00000000 --- a/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -default: help - -help: - @echo "update - get latest sources" - @echo "bundle - makes JavaScript download and run faster" - @echo "lint - checks JavaScript files for style issues" - @echo "test - runs JavaScript unit tests" - @echo "example - creates a simple example" - @echo "documentation - generates documentation. Requires jsdoc (3.2) in PATH" - -update: update-me update-deps - -update-me: - @git pull - -update-deps: - @git submodule foreach git pull - -bundle: - @grunt - -lint: - @grunt jshint - -test: - @npm test - -example: - @mkdir -p build - @rm -f build/openpgpjs-0.x.zip - @zip -j build/openpgpjs-0.x.zip resources/example.* resources/openpgp.min.js resources/jquery.min.js - @echo "Have a look at build/openpgpjs-0.x.zip" - -documentation: - @grunt jsdoc From 1165b52b914e4858564826ddc1977b34f787d40f Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 6 Jan 2014 11:21:20 +0100 Subject: [PATCH 4/6] do a full build including uglify in travis --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e4b5c2d5..cf23e6dc 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,8 @@ }, "main": "./src/index.js", "scripts": { - "pretest": "grunt browserify", - "test": "grunt test", - "start": "grunt dev" + "pretest": "grunt", + "test": "grunt test" }, "devDependencies": { "browserify": "~2.35", From d28719a1d83f42ddd25c8c4a2dd58dc67ee42c8c Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 6 Jan 2014 15:27:52 +0100 Subject: [PATCH 5/6] update readme t explain build/releases --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 48bed4fe..44cdf063 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ OpenPGP.js [![Build Status](https://secure.travis-ci.org/openpgpjs/openpgpjs.png [OpenPGP.js](http://openpgpjs.org/) is a Javascript implementation of the OpenPGP protocol. This is defined in [RFC 4880](http://tools.ietf.org/html/rfc4880). # How do I use it? -To build the library, checkout the HEAD of the master branch or download a stable (old) tagged version from [releases](https://github.com/openpgpjs/openpgpjs/releases). +You can download a minified bundle of the library under [releases](https://github.com/openpgpjs/openpgpjs/releases). -Then build the library: +You can also build a current version from the HEAD of master yourself: npm install && grunt -Then take the use the minified file from `resources/openpgp.min.js` and use it in your project. +Then take the minified file from `resources/openpgp.min.js` to use in your project. # I need some help ## Mailing List From c66d2ba2a2affe673454c02d4379c3771d929cb6 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 6 Jan 2014 15:39:14 +0100 Subject: [PATCH 6/6] update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 44cdf063..28bb3e0c 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ OpenPGP.js [![Build Status](https://secure.travis-ci.org/openpgpjs/openpgpjs.png [OpenPGP.js](http://openpgpjs.org/) is a Javascript implementation of the OpenPGP protocol. This is defined in [RFC 4880](http://tools.ietf.org/html/rfc4880). # How do I use it? -You can download a minified bundle of the library under [releases](https://github.com/openpgpjs/openpgpjs/releases). +You can download a prebuilt minified version of the library under [releases](https://github.com/openpgpjs/openpgpjs/releases). -You can also build a current version from the HEAD of master yourself: +You can also build a current version yourself: npm install && grunt -Then take the minified file from `resources/openpgp.min.js` to use in your project. +Then take the resulting file from `resources/openpgp.min.js` to use in your project. # I need some help ## Mailing List