From e1f6ffc41052cfda88f346bdd27cdfb4dd3e2575 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Thu, 14 Jul 2016 08:45:50 +0100 Subject: [PATCH] Add gradle wrapper --- build.gradle | 158 ++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 12 +- gradlew.bat | 180 +++++++++++------------ 3 files changed, 175 insertions(+), 175 deletions(-) diff --git a/build.gradle b/build.gradle index 7953cb4..547fc6b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,15 +4,15 @@ apply plugin: 'maven' apply plugin: 'eclipse' repositories { - maven { - url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/' - } - mavenCentral() + maven { + url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/' + } + mavenCentral() } dependencies { - compile 'com.github.boukefalos:jlibloader:0.2' - testCompile 'junit:junit:4.11' + compile 'com.github.boukefalos:jlibloader:0.2' + testCompile 'junit:junit:4.11' } group = 'com.github.boukefalos' @@ -21,7 +21,7 @@ version = '0.5.7' def jniVersion = '0.2.3.0' task wrapper(type: Wrapper) { - gradleVersion = '1.12' + gradleVersion = '1.12' } model { @@ -30,83 +30,83 @@ model { architecture 'i386' operatingSystem 'windows' } - windows_amd64 { - architecture 'amd64' - operatingSystem 'windows' - } + windows_amd64 { + architecture 'amd64' + operatingSystem 'windows' + } } toolChains { gcc(Gcc) { - addPlatformConfiguration(new TargetPlatformConfiguration() { - boolean supportsPlatform(Platform platform) { - platform.operatingSystem.current && platform.operatingSystem.name == 'windows' && - platform.architecture.name == 'amd64' - } - List getCppCompilerArgs() { ['-m64', '-fpermissive'] } - List getCCompilerArgs() { ['-m64'] } - List getObjectiveCCompilerArgs() { ['-m64'] } - List getObjectiveCppCompilerArgs() { ['-m64'] } - List getAssemblerArgs() { ['--64'] } - List getLinkerArgs() { ['-m64'] } - List getStaticLibraryArchiverArgs() { [] } - }) - } - } - repositories { - libs(PrebuiltLibraries) { - usb { lib -> - binaries.withType(StaticLibraryBinary) { - staticLibraryFile = file("lib/${targetPlatform.name}/libusb-1.0.dll.a") - } - } - } - } + addPlatformConfiguration(new TargetPlatformConfiguration() { + boolean supportsPlatform(Platform platform) { + platform.operatingSystem.current && platform.operatingSystem.name == 'windows' && + platform.architecture.name == 'amd64' + } + List getCppCompilerArgs() { ['-m64', '-fpermissive'] } + List getCCompilerArgs() { ['-m64'] } + List getObjectiveCCompilerArgs() { ['-m64'] } + List getObjectiveCppCompilerArgs() { ['-m64'] } + List getAssemblerArgs() { ['--64'] } + List getLinkerArgs() { ['-m64'] } + List getStaticLibraryArchiverArgs() { [] } + }) + } + } + repositories { + libs(PrebuiltLibraries) { + usb { lib -> + binaries.withType(StaticLibraryBinary) { + staticLibraryFile = file("lib/${targetPlatform.name}/libusb-1.0.dll.a") + } + } + } + } } def jniHeadersDir = file("$buildDir/headers") task jniHeaders(dependsOn: compileJava) { - def outputFile = file("$jniHeadersDir/LibusbJava.h") - inputs.files sourceSets.main.output - outputs.file outputFile - exec { - executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah') - args '-o', outputFile - args '-classpath', sourceSets.main.output.classesDir - args '-classpath', file("$buildDir/../bin") - args 'ch.ntb.usb.LibusbJava1' - } + def outputFile = file("$jniHeadersDir/LibusbJava.h") + inputs.files sourceSets.main.output + outputs.file outputFile + exec { + executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah') + args '-o', outputFile + args '-classpath', sourceSets.main.output.classesDir + args '-classpath', file("$buildDir/../bin") + args 'ch.ntb.usb.LibusbJava1' + } } libraries { main { baseName project.archivesBaseName } - all { - binaries.all { - cppCompiler.args '-I' + jniHeadersDir - cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include" - cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32" - linker.args '-Wl,--kill-at', '-static-libgcc', '-static-libstdc++' - tasks.withType(CppCompile) { task -> - task.dependsOn jniHeaders - } - - lib library: 'usb', linkage: 'static' - } - } + all { + binaries.all { + cppCompiler.args '-I' + jniHeadersDir + cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include" + cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32" + linker.args '-Wl,--kill-at', '-static-libgcc', '-static-libstdc++' + tasks.withType(CppCompile) { task -> + task.dependsOn jniHeaders + } + + lib library: 'usb', linkage: 'static' + } + } } tasks.withType(Upload) { - repositories { - mavenDeployer { - repository(url: uri('.maven')) - } - } + repositories { + mavenDeployer { + repository(url: uri('.maven')) + } + } } configurations { - jni + jni } def deployer = uploadJni.repositories.mavenDeployer @@ -134,8 +134,8 @@ binaries.withType(SharedLibraryBinary) { binary -> jniPom.scopeMappings.mappings.clear() } def builderTask = binary.tasks.builder - def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}" - nativeJar.into(libraryDirectory) { from builderTask.outputFile } + def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}" + nativeJar.into(libraryDirectory) { from builderTask.outputFile } nativeJar.dependsOn builderTask } @@ -145,20 +145,20 @@ mainPom.artifactId = jar.baseName mainPom.version = project.version mainPom.scopeMappings.mappings.clear() mainPom.withXml { provider -> - def node = provider.asNode() - def deps = node.appendNode('dependencies') - ['windows-amd64', 'windows-i386'].each { platform -> - def dep = deps.appendNode('dependency') - dep.appendNode('groupId', project.group) - dep.appendNode('artifactId', "${project.archivesBaseName}-${platform}") - dep.appendNode('version', jniVersion) - } - def dep = deps.appendNode('dependency') - dep.appendNode('groupId', 'com.github.boukefalos') - dep.appendNode('artifactId', 'jlibloader') - dep.appendNode('version', '0.2') + def node = provider.asNode() + def deps = node.appendNode('dependencies') + ['windows-amd64', 'windows-i386'].each { platform -> + def dep = deps.appendNode('dependency') + dep.appendNode('groupId', project.group) + dep.appendNode('artifactId', "${project.archivesBaseName}-${platform}") + dep.appendNode('version', jniVersion) + } + def dep = deps.appendNode('dependency') + dep.appendNode('groupId', 'com.github.boukefalos') + dep.appendNode('artifactId', 'jlibloader') + dep.appendNode('version', '0.2') } jar { - from sourceSets.main.allSource + from sourceSets.main.allSource } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 93d4d37..c821e11 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Nov 29 20:00:39 GMT 2014 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip +#Sun Jul 10 22:54:12 BST 2016 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..aec9973 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega