1. 03 Jun, 2016 2 commits
  2. 02 Jun, 2016 3 commits
  3. 01 Jun, 2016 1 commit
  4. 31 May, 2016 5 commits
  5. 30 May, 2016 2 commits
  6. 28 May, 2016 2 commits
  7. 27 May, 2016 7 commits
  8. 26 May, 2016 4 commits
    • Jon Wall's avatar
      fix expected class checking in GPBSetMessageRepeatedField · e72805ec
      Jon Wall authored
      This is currently checking for the wrong class for enums
      and NSMutableArray fields.
      e72805ec
    • Thomas Van Lenten's avatar
      Merge pull request #1600 from thomasvl/objc_tighter_warnings · 0f27cab4
      Thomas Van Lenten authored
      Add more warnings to for the ObjC runtime build
      0f27cab4
    • Jisi Liu's avatar
      Merge pull request #1586 from davidzchen/python · ed87c1fe
      Jisi Liu authored
      Bazel build: Keep generated sources and Python runtime in the same directory
      ed87c1fe
    • David Z. Chen's avatar
      Bazel build: Keep generated sources and Python runtime in the same directory. · 02cd45ca
      David Z. Chen authored
      Users often encounter a Python import error when trying to build Python
      protos if protobuf is installed locally on the machine. In this case,
      Python ends up looking in the wrong directory when importing files (see
      bazelbuild/bazel#1209 and tensorflow/tensorflow#2021). It seems that the
      problem is caused by Python getting confused when there are Python
      source files that are meant to be part of the same package but are
      in separate directories.
      
      Prior to #1233, the Bazel build setup would copy the Python
      runtime sources and all generated sources for the builtin protos into
      the root directory (assuming that the protobuf tree is vendored in a
      google/protobuf directory).
      
      With #1233, the two sets of sources are kept in their respective
      directories but both `src/` and `python/` are added to the `PYTHONPATH`
      using the new `imports` attribute of the Bazel Python rules. However,
      both the runtime sources and the generated sources are under the same
      package: `google.protobuf`, causing Python to become confused when
      trying to import modules that are in the other directory.
      
      This patch adds a workaround to the Bazel build to add a modified
      version of the original `internal_copied_filegroup` macro to copy the
      `.proto` files under `src/` to `python/` before building the
      `py_proto_library` targets for the builtin protos. This ensures that the
      generated sources for the builtin protos will be in the same directory
      as the corresponding runtime sources.
      
      This patch was tested with the following:
      * All Python tests in protobuf
      * All Python tests in tensorflow
      * All tests in [Skydoc](https://github.com/bazelbuild/skydoc)
      * Importing protobuf as `//google/protobuf`
      * Importing and binding targets under `//external`
      * Importing protobuf as `//third_party/protobuf`
      02cd45ca
  9. 25 May, 2016 2 commits
  10. 24 May, 2016 4 commits
    • Thomas Van Lenten's avatar
      Automated testing tweaks for ObjC · 368a2f4c
      Thomas Van Lenten authored
      - Move the ObjC tests into the list and exclude them on linux, this will change
        where in the order they start, since they are longer, it will have other
        things run in parallel instead of them ending up last and taking the longest.
      - Switch to the Xcode 7.3 image.
      - Drop the use of xctool and stream line things through the full_mac_build.sh
        script. This means we end up with only one build script instead of two.
      - Tweaks to the mac build script:
        - Make iOS Xcode version support explicit
        - Support Debug/Release only building
        - Change the OS X min parallel count to 2 to better deal with VMs.
      - Split the travis ios tests into the two Xcode Configurations as the logs are
        choking travis.
      368a2f4c
    • Thomas Van Lenten's avatar
      Merge pull request #1593 from thomasvl/framework_includes · 5d0c2ee3
      Thomas Van Lenten authored
      Better support for using the proto library from a framework.
      5d0c2ee3
    • Joshua Haberman's avatar
      Merge pull request #1589 from hochhaus/master · 173daf12
      Joshua Haberman authored
      Add js/binary/encoder.js to js_EXTRA_DIST.
      173daf12
    • Thomas Van Lenten's avatar
      Better support for using the proto library from a framework. · 7da023b8
      Thomas Van Lenten authored
      - Add generator constant for the default framework name.
      - Add generator api for making the CPP symbol from the name.
      - Add generator api to see if it is a bundled proto file.
      - Output a CPP conditional and two imports for the core library headers.
      - Add helper for generating the #import for file headers to deal with the
        framework imports.
      - Add a reference from the unittests to a WKT to use that to inspect how
        imports generate.
      - Update the podspec to define the CPP symbol and require pods 1.0 (or later).
      
      Fixes https://github.com/google/protobuf/issues/1457
      7da023b8
  11. 23 May, 2016 2 commits
  12. 21 May, 2016 3 commits
  13. 20 May, 2016 3 commits