Check-in [d2b0a782d9]
Overview
SHA1:d2b0a782d907a88b01aa3bee700c71f38e23a57d
Date: 2016-04-14 19:42:40
User: rkeene
Comment:Cleanup, more work towards a stable release
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-04-14
19:43
[71c8167cfd] CACKey Chrome release 8 (user: rkeene, tags: trunk)
19:42
[d2b0a782d9] Cleanup, more work towards a stable release (user: rkeene, tags: trunk)
18:16
[357cf7b22f] Upgraded to latest nacl-libpcsc and started using the sightly cleaner interfaces (user: rkeene, tags: trunk)
Changes

Modified build/chrome/Makefile from [44984e905a] to [fd9e0754e3].

    68     68   	mkdir -p lib
    69     69   	rm -f lib/libz.a
    70     70   	cd lib && ln -s ../workdir-*.inst/lib/libz.a .
    71     71   	touch lib/libz.a
    72     72   
    73     73   google-pcsc.js: lib/libcackey.a
    74     74   	rm -f google-pcsc.js google-pcsc.js.new
    75         -	cat workdir-*.inst/js/libpcsc.js > google-pcsc.js.new
           75  +	if [ "$(CACKEY_DEBUG)" = '1' ]; then CACKEY_DEBUG_BOOL='true'; else CACKEY_DEBUG_BOOL='false'; fi; sed 's@goog.define(.goog\.DEBUG., .*);@goog.define('"'"'goog.DEBUG'"'"', '"$${CACKEY_DEBUG_BOOL}"');@' workdir-*.inst/js/libpcsc.js > google-pcsc.js.new
    76     76   	mv google-pcsc.js.new google-pcsc.js
    77     77   
    78     78   include/libpcsc.h: lib/libcackey.a
    79     79   	mkdir -p include
    80     80   	rm -f include/libpcsc.h.new include/libpcsc.h
    81     81   	cd include && ln -s ../workdir-*.inst/include/libpcsc.h libpcsc.h.new
    82     82   	touch include/libpcsc.h.new

Modified build/chrome/build-deps from [630f1897fa] to [7ffe8225b5].

   172    172   
   173    173   # Build the libpcsc we need
   174    174   function buildPCSC() {
   175    175   	local version url pkg sha256 configure_extra
   176    176   	local archive workdir
   177    177   
   178    178   	pkg='nacl-libpcsc'
   179         -	version='a72d1992e9e7d70c885d3b34f9b75317fa8671ef'
          179  +	version='889f3554e9582467ca4e724276a4c1be69cba189'
   180    180   	url="https://chiselapp.com/user/rkeene/repository/nacl-libpcsc/tarball/nacl-libpcsc-${version}.tar.gz?uuid=${version}"
   181    181   	sha256='-'
   182    182   
   183    183   	archive="archive/${pkg}-${version}.tar.gz"
   184    184   	workdir="workdir-${RANDOM}${RANDOM}${RANDOM}${RANDOM}.build"
   185    185   
   186    186   	download "${url}" "${archive}" "${sha256}" || return 1

Modified build/chrome/cackey.js from [3d7abfb5db] to [db44d71906].

   186    186    *
   187    187    * If an error occured, invoke the callback with no arguments.
   188    188    */
   189    189   function cackeyMessageIncoming(messageEvent) {
   190    190   	var nextFunction = null;
   191    191   	var chromeCallback = null;
   192    192   
   193         -		console.log("START MESSAGE");
   194         -		console.log(messageEvent.data);
   195         -		console.log("END MESSAGE");
   196    193   	if (messageEvent.data.target != "cackey") {
   197    194   		return;
   198    195   	}
   199    196   
   200    197   	if (GoogleSmartCard.IS_DEBUG_BUILD) {
   201    198   		console.log("START MESSAGE");
   202    199   		console.log(messageEvent.data);