From 3307adaf43bc776e415852c36697796c64ea28fd Mon Sep 17 00:00:00 2001
From: Philipp Spohr <spohr.philipp@web.de>
Date: Sun, 6 Aug 2017 10:21:57 +0200
Subject: [PATCH] Back to 0: Seperate Compilation of C++/Java code for now
---
build.gradle | 48 -------------------
.../yoshikoWrapper/internal/CyActivator.java | 2 +-
2 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/build.gradle b/build.gradle
index def2bbe..efe952b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,7 @@
plugins {
- id 'org.ajoberstar.grgit' version '1.7.2'
- id 'fr.echoes.gradle.cpp' version '1.2.9'
id 'maven'
}
-//Hacky woraround for conflicting task names with maven and cpp plugin
-tasks.remove(install)
-
apply plugin: 'java'
@@ -17,55 +12,12 @@ description = """yoshikoWrapper"""
sourceCompatibility = 1.8
targetCompatibility = 1.8
-def yoshikoDir = 'build/yoshikoSource'
-
-/*
-Clone task to fetch the required C++ code from the yoshiko repository
-*/
-task cloneYoshikoCode {
-
- description = 'Fetches the Yoshiko Source from the github repository for further processing'
- doLast{
- if (!(file(yoshikoDir).exists())){
- logger.info("Yoshiko source files don't exist yet, cloning ...")
- org.ajoberstar.grgit.Grgit.clone(dir: file(yoshikoDir), uri: 'https://github.com/spqrPh/yoshiko')
- //TODO: Always checkout a version that is tagged as "stable"
- mkdir yoshikoDir+"/build"
- }
- }
-}
-
-task launchCMake(type: Exec, group: "init") {
- workingDir yoshikoDir+"/build"
- executable = "cmake"
- args ".."
-}
-
-
-cpp {
- applicationType = "clibrary"
- buildTasksEnabled = false
- exec.with {
- execPath = yoshikoDir+"/build"
- compileCppExecPath = "make"
- compileCppBaseArgs = ""
- compileCppExecWorkingDir = yoshikoDir+"/build"
- }
-}
-
-//Task-Chain
-launchCMake.dependsOn cloneYoshikoCode
-compileCpp.dependsOn launchCMake
-compileJava.dependsOn compileCpp
-jar.dependsOn compileJava
-
repositories {
maven { url "http://code.cytoscape.org/nexus/content/repositories/snapshots/" }
maven { url "http://code.cytoscape.org/nexus/content/repositories/releases/" }
maven { url "http://repo.maven.apache.org/maven2" }
}
-
dependencies {
compile group: 'org.osgi', name: 'org.osgi.core', version:'4.2.0'
compile group: 'org.cytoscape', name: 'service-api', version:'3.5.0-RC2'
diff --git a/src/main/java/de/hhu/bcs/yoshikoWrapper/internal/CyActivator.java b/src/main/java/de/hhu/bcs/yoshikoWrapper/internal/CyActivator.java
index 5746dab..0a1e89d 100644
--- a/src/main/java/de/hhu/bcs/yoshikoWrapper/internal/CyActivator.java
+++ b/src/main/java/de/hhu/bcs/yoshikoWrapper/internal/CyActivator.java
@@ -8,7 +8,7 @@ public class CyActivator extends AbstractCyActivator {
@Override
public void start(BundleContext context) throws Exception {
- //DONOTHINGYET
+ System.loadLibrary("yoshiko");
}
}
--
GitLab