From 2f669cbe75c054851234b7789342a5650ef951a5 Mon Sep 17 00:00:00 2001 From: "kenton@google.com" Date: Tue, 2 Dec 2008 05:59:15 +0000 Subject: * 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. --- generate_descriptor_proto.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'generate_descriptor_proto.sh') 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 .. -- cgit v1.2.3