NaCl libpcsc

Check-in [179983e00b]
Login
Overview
SHA1:179983e00b5ed8a8fead5d2f9bb35f5304716041
Date: 2016-04-14 02:45:53
User: rkeene
Comment:Added an install target and an empty javascript file for now
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-04-14
07:21
[7ce79d6ede] Try to assemble a working JavaScript library (user: rkeene, tags: trunk)
02:45
[179983e00b] Added an install target and an empty javascript file for now (user: rkeene, tags: trunk)
02:28
[3dc3a3b281] More work towards something possibly usable one day (user: rkeene, tags: trunk)
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified Makefile from [d47cbcccc4] to [ffd75a63dc].

            1  +# Prefix
            2  +PREFIX = /usr/local
            3  +prefix = $(PREFIX)
            4  +
     1      5   # Setup cross-compiler toolchain
     2      6   ## Set path to include the tools
     3      7   PATH := ${PATH}:${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin
     4      8   export PATH
     5      9   
     6     10   ## Set variables needed by projects
     7     11   HOST_CC      := $(shell which "$${CC:-cc}")
................................................................................
    30     34   	cp pcsc/libpcsc.a libpcsc.a.new
    31     35   	mv libpcsc.a.new libpcsc.a
    32     36   
    33     37   libpcsc.h: pcsc/libpcsc.h
    34     38   	cp pcsc/libpcsc.h libpcsc.h.new
    35     39   	mv libpcsc.h.new libpcsc.h
    36     40   
    37         -libpcsc.js: pcsc/libpcsc.js
    38         -	cp pcsc/libpcsc.js libpcsc.js.new
           41  +libpcsc.js: pcsc/src/libpcsc.js
           42  +	cp pcsc/src/libpcsc.js libpcsc.js.new
    39     43   	mv libpcsc.js.new libpcsc.js
    40     44   
    41     45   boost: build-boost
    42     46   	rm -rf boost
    43     47   	./build-boost
           48  +
           49  +install: libpcsc.a libpcsc.h libpcsc.js $(shell find pcsc/src/include -type f)
           50  +	mkdir -p "$(DESTDIR)$(prefix)/lib"
           51  +	mkdir -p "$(DESTDIR)$(prefix)/include"
           52  +	mkdir -p "$(DESTDIR)$(prefix)/js"
           53  +	cp libpcsc.a "$(DESTDIR)$(prefix)/lib"
           54  +	cp libpcsc.h "$(DESTDIR)$(prefix)/include"
           55  +	cp libpcsc.js "$(DESTDIR)$(prefix)/js"
           56  +	cp -r pcsc/src/include/PCSC "$(DESTDIR)$(prefix)/include"
    44     57   
    45     58   clean:
    46     59   	$(MAKE) -C pcsc clean
    47     60   	rm -f libpcsc.a libpcsc.a.new
    48     61   	rm -f libpcsc.h libpcsc.h.new
    49     62   	rm -f libpcsc.js libpcsc.js.new
    50     63   	rm -rf workdir-*

Modified build/assemble-source-from-google.sh from [e4d6006867] to [482768fcd7].

    33     33   		cd "${workdir}" || exit 1
    34     34   
    35     35   		# Copy out PC/SC headers for later use
    36     36   		mkdir -p "${instdir}/include/PCSC" || exit 1
    37     37   		cp third_party/pcsc-lite/src-*/src/PCSC/*.h "${instdir}/include/PCSC" || exit 1
    38     38   
    39     39   		# Copy out JavaScript files for later use
    40         -		mkdir "${instdir}/js" || exit 1
    41     40   #		cp common-utils/*.js "${instdir}/js" || exit 1
    42     41   #		cp third_party/pcsc-lite/client-side/*.js "${instdir}/js" || exit 1
           42  +		touch "${instdir}/libpcsc.js"
    43     43   
    44     44   		# Assemble all the files into a single tree
    45     45   		files=(
    46     46   			common/cpp/src/google_smart_card_common/formatting.h
    47     47   			common/cpp/src/google_smart_card_common/logging/function_call_tracer.cc
    48     48   			common/cpp/src/google_smart_card_common/logging/function_call_tracer.h
    49     49   			common/cpp/src/google_smart_card_common/logging/hex_dumping.cc