Overview
| Comment: | Cleanup, more work towards a stable release |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | d2b0a782d907a88b01aa3bee700c71f38e23a57d |
| User & Date: | rkeene on 2016-04-14 19:42:40 |
| Other Links: | manifest | tags |
Context
|
2016-04-14
| ||
| 19:43 | CACKey Chrome release 8 check-in: 71c8167cfd user: rkeene tags: trunk | |
| 19:42 | Cleanup, more work towards a stable release check-in: d2b0a782d9 user: rkeene tags: trunk | |
| 18:16 | Upgraded to latest nacl-libpcsc and started using the sightly cleaner interfaces check-in: 357cf7b22f user: rkeene tags: trunk | |
Changes
Modified build/chrome/Makefile from [44984e905a] to [fd9e0754e3].
68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
mkdir -p lib
rm -f lib/libz.a
cd lib && ln -s ../workdir-*.inst/lib/libz.a .
touch lib/libz.a
google-pcsc.js: lib/libcackey.a
rm -f google-pcsc.js google-pcsc.js.new
cat workdir-*.inst/js/libpcsc.js > google-pcsc.js.new
mv google-pcsc.js.new google-pcsc.js
include/libpcsc.h: lib/libcackey.a
mkdir -p include
rm -f include/libpcsc.h.new include/libpcsc.h
cd include && ln -s ../workdir-*.inst/include/libpcsc.h libpcsc.h.new
touch include/libpcsc.h.new
|
| |
68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
mkdir -p lib
rm -f lib/libz.a
cd lib && ln -s ../workdir-*.inst/lib/libz.a .
touch lib/libz.a
google-pcsc.js: lib/libcackey.a
rm -f google-pcsc.js google-pcsc.js.new
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
mv google-pcsc.js.new google-pcsc.js
include/libpcsc.h: lib/libcackey.a
mkdir -p include
rm -f include/libpcsc.h.new include/libpcsc.h
cd include && ln -s ../workdir-*.inst/include/libpcsc.h libpcsc.h.new
touch include/libpcsc.h.new
|
Modified build/chrome/build-deps from [630f1897fa] to [7ffe8225b5].
172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 |
# Build the libpcsc we need
function buildPCSC() {
local version url pkg sha256 configure_extra
local archive workdir
pkg='nacl-libpcsc'
version='a72d1992e9e7d70c885d3b34f9b75317fa8671ef'
url="https://chiselapp.com/user/rkeene/repository/nacl-libpcsc/tarball/nacl-libpcsc-${version}.tar.gz?uuid=${version}"
sha256='-'
archive="archive/${pkg}-${version}.tar.gz"
workdir="workdir-${RANDOM}${RANDOM}${RANDOM}${RANDOM}.build"
download "${url}" "${archive}" "${sha256}" || return 1
|
| |
172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 |
# Build the libpcsc we need
function buildPCSC() {
local version url pkg sha256 configure_extra
local archive workdir
pkg='nacl-libpcsc'
version='889f3554e9582467ca4e724276a4c1be69cba189'
url="https://chiselapp.com/user/rkeene/repository/nacl-libpcsc/tarball/nacl-libpcsc-${version}.tar.gz?uuid=${version}"
sha256='-'
archive="archive/${pkg}-${version}.tar.gz"
workdir="workdir-${RANDOM}${RANDOM}${RANDOM}${RANDOM}.build"
download "${url}" "${archive}" "${sha256}" || return 1
|
Modified build/chrome/cackey.js from [3d7abfb5db] to [db44d71906].
186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 |
*
* If an error occured, invoke the callback with no arguments.
*/
function cackeyMessageIncoming(messageEvent) {
var nextFunction = null;
var chromeCallback = null;
console.log("START MESSAGE");
console.log(messageEvent.data);
console.log("END MESSAGE");
if (messageEvent.data.target != "cackey") {
return;
}
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("START MESSAGE");
console.log(messageEvent.data);
|
< < < |
186 187 188 189 190 191 192 193 194 195 196 197 198 199 |
*
* If an error occured, invoke the callback with no arguments.
*/
function cackeyMessageIncoming(messageEvent) {
var nextFunction = null;
var chromeCallback = null;
if (messageEvent.data.target != "cackey") {
return;
}
if (GoogleSmartCard.IS_DEBUG_BUILD) {
console.log("START MESSAGE");
console.log(messageEvent.data);
|