diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-12-02 05:59:15 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-12-02 05:59:15 +0000 |
| commit | 2f669cbe75c054851234b7789342a5650ef951a5 (patch) | |
| tree | 942580b700e524a01ee01276af4f09c270676197 /generate_descriptor_proto.sh | |
| parent | eb241fadf22bd9cafa3c2b2e91a914a12df07993 (diff) | |
| download | protobuf-2f669cbe75c054851234b7789342a5650ef951a5.tar.gz protobuf-2f669cbe75c054851234b7789342a5650ef951a5.tar.bz2 protobuf-2f669cbe75c054851234b7789342a5650ef951a5.zip | |
* Avoid using pushd/popd in generate_descriptor_proto.sh because they are
bash-only features, and /bin/sh is not a symlink to bash on all systems.
* If an input file is a Windows absolute path (e.g. "C:\foo\bar.proto") and
the import path only contains "." (or contains "." but does not contain
the file), protoc incorrectly thought that the file was under ".", because
it thought that the path was relative (since it didn't start with a slash).
This has been fixed.
Diffstat (limited to 'generate_descriptor_proto.sh')
| -rwxr-xr-x | generate_descriptor_proto.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generate_descriptor_proto.sh b/generate_descriptor_proto.sh index 5587db0c..548b2e8f 100755 --- a/generate_descriptor_proto.sh +++ b/generate_descriptor_proto.sh @@ -22,6 +22,6 @@ __EOF__ exit 1 fi -pushd src +cd src make protoc && ./protoc --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:. google/protobuf/descriptor.proto -popd +cd .. |