NaCl libpcsc

Check-in [a31210a9e4]
Login

Check-in [a31210a9e4]

Overview
Comment:Typo, extra close paren
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a31210a9e4859dfb6449aa2bd7e9a5b5195f2b34
User & Date: rkeene on 2016-04-14 19:13:09
Other Links: manifest | tags
Context
2016-04-14
19:26
Updated to always return a logger check-in: 889f3554e9 user: rkeene tags: trunk
19:13
Typo, extra close paren check-in: a31210a9e4 user: rkeene tags: trunk
18:35
Added logging handler to automatically created element check-in: ee9e97aeea user: rkeene tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified build/assemble-source-from-google.sh from [34125b3144] to [0ef73ed36e].

︙︙
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; }








|








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; }
︙︙