rik/mimis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace tabs by space

Browse Source
This commit is contained in:
Rik Veenboer
2016-07-10 23:02:08 +01:00
parent ec205f8181
commit 0bd80fa822
2 changed files with 214 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
cpp/jlibmimis/build.gradle
View File

@@ -4,13 +4,13 @@ apply plugin: 'maven'
apply plugin: 'eclipse' apply plugin: 'eclipse'
repositories { repositories {
maven { maven {
url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/' url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/'
} }
} }
dependencies { dependencies {
compile 'com.github.boukefalos:jlibloader:0.2' compile 'com.github.boukefalos:jlibloader:0.2'
} }
group = 'com.github.boukefalos' group = 'com.github.boukefalos'
@@ -18,7 +18,7 @@ project.archivesBaseName = 'jlibmimis'
version = '0.1' version = '0.1'
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.12' gradleVersion = '1.12'
} }
model { model {
@@ -27,72 +27,72 @@ model {
architecture 'i386' architecture 'i386'
operatingSystem 'windows' operatingSystem 'windows'
} }
windows_amd64 { windows_amd64 {
architecture 'amd64' architecture 'amd64'
operatingSystem 'windows' operatingSystem 'windows'
} }
} }
toolChains { toolChains {
gcc(Gcc) { gcc(Gcc) {
addPlatformConfiguration(new TargetPlatformConfiguration() { addPlatformConfiguration(new TargetPlatformConfiguration() {
boolean supportsPlatform(Platform platform) { boolean supportsPlatform(Platform platform) {
platform.operatingSystem.current && platform.operatingSystem.name == 'windows' && platform.operatingSystem.current && platform.operatingSystem.name == 'windows' &&
platform.architecture.name == 'amd64' platform.architecture.name == 'amd64'
} }
List<String> getCppCompilerArgs() { ['-m64', '-fpermissive'] } List<String> getCppCompilerArgs() { ['-m64', '-fpermissive'] }
List<String> getCCompilerArgs() { ['-m64'] } List<String> getCCompilerArgs() { ['-m64'] }
List<String> getObjectiveCCompilerArgs() { ['-m64'] } List<String> getObjectiveCCompilerArgs() { ['-m64'] }
List<String> getObjectiveCppCompilerArgs() { ['-m64'] } List<String> getObjectiveCppCompilerArgs() { ['-m64'] }
List<String> getAssemblerArgs() { ['--64'] } List<String> getAssemblerArgs() { ['--64'] }
List<String> getLinkerArgs() { ['-m64'] } List<String> getLinkerArgs() { ['-m64'] }
List<String> getStaticLibraryArchiverArgs() { [] } List<String> getStaticLibraryArchiverArgs() { [] }
}) })
} }
} }
} }
def jniHeadersDir = file("$buildDir/headers") def jniHeadersDir = file("$buildDir/headers")
task jniHeaders(dependsOn: compileJava) { task jniHeaders(dependsOn: compileJava) {
def outputFile = file("$jniHeadersDir/mimis.h") def outputFile = file("$jniHeadersDir/mimis.h")
inputs.files sourceSets.main.output inputs.files sourceSets.main.output
outputs.file outputFile outputs.file outputFile
exec { exec {
executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah') executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah')
args '-o', outputFile args '-o', outputFile
args '-classpath', sourceSets.main.output.classesDir args '-classpath', sourceSets.main.output.classesDir
args '-classpath', file("$buildDir/../bin") args '-classpath', file("$buildDir/../bin")
args 'mimis.util.Native' args 'mimis.util.Native'
} }
} }
libraries { libraries {
main { main {
baseName project.archivesBaseName baseName project.archivesBaseName
} }
all { all {
binaries.all { binaries.all {
cppCompiler.args '-I' + jniHeadersDir 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"
cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32" cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32"
linker.args '-Wl,--kill-at', '-static-libgcc', '-static-libstdc++' linker.args '-Wl,--kill-at', '-static-libgcc', '-static-libstdc++'
tasks.withType(CppCompile) { task -> tasks.withType(CppCompile) { task ->
task.dependsOn jniHeaders task.dependsOn jniHeaders
} }
} }
} }
} }
tasks.withType(Upload) { tasks.withType(Upload) {
repositories { repositories {
mavenDeployer { mavenDeployer {
repository(url: uri('../../.maven')) repository(url: uri('../../.maven'))
} }
} }
} }
configurations { configurations {
jni jni
} }
def deployer = uploadJni.repositories.mavenDeployer def deployer = uploadJni.repositories.mavenDeployer
@@ -120,8 +120,8 @@ binaries.withType(SharedLibraryBinary) { binary ->
jniPom.scopeMappings.mappings.clear() jniPom.scopeMappings.mappings.clear()
} }
def builderTask = binary.tasks.builder def builderTask = binary.tasks.builder
def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}" def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}"
nativeJar.into(libraryDirectory) { from builderTask.outputFile } nativeJar.into(libraryDirectory) { from builderTask.outputFile }
nativeJar.dependsOn builderTask nativeJar.dependsOn builderTask
} }
@@ -131,20 +131,20 @@ mainPom.artifactId = jar.baseName
mainPom.version = project.version mainPom.version = project.version
mainPom.scopeMappings.mappings.clear() mainPom.scopeMappings.mappings.clear()
mainPom.withXml { provider -> mainPom.withXml { provider ->
def node = provider.asNode() def node = provider.asNode()
def deps = node.appendNode('dependencies') def deps = node.appendNode('dependencies')
['windows-amd64', 'windows-i386'].each { platform -> ['windows-amd64', 'windows-i386'].each { platform ->
def dep = deps.appendNode('dependency') def dep = deps.appendNode('dependency')
dep.appendNode('groupId', project.group) dep.appendNode('groupId', project.group)
dep.appendNode('artifactId', "${project.archivesBaseName}-${platform}") dep.appendNode('artifactId', "${project.archivesBaseName}-${platform}")
dep.appendNode('version', project.version) dep.appendNode('version', project.version)
} }
def dep = deps.appendNode('dependency') def dep = deps.appendNode('dependency')
dep.appendNode('groupId', 'com.github.boukefalos') dep.appendNode('groupId', 'com.github.boukefalos')
dep.appendNode('artifactId', 'jlibloader') dep.appendNode('artifactId', 'jlibloader')
dep.appendNode('version', '0.2') dep.appendNode('version', '0.2')
} }
jar { jar {
from sourceSets.main.allSource from sourceSets.main.allSource
} }

300
cpp/jlibpipe/build.gradle
View File

@@ -1,152 +1,150 @@
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'c' apply plugin: 'c'
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'eclipse' apply plugin: 'eclipse'
repositories { repositories {
maven { maven {
url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/' url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/'
} }
} }
dependencies { dependencies {
compile 'com.github.boukefalos:jlibloader:0.2' compile 'com.github.boukefalos:jlibloader:0.2'
} }
group = 'com.github.boukefalos' group = 'com.github.boukefalos'
project.archivesBaseName = 'jlibpipe' project.archivesBaseName = 'jlibpipe'
version = '0.1' version = '0.1'
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.12' gradleVersion = '1.12'
} }
model {
platforms {
model { windows_i386 {
platforms { architecture 'i386'
windows_i386 { operatingSystem 'windows'
architecture 'i386' }
operatingSystem 'windows' windows_amd64 {
} architecture 'amd64'
windows_amd64 { operatingSystem 'windows'
architecture 'amd64' }
operatingSystem 'windows' }
} toolChains {
} gcc(Gcc) {
toolChains { addPlatformConfiguration(new TargetPlatformConfiguration() {
gcc(Gcc) { boolean supportsPlatform(Platform platform) {
addPlatformConfiguration(new TargetPlatformConfiguration() { platform.operatingSystem.current && platform.operatingSystem.name == 'windows' &&
boolean supportsPlatform(Platform platform) { platform.architecture.name == 'amd64'
platform.operatingSystem.current && platform.operatingSystem.name == 'windows' && }
platform.architecture.name == 'amd64' List<String> getCppCompilerArgs() { ['-m64', '-fpermissive'] }
} List<String> getCCompilerArgs() { ['-m64'] }
List<String> getCppCompilerArgs() { ['-m64', '-fpermissive'] } List<String> getObjectiveCCompilerArgs() { ['-m64'] }
List<String> getCCompilerArgs() { ['-m64'] } List<String> getObjectiveCppCompilerArgs() { ['-m64'] }
List<String> getObjectiveCCompilerArgs() { ['-m64'] } List<String> getAssemblerArgs() { ['--64'] }
List<String> getObjectiveCppCompilerArgs() { ['-m64'] } List<String> getLinkerArgs() { ['-m64'] }
List<String> getAssemblerArgs() { ['--64'] } List<String> getStaticLibraryArchiverArgs() { [] }
List<String> getLinkerArgs() { ['-m64'] } })
List<String> getStaticLibraryArchiverArgs() { [] } }
}) }
} }
}
} def jniHeadersDir = file("$buildDir/headers")
def jniHeadersDir = file("$buildDir/headers") task jniHeaders(dependsOn: compileJava) {
def outputFile = file("$jniHeadersDir/pipe.h")
task jniHeaders(dependsOn: compileJava) { inputs.files sourceSets.main.output
def outputFile = file("$jniHeadersDir/pipe.h") outputs.file outputFile
inputs.files sourceSets.main.output exec {
outputs.file outputFile executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah')
exec { args '-o', outputFile
executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah') args '-classpath', sourceSets.main.output.classesDir
args '-o', outputFile args '-classpath', file("$buildDir/../bin")
args '-classpath', sourceSets.main.output.classesDir args 'pipe.Pipe'
args '-classpath', file("$buildDir/../bin") }
args 'pipe.Pipe' }
}
} libraries {
main {
libraries { baseName project.archivesBaseName
main { }
baseName project.archivesBaseName all {
} binaries.all {
all { cCompiler.args '-I' + jniHeadersDir
binaries.all { cCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include"
cCompiler.args '-I' + jniHeadersDir cCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32"
cCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include" linker.args '-Wl,--kill-at', '-static-libgcc', '-static-libstdc++'
cCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32" tasks.withType(CCompile) { task ->
linker.args '-Wl,--kill-at', '-static-libgcc', '-static-libstdc++' task.dependsOn jniHeaders
tasks.withType(CCompile) { task -> }
task.dependsOn jniHeaders }
} }
} }
}
} tasks.withType(Upload) {
repositories {
tasks.withType(Upload) { mavenDeployer {
repositories { repository(url: uri('../../.maven'))
mavenDeployer { }
repository(url: uri('../../.maven')) }
} }
}
} configurations {
jni
configurations { }
jni
} def deployer = uploadJni.repositories.mavenDeployer
def deployer = uploadJni.repositories.mavenDeployer binaries.withType(SharedLibraryBinary) { binary ->
if (!buildable) {
binaries.withType(SharedLibraryBinary) { binary -> return
if (!buildable) { }
return def variantName = "${targetPlatform.operatingSystem.name}-${targetPlatform.architecture.name}"
} def taskName = "jar-${variantName}"
def variantName = "${targetPlatform.operatingSystem.name}-${targetPlatform.architecture.name}" def nativeJar = project.tasks.findByName(taskName)
def taskName = "jar-${variantName}" if (nativeJar == null) {
def nativeJar = project.tasks.findByName(taskName) nativeJar = project.task(taskName, type: Jar) {
if (nativeJar == null) { baseName = "${project.archivesBaseName}-$variantName"
nativeJar = project.task(taskName, type: Jar) { }
baseName = "${project.archivesBaseName}-$variantName" artifacts {
} jni nativeJar
artifacts { }
jni nativeJar def jniPom = deployer.addFilter(variantName) { artifact, file ->
} return file == nativeJar.archivePath
def jniPom = deployer.addFilter(variantName) { artifact, file -> }
return file == nativeJar.archivePath jniPom.groupId = project.group
} jniPom.artifactId = nativeJar.baseName
jniPom.groupId = project.group jniPom.version = project.version
jniPom.artifactId = nativeJar.baseName jniPom.scopeMappings.mappings.clear()
jniPom.version = project.version }
jniPom.scopeMappings.mappings.clear() def builderTask = binary.tasks.builder
} def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}"
def builderTask = binary.tasks.builder nativeJar.into(libraryDirectory) { from builderTask.outputFile }
def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}" nativeJar.dependsOn builderTask
nativeJar.into(libraryDirectory) { from builderTask.outputFile } }
nativeJar.dependsOn builderTask
} def mainPom = uploadArchives.repositories.mavenDeployer.pom
mainPom.groupId = project.group
def mainPom = uploadArchives.repositories.mavenDeployer.pom mainPom.artifactId = jar.baseName
mainPom.groupId = project.group mainPom.version = project.version
mainPom.artifactId = jar.baseName mainPom.scopeMappings.mappings.clear()
mainPom.version = project.version mainPom.withXml { provider ->
mainPom.scopeMappings.mappings.clear() def node = provider.asNode()
mainPom.withXml { provider -> def deps = node.appendNode('dependencies')
def node = provider.asNode() ['windows-amd64', 'windows-i386'].each { platform ->
def deps = node.appendNode('dependencies') def dep = deps.appendNode('dependency')
['windows-amd64', 'windows-i386'].each { platform -> dep.appendNode('groupId', project.group)
def dep = deps.appendNode('dependency') dep.appendNode('artifactId', "${project.archivesBaseName}-${platform}")
dep.appendNode('groupId', project.group) dep.appendNode('version', project.version)
dep.appendNode('artifactId', "${project.archivesBaseName}-${platform}") }
dep.appendNode('version', project.version) def dep = deps.appendNode('dependency')
} dep.appendNode('groupId', 'com.github.boukefalos')
def dep = deps.appendNode('dependency') dep.appendNode('artifactId', 'jlibloader')
dep.appendNode('groupId', 'com.github.boukefalos') dep.appendNode('version', '0.2')
dep.appendNode('artifactId', 'jlibloader') }
dep.appendNode('version', '0.2')
} jar {
from sourceSets.main.allSource
jar {
from sourceSets.main.allSource
} }