NaCl libpcsc

Check-in [179983e00b]
Login

Check-in [179983e00b]

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

Modified Makefile from [d47cbcccc4] to [ffd75a63dc]. 





1
2
3
4
5
6
7





# Setup cross-compiler toolchain
## Set path to include the tools
PATH := ${PATH}:${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin
export PATH

## Set variables needed by projects
HOST_CC      := $(shell which "$${CC:-cc}")

>
>
>
>








1
2
3
4
5
6
7
8
9
10
11

# Prefix
PREFIX = /usr/local
prefix = $(PREFIX)

# Setup cross-compiler toolchain
## Set path to include the tools
PATH := ${PATH}:${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin
export PATH

## Set variables needed by projects
HOST_CC      := $(shell which "$${CC:-cc}")
︙︙
30
31
32
33
34
35
36
37
38
39
40
41
42
43









44
45
46
47
48
49
50

	cp pcsc/libpcsc.a libpcsc.a.new
	mv libpcsc.a.new libpcsc.a

libpcsc.h: pcsc/libpcsc.h
	cp pcsc/libpcsc.h libpcsc.h.new
	mv libpcsc.h.new libpcsc.h

libpcsc.js: pcsc/libpcsc.js
	cp pcsc/libpcsc.js libpcsc.js.new
	mv libpcsc.js.new libpcsc.js

boost: build-boost
	rm -rf boost
	./build-boost










clean:
	$(MAKE) -C pcsc clean
	rm -f libpcsc.a libpcsc.a.new
	rm -f libpcsc.h libpcsc.h.new
	rm -f libpcsc.js libpcsc.js.new
	rm -rf workdir-*








|
|





>
>
>
>
>
>
>
>
>








34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63

	cp pcsc/libpcsc.a libpcsc.a.new
	mv libpcsc.a.new libpcsc.a

libpcsc.h: pcsc/libpcsc.h
	cp pcsc/libpcsc.h libpcsc.h.new
	mv libpcsc.h.new libpcsc.h

libpcsc.js: pcsc/src/libpcsc.js
	cp pcsc/src/libpcsc.js libpcsc.js.new
	mv libpcsc.js.new libpcsc.js

boost: build-boost
	rm -rf boost
	./build-boost

install: libpcsc.a libpcsc.h libpcsc.js $(shell find pcsc/src/include -type f)
	mkdir -p "$(DESTDIR)$(prefix)/lib"
	mkdir -p "$(DESTDIR)$(prefix)/include"
	mkdir -p "$(DESTDIR)$(prefix)/js"
	cp libpcsc.a "$(DESTDIR)$(prefix)/lib"
	cp libpcsc.h "$(DESTDIR)$(prefix)/include"
	cp libpcsc.js "$(DESTDIR)$(prefix)/js"
	cp -r pcsc/src/include/PCSC "$(DESTDIR)$(prefix)/include"

clean:
	$(MAKE) -C pcsc clean
	rm -f libpcsc.a libpcsc.a.new
	rm -f libpcsc.h libpcsc.h.new
	rm -f libpcsc.js libpcsc.js.new
	rm -rf workdir-*
︙︙

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

︙︙
33
34
35
36
37
38
39
40
41
42

43
44
45
46
47
48
49

		cd "${workdir}" || exit 1

		# Copy out PC/SC headers for later use
		mkdir -p "${instdir}/include/PCSC" || exit 1
		cp third_party/pcsc-lite/src-*/src/PCSC/*.h "${instdir}/include/PCSC" || exit 1

		# Copy out JavaScript files for later use
		mkdir "${instdir}/js" || exit 1
#		cp common-utils/*.js "${instdir}/js" || exit 1
#		cp third_party/pcsc-lite/client-side/*.js "${instdir}/js" || exit 1


		# Assemble all the files into a single tree
		files=(
			common/cpp/src/google_smart_card_common/formatting.h
			common/cpp/src/google_smart_card_common/logging/function_call_tracer.cc
			common/cpp/src/google_smart_card_common/logging/function_call_tracer.h
			common/cpp/src/google_smart_card_common/logging/hex_dumping.cc








<


>








33
34
35
36
37
38
39

40
41
42
43
44
45
46
47
48
49

		cd "${workdir}" || exit 1

		# Copy out PC/SC headers for later use
		mkdir -p "${instdir}/include/PCSC" || exit 1
		cp third_party/pcsc-lite/src-*/src/PCSC/*.h "${instdir}/include/PCSC" || exit 1

		# Copy out JavaScript files for later use

#		cp common-utils/*.js "${instdir}/js" || exit 1
#		cp third_party/pcsc-lite/client-side/*.js "${instdir}/js" || exit 1
		touch "${instdir}/libpcsc.js"

		# Assemble all the files into a single tree
		files=(
			common/cpp/src/google_smart_card_common/formatting.h
			common/cpp/src/google_smart_card_common/logging/function_call_tracer.cc
			common/cpp/src/google_smart_card_common/logging/function_call_tracer.h
			common/cpp/src/google_smart_card_common/logging/hex_dumping.cc
︙︙