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 Side-by-Side Diffs Ignore Whitespace Patch

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

    32     32   	(
    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         -		# Update one of the JavaScript files to provide a better interface
           39  +		# Update some of the JavaScript files to provide a better interface
           40  +		## Create a message channel if one is not present
    40     41   		sed -i '
    41     42   			s@naclModuleMessageChannel.*opt_serverAppId@&, opt_naclElement@
    42     43   			/opt_naclElement/ a \
    43     44   if (naclModuleMessageChannel == null && opt_naclElement != null) { naclModuleMessageChannel = new GoogleSmartCard.NaclModuleMessageChannel(opt_naclElement, GoogleSmartCard.Logging.getScopedLogger("NaclModule<>")); }
    44     45   		' third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-backend.js
           46  +
           47  +		## Do not log errors parsing messages -- not all of them are intended for you !
           48  +		sed -i '
           49  +			/if (!typedMessage)/,/}$/ d
           50  +			/parseTypedMessage/ a \
           51  +if (!typedMessage) { return; }
           52  +		' common/js/src/nacl-module/nacl-module-messaging-channel.js
    45     53   
    46     54   		# Copy out JavaScript files for later use
    47     55   		rm -f "${instdir}/libpcsc.js"
    48     56   		files=(
    49     57   			third_party/closure-library/src-20160208/closure/goog/base.js
    50     58   			third_party/closure-library/src-20160208/closure/goog/math/integer.js
    51     59   			common/js/src/fixed-size-integer.js