diff options
Diffstat (limited to 'pcr/protobuf-java/protobuf-java.patch')
| -rw-r--r-- | pcr/protobuf-java/protobuf-java.patch | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/pcr/protobuf-java/protobuf-java.patch b/pcr/protobuf-java/protobuf-java.patch index 1286223ed..049d44f39 100644 --- a/pcr/protobuf-java/protobuf-java.patch +++ b/pcr/protobuf-java/protobuf-java.patch @@ -1,21 +1,13 @@ -diff -aur protobuf-2.4.1/java/pom.xml protobuf-2.4.1-patched/java/pom.xml ---- protobuf-2.4.1/java/pom.xml 2011-04-30 19:23:04.000000000 +0200 -+++ protobuf-2.4.1-patched/java/pom.xml 2011-05-09 17:58:09.000000000 +0200 -@@ -78,7 +78,7 @@ - <configuration> - <tasks> - <mkdir dir="target/generated-sources" /> -- <exec executable="../src/protoc"> -+ <exec executable="protoc"> - <arg value="--java_out=target/generated-sources" /> - <arg value="--proto_path=../src" /> - <arg value="../src/google/protobuf/descriptor.proto" /> -@@ -96,7 +96,7 @@ - <configuration> - <tasks> - <mkdir dir="target/generated-test-sources" /> -- <exec executable="../src/protoc"> -+ <exec executable="protoc"> - <arg value="--java_out=target/generated-test-sources" /> - <arg value="--proto_path=../src" /> - <arg value="--proto_path=src/test/java" /> +diff --git a/java/pom.xml b/java/pom.xml +index 881473f..e56bd94 100644 +--- a/java/pom.xml ++++ b/java/pom.xml +@@ -29,7 +29,7 @@ + <!-- These are relative to the submodules --> + <protobuf.basedir>${project.basedir}/../..</protobuf.basedir> + <protobuf.source.dir>${protobuf.basedir}/src</protobuf.source.dir> +- <protoc>${protobuf.source.dir}/protoc</protoc> ++ <protoc>protoc</protoc> + <test.proto.dir>src/test/proto</test.proto.dir> + <generated.sources.dir>${project.build.directory}/generated-sources</generated.sources.dir> + <generated.testsources.dir>${project.build.directory}/generated-test-sources</generated.testsources.dir> |