Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 19:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix scribe permissions setting

Browse source
This commit is contained in:
Bradley Austin Davis 2017-11-28 12:20:52 -08:00
parent 251ae81536
commit 300e1835eb
1 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
android/build.gradle
View file

@ -24,8 +24,6 @@ def baseFolder = new File(HIFI_ANDROID_PRECOMPILED)
def jniFolder = new File('app/src/main/jniLibs/arm64-v8a') def jniFolder = new File('app/src/main/jniLibs/arm64-v8a')
import org.apache.tools.ant.taskdefs.condition.Os import org.apache.tools.ant.taskdefs.condition.Os
import de.undercouch.gradle.tasks.download.Verify
def baseUrl = 'https://hifi-public.s3.amazonaws.com/austin/android/' def baseUrl = 'https://hifi-public.s3.amazonaws.com/austin/android/'
def qtFile='qt-5.9.3_linux_armv8-libcpp.tgz' def qtFile='qt-5.9.3_linux_armv8-libcpp.tgz'
@ -89,6 +87,8 @@ task downloadDependencies {
} }
} }
import de.undercouch.gradle.tasks.download.Verify
task verifyQt(type: Verify) { def p = packages['qt']; src new File(baseFolder, p['file']); checksum p['checksum']; } task verifyQt(type: Verify) { def p = packages['qt']; src new File(baseFolder, p['file']); checksum p['checksum']; }
task verifyBullet(type: Verify) { def p = packages['bullet']; src new File(baseFolder, p['file']); checksum p['checksum'] } task verifyBullet(type: Verify) { def p = packages['bullet']; src new File(baseFolder, p['file']); checksum p['checksum'] }
task verifyDraco(type: Verify) { def p = packages['draco']; src new File(baseFolder, p['file']); checksum p['checksum'] } task verifyDraco(type: Verify) { def p = packages['draco']; src new File(baseFolder, p['file']); checksum p['checksum'] }
@ -142,28 +142,41 @@ task copyDependencies(dependsOn: extractDependencies) {
} }
} }
task setupScribe { def scribeFile='scribe_linux_x86_64'
def scribeFile='scribe_linux_x86_64' def scribeLocalFile='scribe'
def scribeLocalFile='scribe' def scribeChecksum='c98678d9726bd8bbf1bab792acf3ff6c'
if (Os.isFamily(Os.FAMILY_MAC)) { if (Os.isFamily(Os.FAMILY_MAC)) {
scribeFile = 'scribe_osx_x86_64' scribeFile = 'scribe_osx_x86_64'
} else if (Os.isFamily(Os.FAMILY_WINDOWS)) { scribeChecksum='a137ad62c1bf7cca739da219544a9a16'
scribeFile = 'scribe_win32_x86_64.exe' } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
scribeLocalFile = 'scribe.exe' scribeFile = 'scribe_win32_x86_64.exe'
} scribeLocalFile = 'scribe.exe'
scribeChecksum='75c2ce9ed45d17de375e3988bfaba816'
doFirst { }
download {
src baseUrl + scribeFile import de.undercouch.gradle.tasks.download.Download
dest new File(baseFolder, scribeLocalFile)
onlyIfNewer true task downloadScribe(type: Download) {
} src baseUrl + scribeFile
} dest new File(baseFolder, scribeLocalFile)
doLast { onlyIfNewer true
if (!Os.isFamily(Os.FAMILY_WINDOWS)) { }
commandLine 'chmod', 'a+x', HIFI_ANDROID_PRECOMPILED + '/' + scribeLocalFile
} task verifyScribe (type: Verify, dependsOn: downloadScribe) {
} src new File(baseFolder, scribeLocalFile);
checksum scribeChecksum
}
task fixScribePermissions(type: Exec, dependsOn: verifyScribe) {
commandLine 'chmod', 'a+x', HIFI_ANDROID_PRECOMPILED + '/' + scribeLocalFile
}
task setupScribe(dependsOn: verifyScribe) { }
// On Windows, we don't need to set the executable bit, but on OSX and Unix we do
if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
setupScribe.dependsOn fixScribePermissions
} }
task extractGvrBinaries(dependsOn: extractDependencies) { task extractGvrBinaries(dependsOn: extractDependencies) {