Merge remote-tracking branch 'origin/3.5.x' into master

pull/4131/head
Jisi Liu 7 years ago
commit ec826c5a59
  1. 9
      python/release/wheel/protobuf_optimized_pip.sh
  2. 2
      src/google/protobuf/stubs/io_win32.cc

@ -6,7 +6,7 @@ set -ex
# Print usage and fail.
function usage() {
echo "Usage: protobuf_optimized_pip.sh PROTOBUF_VERSION PYPI_USERNAME PYPI_PASSWORD" >&2
echo "Usage: protobuf_optimized_pip.sh PROTOBUF_VERSION" >&2
exit 1 # Causes caller to exit because we use -e.
}
@ -25,7 +25,7 @@ if [ $0 != ./protobuf_optimized_pip.sh ]; then
exit 1
fi
if [ $# -lt 3 ]; then
if [ $# -lt 1 ]; then
usage
exit 1
fi
@ -63,7 +63,4 @@ do
build_wheel $PYTHON_VERSION
done
/opt/python/cp27-cp27mu/bin/twine upload wheelhouse/* <<!
$PYPI_USERNAME
$PYPI_PASSWORD
!
/opt/python/cp27-cp27mu/bin/twine upload wheelhouse/*

@ -91,7 +91,7 @@ struct CharTraits<wchar_t> {
template <typename char_type>
bool null_or_empty(const char_type* s) {
return s == nullptr || *s == 0;
return s == NULL || *s == 0;
}
// Returns true if the path starts with a drive letter, e.g. "c:".

Loading…
Cancel
Save