NaCl libpcsc

Check-in [a72d1992e9]
Login
Overview
SHA1:a72d1992e9e7d70c885d3b34f9b75317fa8671ef
Date: 2016-04-14 18:12:44
User: rkeene
Comment:Corrected typos
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: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)
18:10
[b60bdc45b5] Added a small patch to the NaCl backend to allow it to initialize from an element directly (user: rkeene, tags: trunk)
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

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

    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     39   		# Update one of the JavaScript files to provide a better interface
    40         -		sed '
           40  +		sed -i '
    41     41   			s@naclModuleMessageChannel.*opt_serverAppId@&, opt_naclElement@
    42     42   			/opt_naclElement/ a \
    43     43   if (naclModuleMessageChannel == null && opt_naclElement != null) { naclModuleMessageChannel = new GoogleSmartCard.NaclModuleMessageChannel(opt_naclElement, GoogleSmartCard.Logging.getScopedLogger("NaclModule<>")); }
    44     44   		' third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-backend.js
    45     45   
    46     46   		# Copy out JavaScript files for later use
    47     47   		rm -f "${instdir}/libpcsc.js"
................................................................................
   141    141   			third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-request-handler.js
   142    142   			third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-backend.js
   143    143   		)
   144    144   		cat "${files[@]}" | sed '
   145    145   			/^ *goog\.require(/ d;
   146    146   			s@^goog\.DEPENDENCIES_ENABLED = .*$@goog.DEPENDENCIES_ENABLED = false;@
   147    147   		' > "${instdir}/libpcsc.js.new" || exit 1
   148         -		mv "${instdir}/libpcsc.js.new" "${isntdir}/libpcsc.js" || exit 1
          148  +		mv "${instdir}/libpcsc.js.new" "${instdir}/libpcsc.js" || exit 1
   149    149   
   150    150   		# Assemble all the files into a single tree
   151    151   		files=(
   152    152   			common/cpp/src/google_smart_card_common/formatting.h
   153    153   			common/cpp/src/google_smart_card_common/logging/function_call_tracer.cc
   154    154   			common/cpp/src/google_smart_card_common/logging/function_call_tracer.h
   155    155   			common/cpp/src/google_smart_card_common/logging/hex_dumping.cc