Overview
| Comment: | ChromeOS: Dynamically compute the package version |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
d1316cdccd9778175e16e688c5f7c62e |
| User & Date: | rkeene on 2016-02-26 19:20:41 |
| Other Links: | manifest | tags |
Context
|
2016-02-26
| ||
| 19:50 | ChromeOS: Accept the "Enter" key to click OK at the PIN prompt check-in: b8c2cad6d9 user: rkeene tags: trunk | |
| 19:20 | ChromeOS: Dynamically compute the package version check-in: d1316cdccd user: rkeene tags: trunk | |
| 19:09 | ChromeOS: Updated ignores check-in: a67fe2704f user: rkeene tags: trunk | |
Changes
Modified .fossil-settings/ignore-glob from [23575f48d5] to [4b8f0a7c61].
| ︙ | ︙ | |||
29 30 31 32 33 34 35 | build/chrome/cackey-chrome-plugin.o build/chrome/cackey.pexe build/chrome/cackey.bc build/chrome/cackey.nmf build/chrome/cackey.zip build/chrome/test build/chrome/google-pcsc.js | > | 29 30 31 32 33 34 35 36 | build/chrome/cackey-chrome-plugin.o build/chrome/cackey.pexe build/chrome/cackey.bc build/chrome/cackey.nmf build/chrome/cackey.zip build/chrome/test build/chrome/google-pcsc.js build/chrome/manifest.json |
Modified build/chrome/Makefile from [6036bc5b25] to [477397fafe].
| ︙ | ︙ | |||
46 47 48 49 50 51 52 |
$(FINALIZE) cackey.pexe.new
mv cackey.pexe.new cackey.pexe
cackey.nmf: $(CACKEY_EXECUTABLES)
${NACL_SDK_ROOT}/tools/create_nmf.py $(CACKEY_EXECUTABLES) > cackey.nmf.new
mv cackey.nmf.new cackey.nmf
| | | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 |
$(FINALIZE) cackey.pexe.new
mv cackey.pexe.new cackey.pexe
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 ../../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
touch lib/libcackey.a
|
| ︙ | ︙ | |||
79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | include/PCSC/pcsc-nacl.h: lib/libcackey.a 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 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 cackey-chrome-plugin.o: cackey-chrome-plugin.cc cackey-chrome.h include/PCSC/pcsc-nacl.h 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 test distclean: clean rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a -rmdir lib rm -f include/PCSC/pcsc-nacl.h -rmdir include/PCSC -rmdir include rm -f google-pcsc.js rm -rf workdir-* .PHONY: all clean distclean | > > > > > > | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 |
include/PCSC/pcsc-nacl.h: lib/libcackey.a
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
cackey-chrome-plugin.o: cackey-chrome-plugin.cc cackey-chrome.h include/PCSC/pcsc-nacl.h
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
rm -f include/PCSC/pcsc-nacl.h
-rmdir include/PCSC
-rmdir include
rm -f google-pcsc.js
rm -rf workdir-*
.PHONY: all clean distclean
|
Renamed and modified build/chrome/manifest.json [51ce9eb49b] to build/chrome/manifest.json.in [ecbd5422e2].
1 2 3 |
{
"manifest_version": 2,
"name": "CACKey",
| | | 1 2 3 4 5 6 7 8 9 10 11 |
{
"manifest_version": 2,
"name": "CACKey",
"version": "@PACKAGE_VERSION@.2",
"icons": {
"128": "icon.png"
},
"app": {
"background": {
|
| ︙ | ︙ |