added setup.sh, improved Makefile

Makefile

@@ -2,10 +2,11 @@ CXX      = g++
 CFLAGS   = -Wall -pedantic-errors -std=c++17 -g #-O2
 SRCDIR   = src/main/cpp/src/
 BUILDDIR = target/
-INCDIR   = src/main/cpp/inc/
+INCDIR   = $(BUILDDIR)inc/
 INSTALLDIR = /usr/lib/
-LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR) -Iinc/ #-ldl
+LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR) -Isrc/main/cpp/inc/ #-ldl
 NAME     = libplugin.so
+SERVER   = testerver/
 
 SRCFILES = $(wildcard $(SRCDIR)*.cpp)
 OBJFILES = $(patsubst $(SRCDIR)%, $(BUILDDIR)%, $(patsubst %.cpp,%.so,$(SRCFILES)))
@@ -31,13 +32,13 @@ $(BUILDDIR)%: $(SRCDIR)%.cpp $(BUILDDIR)
 
 clean:
 	$(RM) -r $(BUILDDIR)
-	$(RM) testserver/plugins/*.so testserver/plugins/CppPlugins/*.so testplugins/*/*.so 
+	$(RM) $(SERVER)plugins/*.so $(SERVER)plugins/CppPlugins/*.so testplugins/*/*.so 
 
 $(BUILDDIR):
 	mkdir -p $@
 
 createhfiles:
-	rm -fr $(INCDIR)
-	javah -d $(INCDIR) -classpath target/classes/:$(HOME)/.m2/repository/org/bukkit/craftbukkit/1.7.10-R0.1-SNAPSHOT/craftbukkit-1.7.10-R0.1-SNAPSHOT.jar de.mrbesen.cppplugins.CppPlugin
+	$(RM) -r $(INCDIR)
+	javah -d $(INCDIR) -classpath $(BUILDDIR)classes/:$(HOME)/.m2/repository/org/bukkit/craftbukkit/1.7.10-R0.1-SNAPSHOT/craftbukkit-1.7.10-R0.1-SNAPSHOT.jar de.mrbesen.cppplugins.CppPlugin
 
-.phony: createhfiles clean plugins
+.PHONY: createhfiles clean plugins

setup.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+#This script basicly just downloads spigot
+
+server="testserver/"
+buildtools="${server}buildtools/"
+mcvers="1.12.2"
+
+mkdir -p "$server" "${buildtools}"
+oldpwd=$(dirname $(realpath $0))
+cd "$buildtools"
+wget -nc https://hub.spigotmc.org/jenkins/job/BuildTools/lastStableBuild/artifact/target/BuildTools.jar
+java -jar BuildTools.jar --compile SPIGOT --rev "$mcvers"
+
+cd "${oldpwd}"
+
+cp "${buildtools}spigot-${mcvers}.jar" "${server}"
+echo "eula=true" > "${server}eula.txt"
+
+printf "\n\n\n\n"
+echo "server installed into: ${server}"
+
+echo "delete ${buildtools} ?"
+rm -frI "${buildtools}"

src/main/cpp/inc/de_mrbesen_cppplugins_CppPlugin.h

@@ -1,77 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class de_mrbesen_cppplugins_CppPlugin */
-
-#ifndef _Included_de_mrbesen_cppplugins_CppPlugin
-#define _Included_de_mrbesen_cppplugins_CppPlugin
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    init_
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_de_mrbesen_cppplugins_CppPlugin_init_1
-  (JNIEnv *, jobject);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    loadPlugin
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_de_mrbesen_cppplugins_CppPlugin_loadPlugin
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    onLoad
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_de_mrbesen_cppplugins_CppPlugin_onLoad
-  (JNIEnv *, jobject);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    onEnable_
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_de_mrbesen_cppplugins_CppPlugin_onEnable_1
-  (JNIEnv *, jobject);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    onDisable_
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_de_mrbesen_cppplugins_CppPlugin_onDisable_1
-  (JNIEnv *, jobject);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    fireEvent
- * Signature: (Lde/mrbesen/cppplugins/CppEvent;I)Lde/mrbesen/cppplugins/CppEvent;
- */
-JNIEXPORT jobject JNICALL Java_de_mrbesen_cppplugins_CppPlugin_fireEvent
-  (JNIEnv *, jobject, jobject, jint);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    onCmd
- * Signature: (Lorg/bukkit/command/CommandSender;Lorg/bukkit/command/Command;Ljava/lang/String;[Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_de_mrbesen_cppplugins_CppPlugin_onCmd
-  (JNIEnv *, jobject, jobject, jobject, jstring, jobjectArray);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    getListener
- * Signature: ()[Lde/mrbesen/cppplugins/CppPlugin/CppListener;
- */
-JNIEXPORT jobjectArray JNICALL Java_de_mrbesen_cppplugins_CppPlugin_getListener
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

src/main/cpp/inc/de_mrbesen_cppplugins_CppPlugin_CppListener.h

@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class de_mrbesen_cppplugins_CppPlugin_CppListener */
-
-#ifndef _Included_de_mrbesen_cppplugins_CppPlugin_CppListener
-#define _Included_de_mrbesen_cppplugins_CppPlugin_CppListener
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif

testplugins/01verysimpleplugin/Makefile

@@ -1,8 +1,8 @@
 
 CFLAGS   = -Wall -pedantic-errors -std=c++17 -g
 SRCDIR   = src/
-INCDIR   = ../../inc
-LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR) -I../../src/main/cpp/inc
+INCDIR   = ../../src/main/cpp/inc
+LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR)
 NAME     = verysimpleplugin.so
 
 all:

testplugins/02simpleEvents/Makefile

@@ -1,7 +1,7 @@
 
 CFLAGS   = -Wall -pedantic-errors -std=c++17 -g
 SRCDIR   = src/
-INCDIR   = ../../inc
+INCDIR   = ../../src/main/cpp/inc
 LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR)
 NAME     = simpleevents.so
 

testplugins/03simpleCmd/Makefile

@@ -1,7 +1,7 @@
 
 CFLAGS   = -Wall -pedantic-errors -std=c++17 -g
 SRCDIR   = src/
-INCDIR   = ../../inc
+INCDIR   = ../../src/main/cpp/inc
 LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR)
 NAME     = simpleCmd.so