Check-in [6f34302432]
Overview
SHA1:6f343024327488fa38976b163b460632600cfdd7
Date: 2016-02-26 19:06:11
User: rkeene
Comment:ChromeOS: Renamed files to be more obvious
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:07
[e5eec2292c] ChromeOS: Added missing UI page (user: rkeene, tags: trunk)
19:06
[6f34302432] ChromeOS: Renamed files to be more obvious (user: rkeene, tags: trunk)
18:42
[bf8001bc42] Updated to workaround a bug in Google's PCSC implementation where SCardStatus() requires a reader parameter (user: rkeene, tags: trunk)
Changes

Modified build/chrome/Makefile from [e9b43f227c] to [197b36ef78].

    33     33   all: cackey.zip
    34     34   
    35     35   cackey.zip: $(CACKEY_EXECUTABLES) cackey.nmf manifest.json cackey.js google-pcsc.js pin.html pin.js pin-icon.png icon.png
    36     36   	rm -f cackey.zip
    37     37   	zip cackey.zip.new $^
    38     38   	mv cackey.zip.new cackey.zip
    39     39   
    40         -cackey.bc: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a lib/libz.a
    41         -	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cackey.bc.new cackey-chrome.o cackey-chrome-init.o $(LIBS)
           40  +cackey.bc: cackey-chrome-pkcs11.o cackey-chrome-plugin.o lib/libcackey.a lib/libpcsc.a lib/libz.a
           41  +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cackey.bc.new cackey-chrome-pkcs11.o cackey-chrome-plugin.o $(LIBS)
    42     42   	mv cackey.bc.new cackey.bc
    43     43   
    44     44   cackey.pexe: cackey.bc
    45     45   	cp cackey.bc cackey.pexe.new
    46     46   	$(FINALIZE) cackey.pexe.new
    47     47   	mv cackey.pexe.new cackey.pexe
    48     48   
................................................................................
    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     86   
    87         -test: cackey-chrome.c cackey-chrome-test.c ../../cackey.c Makefile
    88         -	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.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
           87  +test: cackey-chrome-pkcs11.c cackey-chrome-test.c ../../cackey.c Makefile
           88  +	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     89   
    90         -cackey-chrome.o: cackey-chrome.c cackey-chrome.h
    91         -cackey-chrome-init.o: cackey-chrome-init.cc cackey-chrome.h include/PCSC/pcsc-nacl.h
           90  +cackey-chrome-pkcs11.o: cackey-chrome-pkcs11.c cackey-chrome.h
           91  +cackey-chrome-plugin.o: cackey-chrome-plugin.cc cackey-chrome.h include/PCSC/pcsc-nacl.h
    92     92   
    93     93   clean:
    94         -	rm -f cackey-chrome.o cackey-chrome-init.o
           94  +	rm -f cackey-chrome-pkcs11.o cackey-chrome-plugin.o
    95     95   	rm -f cackey.pexe cackey.bc
    96     96   	rm -f cackey.zip cackey.nmf
    97     97   	rm -f test
    98     98   
    99     99   distclean: clean
   100    100   	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a
   101    101   	-rmdir lib

Name change from build/chrome/cackey-chrome.c to build/chrome/cackey-chrome-pkcs11.c.


Name change from build/chrome/cackey-chrome-init.cc to build/chrome/cackey-chrome-plugin.cc.