1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
Description: Using Debian-packaged protoc compiler
Author: Pierre Gruet <pgt@debian.org>
Forwarded: not-needed
Last-Update: 2020-08-24
--- a/goby-io/pom.xml
+++ b/goby-io/pom.xml
@@ -101,53 +101,6 @@
<skip>true</skip>
</gitDescribe>
</configuration>
- </plugin><!-- copy protoc binary into build directory -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>${maven-dependency-plugin.version}</version>
- <executions>
- <execution>
- <id>copy-protoc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protoc</artifactId>
- <version>${protobuf.version}</version>
- <classifier>${os.detected.classifier}</classifier>
- <type>exe</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-protoc-python</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protoc</artifactId>
- <version>${protobuf.python.version}</version>
- <classifier>${os.detected.classifier}</classifier>
- <type>exe</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
</plugin>
<!-- compile proto buffer files using copied protoc binary -->
<plugin>
@@ -161,8 +114,6 @@
<configuration>
<target>
- <chmod file="${project.build.directory}/protoc-${protobuf.version}-${os.detected.classifier}.exe"
- perm="ugo+rx"/>
<mkdir dir="${protobuf.output.directory}"/>
<path id="protobuf.input.filepaths.path">
<fileset dir="${protobuf.input.directory}">
@@ -171,7 +122,7 @@
</path>
<pathconvert pathsep=" " property="protobuf.input.filepaths"
refid="protobuf.input.filepaths.path"/>
- <exec executable="${project.build.directory}/protoc-${protobuf.version}-${os.detected.classifier}.exe"
+ <exec executable="/usr/bin/protoc"
failonerror="true">
<arg value="-I"/>
<arg value="${protobuf.input.directory}"/>
@@ -192,8 +143,6 @@
<configuration>
<target>
- <chmod file="${project.build.directory}/protoc-${protobuf.python.version}-${os.detected.classifier}.exe"
- perm="ugo+rx"/>
<mkdir dir="${protobuf.output.directory}"/>
<path id="protobuf.input.filepaths.path">
<fileset dir="${protobuf.input.directory}">
@@ -202,7 +151,7 @@
</path>
<pathconvert pathsep=" " property="protobuf.input.filepaths"
refid="protobuf.input.filepaths.path"/>
- <exec executable="${project.build.directory}/protoc-${protobuf.python.version}-${os.detected.classifier}.exe"
+ <exec executable="/usr/bin/protoc"
failonerror="true">
<arg value="-I"/>
<arg value="${protobuf.input.directory}"/>
@@ -225,8 +174,6 @@
<configuration>
<target>
- <chmod file="${project.build.directory}/protoc-${protobuf.python.version}-${os.detected.classifier}.exe"
- perm="ugo+rx"/>
<mkdir dir="${protobuf.output.directory}"/>
<path id="protobuf.input.filepaths.path">
<fileset dir="${protobuf.input.directory}">
@@ -235,7 +182,7 @@
</path>
<pathconvert pathsep=" " property="protobuf.input.filepaths"
refid="protobuf.input.filepaths.path"/>
- <exec executable="${project.build.directory}/protoc-${protobuf.python.version}-${os.detected.classifier}.exe"
+ <exec executable="/usr/bin/protoc"
failonerror="true">
<arg value="-I"/>
<arg value="${protobuf.input.directory}"/>
@@ -488,4 +435,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
|
