Check-in [d1316cdccd]
Overview
SHA1:d1316cdccd9778175e16e688c5f7c62e983cec84
Date: 2016-02-26 19:20:41
User: rkeene
Comment:ChromeOS: Dynamically compute the package version
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-02-26
19:50
[b8c2cad6d9] ChromeOS: Accept the "Enter" key to click OK at the PIN prompt (user: rkeene, tags: trunk)
19:20
[d1316cdccd] ChromeOS: Dynamically compute the package version (user: rkeene, tags: trunk)
19:09
[a67fe2704f] ChromeOS: Updated ignores (user: rkeene, tags: trunk)
Changes

Modified .fossil-settings/ignore-glob from [23575f48d5] to [4b8f0a7c61].

    29     29   build/chrome/cackey-chrome-plugin.o
    30     30   build/chrome/cackey.pexe
    31     31   build/chrome/cackey.bc
    32     32   build/chrome/cackey.nmf
    33     33   build/chrome/cackey.zip
    34     34   build/chrome/test
    35     35   build/chrome/google-pcsc.js
           36  +build/chrome/manifest.json

Modified build/chrome/Makefile from [6036bc5b25] to [477397fafe].

    46     46   	$(FINALIZE) cackey.pexe.new
    47     47   	mv cackey.pexe.new cackey.pexe
    48     48   
    49     49   cackey.nmf: $(CACKEY_EXECUTABLES)
    50     50   	${NACL_SDK_ROOT}/tools/create_nmf.py $(CACKEY_EXECUTABLES) > cackey.nmf.new
    51     51   	mv cackey.nmf.new cackey.nmf
    52     52   
    53         -lib/libcackey.a: build-deps
           53  +lib/libcackey.a: build-deps ../../cackey.c archive/smart-card-client-c-example-app-sources.zip
    54     54   	mkdir -p lib
    55     55   	rm -f lib/libcackey.a
    56     56   	rm -rf workdir-*
    57     57   	+./build-deps
    58     58   	cd lib && ln -s ../workdir-*.inst/lib/$(CACKEY_LIBNAME).a libcackey.a
    59     59   	touch lib/libcackey.a
    60     60   
................................................................................
    79     79   
    80     80   include/PCSC/pcsc-nacl.h: lib/libcackey.a
    81     81   	mkdir -p include/PCSC
    82     82   	rm -f include/PCSC/pcsc-nacl.h.new include/PCSC/pcsc-nacl.h
    83     83   	cd include/PCSC && ln -s ../../workdir-*.inst/include/PCSC/pcsc-nacl.h pcsc-nacl.h.new
    84     84   	touch include/PCSC/pcsc-nacl.h.new
    85     85   	mv include/PCSC/pcsc-nacl.h.new include/PCSC/pcsc-nacl.h
           86  +
           87  +manifest.json: manifest.json.in ../../configure.ac
           88  +	rm -f manifest.json.new
           89  +	sed 's/@PACKAGE_VERSION@/$(shell sed '/^AC_INIT/ {s@.*, @@;s@[^0-9\.].@@g;p};d' ../../configure.ac)/g' manifest.json.in > manifest.json.new
           90  +	mv manifest.json.new manifest.json
    86     91   
    87     92   test: cackey-chrome-pkcs11.c cackey-chrome-test.c ../../cackey.c Makefile
    88     93   	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
    89     94   
    90     95   cackey-chrome-pkcs11.o: cackey-chrome-pkcs11.c cackey-chrome.h
    91     96   cackey-chrome-plugin.o: cackey-chrome-plugin.cc cackey-chrome.h include/PCSC/pcsc-nacl.h
    92     97   
    93     98   clean:
    94     99   	rm -f cackey-chrome-pkcs11.o cackey-chrome-plugin.o
    95    100   	rm -f cackey.pexe cackey.bc
    96    101   	rm -f cackey.zip cackey.nmf
          102  +	rm -f manifest.json manifest.json.new
    97    103   	rm -f test
    98    104   
    99    105   distclean: clean
   100    106   	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a
   101    107   	-rmdir lib
   102    108   	rm -f include/PCSC/pcsc-nacl.h
   103    109   	-rmdir include/PCSC
   104    110   	-rmdir include
   105    111   	rm -f google-pcsc.js
   106    112   	rm -rf workdir-*
   107    113   
   108    114   .PHONY: all clean distclean

Modified build/chrome/manifest.json.in from [51ce9eb49b] to [ecbd5422e2].

     1      1   {
     2      2   	"manifest_version": 2,
     3      3   	"name": "CACKey",
     4         -	"version": "0.7.5.1",
            4  +	"version": "@PACKAGE_VERSION@.2",
     5      5   
     6      6   	"icons": {
     7      7   		"128": "icon.png"
     8      8   	},
     9      9   
    10     10   	"app": {
    11     11   		"background": {