Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix binary permissions. #132

Merged
merged 3 commits into from
Nov 26, 2018
Merged

Fix binary permissions. #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98af6b0
Fix binary permissions.
paulthomson Nov 25, 2018
8845943
Add license headers.
paulthomson Nov 26, 2018
15ea7c8
Merge branch 'master' into fix_binary_permissions
hevrard Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
289 changes: 107 additions & 182 deletions assembly-binaries/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ limitations under the License.

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
<groupId>com.graphicsfuzz</groupId>
<artifactId>zip-helper</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>run-ant</id>
Expand Down Expand Up @@ -282,198 +289,116 @@ limitations under the License.
<targetfiles path="${touched-file}"/>
<sequential>
<delete file="${assembly-zip}" dir="${assembly-dir}"/>
<zip destfile="${assembly-zip}" compress="false">
<zipfileset src="${shaders-zip}" prefix="shaders"/>

<java classname="com.graphicsfuzz.zip.ZipFromZip">
<arg value="${assembly-zip}"/>

<arg value="${shaders-zip}"/>
<arg value="(.*)"/>
<arg value="shaders/$1"/>

<!-- build-angle -->
<mappedresources>
<zipfileset
src="${github.paulthomson:build-angle:zip:Linux_x64_Release}"
includes="bin/*,lib/*"
/>
<compositemapper>
<globmapper from="bin/*" to="bin/Linux/*"/>
<globmapper from="lib/*" to="bin/Linux/angle/*"/>
</compositemapper>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.paulthomson:build-angle:zip:Mac_x64_Release}"
includes="bin/*,lib/*"
/>
<compositemapper>
<globmapper from="bin/*" to="bin/Mac/*"/>
<globmapper from="lib/*" to="bin/Mac/angle/*"/>
</compositemapper>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.paulthomson:build-angle:zip:Windows_x64_Release}"
includes="bin/*,lib/*"
/>
<compositemapper>
<globmapper from="bin/*" to="bin/Windows/*"/>
<globmapper from="lib/*" to="bin/Windows/angle/*"/>
</compositemapper>
</mappedresources>
<arg value="${github.paulthomson:build-angle:zip:Linux_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Linux/$1"/>
<arg value="${github.paulthomson:build-angle:zip:Linux_x64_Release}"/>
<arg value="lib/(.+)"/>
<arg value="bin/Linux/angle/$1"/>

<arg value="${github.paulthomson:build-angle:zip:Mac_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Mac/$1"/>
<arg value="${github.paulthomson:build-angle:zip:Mac_x64_Release}"/>
<arg value="lib/(.+)"/>
<arg value="bin/Mac/angle/$1"/>

<arg value="${github.paulthomson:build-angle:zip:Windows_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Windows/$1"/>
<arg value="${github.paulthomson:build-angle:zip:Windows_x64_Release}"/>
<arg value="lib/(.+)"/>
<arg value="bin/Windows/angle/$1"/>

<!-- build-swiftshader -->
<mappedresources>
<zipfileset
src="${github.paulthomson:build-swiftshader:zip:Linux_x64_Release}"
includes="bin/*,lib/*"
/>
<compositemapper>
<globmapper from="bin/*" to="bin/Linux/*"/>
<globmapper from="lib/*" to="bin/Linux/swiftshader/*"/>
</compositemapper>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.paulthomson:build-swiftshader:zip:Mac_x64_Release}"
includes="bin/*,lib/*"
/>
<compositemapper>
<globmapper from="bin/*" to="bin/Mac/*"/>
<globmapper from="lib/*" to="bin/Mac/swiftshader/*"/>
</compositemapper>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.paulthomson:build-swiftshader:zip:Windows_x64_Release}"
includes="bin/*,lib/*"
/>
<compositemapper>
<globmapper from="bin/*" to="bin/Windows/*"/>
<globmapper from="lib/*" to="bin/Windows/swiftshader/*"/>
</compositemapper>
</mappedresources>
<arg value="${github.paulthomson:build-swiftshader:zip:Linux_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Linux/$1"/>
<arg value="${github.paulthomson:build-swiftshader:zip:Linux_x64_Release}"/>
<arg value="lib/(.+)"/>
<arg value="bin/Linux/swiftshader/$1"/>

<arg value="${github.paulthomson:build-swiftshader:zip:Mac_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Mac/$1"/>
<arg value="${github.paulthomson:build-swiftshader:zip:Mac_x64_Release}"/>
<arg value="lib/(.+)"/>
<arg value="bin/Mac/swiftshader/$1"/>

<arg value="${github.paulthomson:build-swiftshader:zip:Windows_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Windows/$1"/>
<arg value="${github.paulthomson:build-swiftshader:zip:Windows_x64_Release}"/>
<arg value="lib/(.+)"/>
<arg value="bin/Windows/swiftshader/$1"/>

<!-- build-glslang -->
<mappedresources>
<zipfileset
src="${github.paulthomson:build-glslang:zip:Linux_x64_Release}"
includes="bin/*"
/>
<globmapper from="bin/*" to="bin/Linux/*"/>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.paulthomson:build-glslang:zip:Mac_x64_Release}"
includes="bin/*"
/>
<globmapper from="bin/*" to="bin/Mac/*"/>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.paulthomson:build-glslang:zip:Windows_x64_Release}"
includes="bin/*"
/>
<globmapper from="bin/*" to="bin/Windows/*"/>
</mappedresources>
<arg value="${github.paulthomson:build-glslang:zip:Linux_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Linux/$1"/>

<arg value="${github.paulthomson:build-glslang:zip:Mac_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Mac/$1"/>

<arg value="${github.paulthomson:build-glslang:zip:Windows_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Windows/$1"/>

<!-- get-image-glsl (note: lines below are quite different from the rest) -->
<mappedresources>
<zipfileset
src="${github.mc-imperial:get-image-glsl:zip:Linux_x64_Release}"
includes="bin/get_image_glfw*"
/>
<globmapper from="bin/*" to="bin/Linux/*"/>
</mappedresources>
<mappedresources>
<zipfileset
src="${github.mc-imperial:get-image-glsl:zip:Linux_x64_Release}"
includes="bin/get_image_egl*"
/>
<globmapper from="bin/get_image_egl*" to="bin/Linux/angle/get_image_egl*"/>
</mappedresources>
<mappedresources>
<zipfileset
src="${github.mc-imperial:get-image-glsl:zip:Linux_x64_Release}"
includes="bin/get_image_egl*"
/>
<globmapper from="bin/get_image_egl*"
to="bin/Linux/swiftshader/get_image_egl*"/>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.mc-imperial:get-image-glsl:zip:Mac_x64_Release}"
includes="bin/get_image_glfw*"
/>
<globmapper from="bin/*" to="bin/Mac/*"/>
</mappedresources>
<mappedresources>
<zipfileset
src="${github.mc-imperial:get-image-glsl:zip:Mac_x64_Release}"
includes="bin/get_image_egl*"
/>
<globmapper from="bin/get_image_egl*" to="bin/Mac/angle/get_image_egl*"/>
</mappedresources>
<mappedresources>
<zipfileset
src="${github.mc-imperial:get-image-glsl:zip:Mac_x64_Release}"
includes="bin/get_image_egl*"
/>
<globmapper from="bin/get_image_egl*"
to="bin/Mac/swiftshader/get_image_egl*"/>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.mc-imperial:get-image-glsl:zip:Windows_x64_Release}"
includes="bin/get_image_glfw*"
/>
<globmapper from="bin/*" to="bin/Windows/*"/>
</mappedresources>
<mappedresources>
<zipfileset
src="${github.mc-imperial:get-image-glsl:zip:Windows_x64_Release}"
includes="bin/get_image_egl*"
/>
<globmapper from="bin/get_image_egl*" to="bin/Windows/angle/get_image_egl*"/>
</mappedresources>
<mappedresources>
<zipfileset
src="${github.mc-imperial:get-image-glsl:zip:Windows_x64_Release}"
includes="bin/get_image_egl*"
/>
<globmapper from="bin/get_image_egl*"
to="bin/Windows/swiftshader/get_image_egl*"/>
</mappedresources>
<arg value="${github.mc-imperial:get-image-glsl:zip:Linux_x64_Release}"/>
<arg value="bin/(get_image_glfw.*)"/>
<arg value="bin/Linux/$1"/>
<arg value="${github.mc-imperial:get-image-glsl:zip:Linux_x64_Release}"/>
<arg value="bin/(get_image_egl.*)"/>
<arg value="bin/Linux/angle/$1"/>
<arg value="${github.mc-imperial:get-image-glsl:zip:Linux_x64_Release}"/>
<arg value="bin/(get_image_egl.*)"/>
<arg value="bin/Linux/swiftshader/$1"/>

<arg value="${github.mc-imperial:get-image-glsl:zip:Mac_x64_Release}"/>
<arg value="bin/(get_image_glfw.*)"/>
<arg value="bin/Mac/$1"/>
<arg value="${github.mc-imperial:get-image-glsl:zip:Mac_x64_Release}"/>
<arg value="bin/(get_image_egl.*)"/>
<arg value="bin/Mac/angle/$1"/>
<arg value="${github.mc-imperial:get-image-glsl:zip:Mac_x64_Release}"/>
<arg value="bin/(get_image_egl.*)"/>
<arg value="bin/Mac/swiftshader/$1"/>

<arg value="${github.mc-imperial:get-image-glsl:zip:Windows_x64_Release}"/>
<arg value="bin/(get_image_glfw.*)"/>
<arg value="bin/Windows/$1"/>
<arg value="${github.mc-imperial:get-image-glsl:zip:Windows_x64_Release}"/>
<arg value="bin/(get_image_egl.*)"/>
<arg value="bin/Windows/angle/$1"/>
<arg value="${github.mc-imperial:get-image-glsl:zip:Windows_x64_Release}"/>
<arg value="bin/(get_image_egl.*)"/>
<arg value="bin/Windows/swiftshader/$1"/>

<!-- build-SPIRV-Tools -->
<mappedresources>
<zipfileset
src="${github.paulthomson:build-SPIRV-Tools:zip:Linux_x64_Release}"
includes="bin/*"
/>
<globmapper from="bin/*" to="bin/Linux/*"/>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.paulthomson:build-SPIRV-Tools:zip:Mac_x64_Release}"
includes="bin/*"
/>
<globmapper from="bin/*" to="bin/Mac/*"/>
</mappedresources>

<mappedresources>
<zipfileset
src="${github.paulthomson:build-SPIRV-Tools:zip:Windows_x64_Release}"
includes="bin/*"
/>
<globmapper from="bin/*" to="bin/Windows/*"/>
</mappedresources>

</zip>
<arg value="${github.paulthomson:build-SPIRV-Tools:zip:Linux_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Linux/$1"/>

<arg value="${github.paulthomson:build-SPIRV-Tools:zip:Mac_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Mac/$1"/>

<arg value="${github.paulthomson:build-SPIRV-Tools:zip:Windows_x64_Release}"/>
<arg value="bin/(.+)"/>
<arg value="bin/Windows/$1"/>

</java>
<unzip src="${assembly-zip}" dest="${assembly-dir}"/>
<chmod perm="ugo+x" dir="${assembly-dir}/bin" includes="**" />
<touch file="${touched-file}"/>
Expand Down
5 changes: 5 additions & 0 deletions parent-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ limitations under the License.
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.18</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ limitations under the License.
<module>thrift</module>
<module>tool</module>
<module>util</module>
<module>zip-helper</module>
</modules>


Expand Down
43 changes: 43 additions & 0 deletions zip-helper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!--
Copyright 2018 The GraphicsFuzz Project Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>zip-helper</artifactId>
<name>zip-helper</name>
<packaging>jar</packaging>

<parent>
<groupId>com.graphicsfuzz</groupId>
<artifactId>parent-checkstyle</artifactId>
<version>1.0</version>
<relativePath>../parent-checkstyle/pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
</dependencies>

</project>
Loading