Check-in [d4dfc708fb]
Overview
SHA1:d4dfc708fb97fd650bd83ec95772c0f51536eec8
Date: 2016-02-19 14:27:55
User: rkeene
Comment:ChromeOS: Added support for building a debugging-enabled Chrome extension
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-02-19
14:29
[a779f950ca] ChromeOS: Ignore debugging binaries (user: rkeene, tags: trunk)
14:27
[d4dfc708fb] ChromeOS: Added support for building a debugging-enabled Chrome extension (user: rkeene, tags: trunk)
14:11
[e5e8b9f32b] ChromeOS: Added the start of a UI (user: rkeene, tags: trunk)
Changes

Modified build/chrome/Makefile from [1d85794fd7] to [a0a70506fb].

     9      9   LIBS        = $(CACKEY_LIBS) $(PCSC_LIBS)
    10     10   CFLAGS      = -Wall -g3 -ggdb3 -I${NACL_SDK_ROOT}/include -I../../pkcs11 -Iinclude/PCSC
    11     11   CXXFLAGS    = $(CFLAGS) -std=gnu++11
    12     12   LDFLAGS     = -g3 -ggdb3
    13     13   
    14     14   CACKEY_DEBUG = 0
    15     15   ifeq (1,$(CACKEY_DEBUG))
    16         -CACKEY_LIBNAME = libcackey_g
           16  +CACKEY_LIBNAME     = libcackey_g
           17  +CACKEY_EXECUTABLES = cackey.pexe cackey.bc
    17     18   else
    18         -CACKEY_LIBNAME = libcackey
           19  +CACKEY_LIBNAME     = libcackey
           20  +CACKEY_EXECUTABLES = cackey.pexe
    19     21   endif
    20     22   
    21     23   PATH += :${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin
    22     24   export PATH
    23     25   
    24     26   ifeq (,${NACL_SDK_ROOT})
    25     27   $(error "Please set NACL_SDK_ROOT")
    26     28   endif
    27     29   export NACL_SDK_ROOT
    28     30   
    29     31   all: cackey.crx
    30     32   
    31         -cackey.crx: cackey.pexe cackey.nmf manifest.json cackey.js google-pcsc.js pin.html pin.js pin-icon.png
           33  +cackey.crx: $(CACKEY_EXECUTABLES) cackey.nmf manifest.json cackey.js google-pcsc.js pin.html pin.js pin-icon.png
    32     34   	rm -f cackey.crx
    33     35   	zip cackey.crx.new $^
    34     36   	mv cackey.crx.new cackey.crx
    35     37   
    36         -cackey.pexe: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a lib/libz.a
    37         -	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cackey.pexe.new cackey-chrome.o cackey-chrome-init.o $(LIBS)
           38  +cackey.bc: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a lib/libz.a
           39  +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cackey.bc.new cackey-chrome.o cackey-chrome-init.o $(LIBS)
           40  +	mv cackey.bc.new cackey.bc
           41  +
           42  +cackey.pexe: cackey.bc
           43  +	cp cackey.bc cackey.pexe.new
    38     44   	$(FINALIZE) cackey.pexe.new
    39     45   	mv cackey.pexe.new cackey.pexe
    40     46   
    41         -cackey.nmf: cackey.pexe
    42         -	${NACL_SDK_ROOT}/tools/create_nmf.py cackey.pexe > cackey.nmf.new
           47  +cackey.nmf: $(CACKEY_EXECUTABLES)
           48  +	${NACL_SDK_ROOT}/tools/create_nmf.py $(CACKEY_EXECUTABLES) > cackey.nmf.new
    43     49   	mv cackey.nmf.new cackey.nmf
    44     50   
    45     51   lib/libcackey.a: build-deps
    46     52   	mkdir -p lib
    47     53   	rm -f lib/libcackey.a
    48     54   	rm -rf workdir-*
    49     55   	+./build-deps
................................................................................
    80     86   	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
    81     87   
    82     88   cackey-chrome.o: cackey-chrome.c cackey-chrome.h
    83     89   cackey-chrome-init.o: cackey-chrome-init.cc cackey-chrome.h include/PCSC/pcsc-nacl.h
    84     90   
    85     91   clean:
    86     92   	rm -f cackey-chrome.o cackey-chrome-init.o
    87         -	rm -f cackey.pexe
           93  +	rm -f cackey.pexe cackey.bc
    88     94   	rm -f cackey.crx cackey.nmf
    89     95   	rm -f test
    90     96   
    91     97   distclean: clean
    92     98   	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a
    93     99   	-rmdir lib
    94    100   	rm -f include/PCSC/pcsc-nacl.h
    95    101   	-rmdir include/PCSC
    96    102   	-rmdir include
    97    103   	rm -f google-pcsc.js
    98    104   	rm -rf workdir-*
    99    105   
   100    106   .PHONY: all clean distclean