NaCl libpcsc

Check-in [1708fe41fa]
Login
Overview
SHA1:1708fe41fa20e30e928cc9ba48d44c55e995da7e
Date: 2016-04-14 18:28:18
User: rkeene
Comment:Updated to remove logging messages that could not be parsed
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-04-14
18:35
[ee9e97aeea] Added logging handler to automatically created element (user: rkeene, tags: trunk)
18:28
[1708fe41fa] Updated to remove logging messages that could not be parsed (user: rkeene, tags: trunk)
18:12
[a72d1992e9] Corrected typos (user: rkeene, tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified build/assemble-source-from-google.sh from [fe422da5f3] to [00f4c4f3b3].

32
33
34
35
36
37
38
39

40
41
42
43
44







45
46
47
48
49
50
51
	(
		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

		# Update one of the JavaScript files to provide a better interface

		sed -i '
			s@naclModuleMessageChannel.*opt_serverAppId@&, opt_naclElement@
			/opt_naclElement/ a \
if (naclModuleMessageChannel == null && opt_naclElement != null) { naclModuleMessageChannel = new GoogleSmartCard.NaclModuleMessageChannel(opt_naclElement, GoogleSmartCard.Logging.getScopedLogger("NaclModule<>")); }
		' third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-backend.js








		# Copy out JavaScript files for later use
		rm -f "${instdir}/libpcsc.js"
		files=(
			third_party/closure-library/src-20160208/closure/goog/base.js
			third_party/closure-library/src-20160208/closure/goog/math/integer.js
			common/js/src/fixed-size-integer.js







|
>





>
>
>
>
>
>
>







32
33
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
	(
		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

		# Update some of the JavaScript files to provide a better interface
		## Create a message channel if one is not present
		sed -i '
			s@naclModuleMessageChannel.*opt_serverAppId@&, opt_naclElement@
			/opt_naclElement/ a \
if (naclModuleMessageChannel == null && opt_naclElement != null) { naclModuleMessageChannel = new GoogleSmartCard.NaclModuleMessageChannel(opt_naclElement, GoogleSmartCard.Logging.getScopedLogger("NaclModule<>")); }
		' third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-backend.js

		## Do not log errors parsing messages -- not all of them are intended for you !
		sed -i '
			/if (!typedMessage)/,/}$/ d
			/parseTypedMessage/ a \
if (!typedMessage) { return; }
		' common/js/src/nacl-module/nacl-module-messaging-channel.js

		# Copy out JavaScript files for later use
		rm -f "${instdir}/libpcsc.js"
		files=(
			third_party/closure-library/src-20160208/closure/goog/base.js
			third_party/closure-library/src-20160208/closure/goog/math/integer.js
			common/js/src/fixed-size-integer.js