Index: .fossil-settings/ignore-glob ================================================================== --- .fossil-settings/ignore-glob +++ .fossil-settings/ignore-glob @@ -31,5 +31,6 @@ build/chrome/cackey.bc build/chrome/cackey.nmf build/chrome/cackey.zip build/chrome/test build/chrome/google-pcsc.js +build/chrome/manifest.json Index: build/chrome/Makefile ================================================================== --- build/chrome/Makefile +++ build/chrome/Makefile @@ -48,11 +48,11 @@ cackey.nmf: $(CACKEY_EXECUTABLES) ${NACL_SDK_ROOT}/tools/create_nmf.py $(CACKEY_EXECUTABLES) > cackey.nmf.new mv cackey.nmf.new cackey.nmf -lib/libcackey.a: build-deps +lib/libcackey.a: build-deps ../../cackey.c archive/smart-card-client-c-example-app-sources.zip mkdir -p lib rm -f lib/libcackey.a rm -rf workdir-* +./build-deps cd lib && ln -s ../workdir-*.inst/lib/$(CACKEY_LIBNAME).a libcackey.a @@ -81,10 +81,15 @@ mkdir -p include/PCSC rm -f include/PCSC/pcsc-nacl.h.new include/PCSC/pcsc-nacl.h cd include/PCSC && ln -s ../../workdir-*.inst/include/PCSC/pcsc-nacl.h pcsc-nacl.h.new touch include/PCSC/pcsc-nacl.h.new mv include/PCSC/pcsc-nacl.h.new include/PCSC/pcsc-nacl.h + +manifest.json: manifest.json.in ../../configure.ac + rm -f manifest.json.new + sed 's/@PACKAGE_VERSION@/$(shell sed '/^AC_INIT/ {s@.*, @@;s@[^0-9\.].@@g;p};d' ../../configure.ac)/g' manifest.json.in > manifest.json.new + mv manifest.json.new manifest.json test: cackey-chrome-pkcs11.c cackey-chrome-test.c ../../cackey.c Makefile gcc -g3 -ggdb3 -Wall -I. -I../../pkcs11 -I/opt/appfs/core.appfs.rkeene.org/zlib/platform/latest/include -I/opt/appfs/rkeene.org/pcsc-lite/platform/latest/include/PCSC -DHAVE_WINTYPES_H=1 -DHAVE_PCSCLITE_H=1 -DHAVE_WINSCARD_H=1 -DHAVE_STDINT_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_PTHREAD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_STDIO_H=1 -DHAVE_ZLIB_H -DHAVE_LIBZ -DCACKEY_DEBUG=1 -o test cackey-chrome-pkcs11.c cackey-chrome-test.c ../../cackey.c -L/opt/appfs/core.appfs.rkeene.org/zlib/platform/latest/lib -lz -L/opt/appfs/rkeene.org/pcsc-lite/platform/latest/lib -lpcsclite -L/opt/appfs/core.appfs.rkeene.org/glibc/platform/latest/lib -lc -lpthread -Wl,-R,/opt/appfs/core.appfs.rkeene.org/zlib/platform/latest/lib -Wl,-R,/opt/appfs/rkeene.org/pcsc-lite/platform/latest/lib -Wl,-R,/opt/appfs/core.appfs.rkeene.org/glibc/platform/latest/lib -Wl,-dynamic-linker,/opt/appfs/core.appfs.rkeene.org/glibc/platform/latest/lib/ld-linux-x86-64.so.2 cackey-chrome-pkcs11.o: cackey-chrome-pkcs11.c cackey-chrome.h @@ -92,10 +97,11 @@ clean: rm -f cackey-chrome-pkcs11.o cackey-chrome-plugin.o rm -f cackey.pexe cackey.bc rm -f cackey.zip cackey.nmf + rm -f manifest.json manifest.json.new rm -f test distclean: clean rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a -rmdir lib DELETED build/chrome/manifest.json Index: build/chrome/manifest.json ================================================================== --- build/chrome/manifest.json +++ build/chrome/manifest.json @@ -1,24 +0,0 @@ -{ - "manifest_version": 2, - "name": "CACKey", - "version": "0.7.5.1", - - "icons": { - "128": "icon.png" - }, - - "app": { - "background": { - "scripts": [ - "google-pcsc.js", - "cackey.js" - ], - "persistent": false - } - }, - - "permissions": [ - "certificateProvider", - "alwaysOnTopWindows" - ] -} ADDED build/chrome/manifest.json.in Index: build/chrome/manifest.json.in ================================================================== --- build/chrome/manifest.json.in +++ build/chrome/manifest.json.in @@ -0,0 +1,24 @@ +{ + "manifest_version": 2, + "name": "CACKey", + "version": "@PACKAGE_VERSION@.2", + + "icons": { + "128": "icon.png" + }, + + "app": { + "background": { + "scripts": [ + "google-pcsc.js", + "cackey.js" + ], + "persistent": false + } + }, + + "permissions": [ + "certificateProvider", + "alwaysOnTopWindows" + ] +}