Overview
| Comment: | Corrected typos |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
a72d1992e9e7d70c885d3b34f9b75317 |
| User & Date: | rkeene on 2016-04-14 18:12:44 |
| Other Links: | manifest | tags |
Context
|
2016-04-14
| ||
| 18:28 | Updated to remove logging messages that could not be parsed check-in: 1708fe41fa user: rkeene tags: trunk | |
| 18:12 | Corrected typos check-in: a72d1992e9 user: rkeene tags: trunk | |
| 18:10 | Added a small patch to the NaCl backend to allow it to initialize from an element directly check-in: b60bdc45b5 user: rkeene tags: trunk | |
Changes
Modified build/assemble-source-from-google.sh from [a42241ccf7] to [fe422da5f3].
| ︙ | ︙ | |||
33 34 35 36 37 38 39 |
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
| | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 |
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"
|
| ︙ | ︙ | |||
141 142 143 144 145 146 147 |
third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-request-handler.js
third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-backend.js
)
cat "${files[@]}" | sed '
/^ *goog\.require(/ d;
s@^goog\.DEPENDENCIES_ENABLED = .*$@goog.DEPENDENCIES_ENABLED = false;@
' > "${instdir}/libpcsc.js.new" || exit 1
| | | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 |
third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-request-handler.js
third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-backend.js
)
cat "${files[@]}" | sed '
/^ *goog\.require(/ d;
s@^goog\.DEPENDENCIES_ENABLED = .*$@goog.DEPENDENCIES_ENABLED = false;@
' > "${instdir}/libpcsc.js.new" || exit 1
mv "${instdir}/libpcsc.js.new" "${instdir}/libpcsc.js" || exit 1
# Assemble all the files into a single tree
files=(
common/cpp/src/google_smart_card_common/formatting.h
common/cpp/src/google_smart_card_common/logging/function_call_tracer.cc
common/cpp/src/google_smart_card_common/logging/function_call_tracer.h
common/cpp/src/google_smart_card_common/logging/hex_dumping.cc
|
| ︙ | ︙ |