NaCl libpcsc

Check-in [ee9e97aeea]
Login
Overview
SHA1:ee9e97aeea349b791bb20c67ae3235ee23beb03d
Date: 2016-04-14 18:35:54
User: rkeene
Comment:Added logging handler to automatically created element
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-04-14
19:13
[a31210a9e4] Typo, extra close paren (user: rkeene, tags: trunk)
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)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

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

37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
		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; }







|







37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
		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) { var logger = new GoogleSmartCard.Logging.getScopedLogger("NaclModule<>"); naclModuleMessageChannel = new GoogleSmartCard.NaclModuleMessageChannel(opt_naclElement, logger)); new GoogleSmartCard.NaclModuleLogMessagesReceiver(naclModuleMessageChannel, logger); }
		' 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; }