diff --git a/.gitattributes b/.gitattributes index b5a039fa..bcf9e4d9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ resources/openpgp*.js binary +resources/keyring*.js binary diff --git a/Makefile b/Makefile index 5ebab6b8..fc8a6605 100644 --- a/Makefile +++ b/Makefile @@ -37,10 +37,10 @@ bundle: @browserify -x openpgp -r ./src/keyring/:keyring > ./resources/keyring_nodebug.js bundle-test: - @browserify -d -r ./test/test-all.js:unittests > ./test/lib/test-bundle.js + @browserify -d -x openpgp -x keyring -r ./test/test-all.js:unittests > ./test/lib/test-bundle.js bundle-ci-test: - @browserify -d -x openpgp -r ./test/ci-tests-all.js:ci-tests > ./test/lib/ci-tests-bundle.js + @browserify -d -x openpgp -x keyring -r ./test/ci-tests-all.js:ci-tests > ./test/lib/ci-tests-bundle.js test: @echo to be implemented diff --git a/resources/keyring.js b/resources/keyring.js index ee2b7234..7302cbb1 100644 --- a/resources/keyring.js +++ b/resources/keyring.js @@ -1,10 +1,10 @@ -require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o - OpenPGP.js testpage