diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-17 18:50:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-17 18:50:04 -0700 |
commit | d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e (patch) | |
tree | 6224f98ad30e99dc2d896423853892f2142f16ed /protoc-artifacts/pom.xml | |
parent | 22503a01722939385a7584c3b65f1c43dc5b2ef8 (diff) | |
parent | 8356d270a54e18c21f4feac6f5e2b6f1061dc8d5 (diff) | |
download | protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.gz protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.bz2 protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.zip |
Merge pull request #4924 from xfxyjwf/3.6.x
Cherry-pick master build fixes and kokoro changes to 3.6.x
Diffstat (limited to 'protoc-artifacts/pom.xml')
-rw-r--r-- | protoc-artifacts/pom.xml | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 667a0215..390cd220 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -33,38 +33,9 @@ </connection> </scm> <build> - <extensions> - <extension> - <groupId>kr.motd.maven</groupId> - <artifactId>os-maven-plugin</artifactId> - <version>1.5.0.Final</version> - </extension> - </extensions> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1.1</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>exec</goal> - </goals> - </execution> - </executions> - <configuration> - <executable>bash</executable> - <arguments> - <argument>build-protoc.sh</argument> - <argument>${os.detected.name}</argument> - <argument>${os.detected.arch}</argument> - <argument>protoc</argument> - </arguments> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> <executions> @@ -77,8 +48,38 @@ <configuration> <artifacts> <artifact> - <file>${basedir}/target/protoc.exe</file> - <classifier>${os.detected.name}-${os.detected.arch}</classifier> + <file>${basedir}/target/linux/x86_64/protoc.exe</file> + <classifier>linux-x86_64</classifier> + <type>exe</type> + </artifact> + <artifact> + <file>${basedir}/target/linux/x86_32/protoc.exe</file> + <classifier>linux-x86_32</classifier> + <type>exe</type> + </artifact> + <artifact> + <file>${basedir}/target/windows/x86_64/protoc.exe</file> + <classifier>windows-x86_64</classifier> + <type>exe</type> + </artifact> + <artifact> + <file>${basedir}/target/windows/x86_32/protoc.exe</file> + <classifier>windows-x86_32</classifier> + <type>exe</type> + </artifact> + <artifact> + <file>${basedir}/target/osx/x86_64/protoc.exe</file> + <classifier>osx-x86_64</classifier> + <type>exe</type> + </artifact> + <artifact> + <file>${basedir}/target/osx/x86_32/protoc.exe</file> + <classifier>osx-x86_32</classifier> + <type>exe</type> + </artifact> + <artifact> + <file>${basedir}/target/linux/aarch_64/protoc.exe</file> + <classifier>linux-aarch_64</classifier> <type>exe</type> </artifact> </artifacts> |