From adc7ad757e752c29526169e52319fc3063b4e778 Mon Sep 17 00:00:00 2001 From: iwgeric Date: Mon, 25 Apr 2016 22:35:51 -0400 Subject: [PATCH] Move OpenALSoft source files to build directory Move the zip file downloaded from OpenALSoft and the extraction folder to within the build folder so that are ignored by git and cleaned appropriately. --- jme3-android-native/openalsoft.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jme3-android-native/openalsoft.gradle b/jme3-android-native/openalsoft.gradle index 22e47a65a..5ae9ec3d7 100644 --- a/jme3-android-native/openalsoft.gradle +++ b/jme3-android-native/openalsoft.gradle @@ -5,7 +5,7 @@ String openALSoftZipFile = 'OpenALSoft.zip' // OpenAL Soft directory the download is extracted into // Typically, the downloaded OpenAL Soft zip file will extract to a directory // called "openal-soft" -String openALSoftFolder = 'openal-soft' +String openALSoftFolder = 'openal-soft-e5016f8' //Working directories for the ndk build. String openalsoftBuildDir = "${buildDir}" + File.separator + 'openalsoft' @@ -21,19 +21,19 @@ String openalsoftJmeAndroidPath = 'src/native/jme_openalsoft' // Download external source files if not available task downloadOpenALSoft(type: MyDownload) { sourceUrl = openALSoftUrl - target = file(openALSoftZipFile) + target = file(openalsoftBuildDir + File.separator + openALSoftZipFile) } // Unzip external source files task unzipOpenALSoft(type: Copy) { - def zipFile = file(openALSoftZipFile) - def outputDir = file(".") + def zipFile = file(openalsoftBuildDir + File.separator + openALSoftZipFile) + def outputDir = file(openalsoftBuildDir) from zipTree(zipFile) into outputDir } unzipOpenALSoft.dependsOn { - def zipFilePath = project.projectDir.absolutePath + File.separator + openALSoftZipFile + def zipFilePath = openalsoftBuildDir + File.separator + openALSoftZipFile def zipFile = new File(zipFilePath) // println "zipFile path: " + zipFile.absolutePath // println "zipFile exists: " + zipFile.exists() @@ -44,7 +44,7 @@ unzipOpenALSoft.dependsOn { // Copy external source files to jni directory task copyOpenALSoft(type: Copy) { - def sourceDir = file(openALSoftFolder) + def sourceDir = file(openalsoftBuildDir + File.separator + openALSoftFolder) def outputDir = file(openalsoftBuildJniDir) // println "copyOpenALSoft sourceDir: " + sourceDir // println "copyOpenALSoft outputDir: " + outputDir