This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository libnative-platform-java.
commit 9be38b9760160f29484d0f5a58ebdc13b7d2f5fa Author: Markus Koschany <[email protected]> Date: Fri Jun 5 20:40:38 2015 +0200 Remove make_buildsystem.diff because we use debian/Makefile now. --- debian/patches/make_buildsystem.diff | 90 ------------------------------------ 1 file changed, 90 deletions(-) diff --git a/debian/patches/make_buildsystem.diff b/debian/patches/make_buildsystem.diff deleted file mode 100644 index 5b89301..0000000 --- a/debian/patches/make_buildsystem.diff +++ /dev/null @@ -1,90 +0,0 @@ -Description: Use make as buildsystem instead of Gradle to - avoid a circular dependencies between gradle and native-platform. -Author: Damien Raude-Morvan <[email protected]> -Author: gil cattaneo <[email protected]> -Last-Update: 2014-01-19 -Forwarded: no ---- /dev/null -+++ b/Makefile -@@ -0,0 +1,81 @@ -+# Description: Use make as buildsystem instead of Gradle to -+# avoid a circular dependencies between gradle and native-platform. -+# This is very minimalistic Makefile so it will only work for -+# Debian use case for now. -+# Author: Damien Raude-Morvan <[email protected]> -+# Adapted for Fedora by: gil cattaneo <[email protected]> -+CXX ?= g++ -+STRIP ?= strip -+JAVA_HOME ?= /usr/lib/default-java -+JOPT_JAR ?= $(shell locate jopt-simple.jar) -+JTARGET ?= 1.5 -+JSOURCE ?= 1.5 -+ -+IDIR=src/main/headers -+SRCDIR=src/main/cpp -+JSRCDIR=src/main/java -+BUILD=build -+IGEN=$(BUILD)/headers -+JCLASSESDIR=$(BUILD)/classes -+JDOCDIR=$(BUILD)/docs/javadoc -+ODIR=$(BUILD)/binaries -+JAR=$(BUILD)/native-platform.jar -+JAR_ARCH=$(BUILD)/native-platform-linux.jar -+ -+INCLUDE=-I$(IDIR) -I$(IGEN) -I/usr/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -+ -+_OBJ_STD = generic.o generic_posix.o linux.o osx.o posix.o win.o -+_OBJ_CURSES = generic.o generic_posix.o curses.o -+OBJ_STD = $(patsubst %,$(ODIR)/%,$(_OBJ_STD)) -+OBJ_CURSES = $(patsubst %,$(ODIR)/%,$(_OBJ_CURSES)) -+_JAVA = $(shell find $(JSRCDIR) -name "*.java" -print) -+ -+.PHONY: clean jar javadoc -+ -+build: $(ODIR)/libnative-platform.so $(ODIR)/libnative-platform-curses.so jar javadoc arch-jar -+ -+$(ODIR)/libnative-platform.so: $(OBJ_STD) -+ $(CXX) -shared -fPIC $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ -+ $(STRIP) $@ -+ -+$(ODIR)/libnative-platform-curses.so: $(OBJ_CURSES) -+ $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -lcurses -shared -fPIC -o $@ $^ -+ $(STRIP) $@ -+ -+$(JCLASSESDIR)/%.class: javafiles-list -+ mkdir -p $(JCLASSESDIR) -+ $(JAVA_HOME)/bin/javac -source $(JTARGET) -target $(JSOURCE) -d $(JCLASSESDIR) -classpath $(JOPT_JAR) @javafiles-list -+ -+javafiles-list: $(_JAVA) -+ echo $^ > javafiles-list -+ -+javadoc: javafiles-list -+ mkdir -p $(JDOCDIR) -+ $(JAVA_HOME)/bin/javadoc -d $(JDOCDIR) -classpath $(JOPT_JAR) @javafiles-list -+ -+jar: $(JCLASSESDIR)/%.class -+ mkdir -p $(JDOCDIR) -+ (cd $(JCLASSESDIR) ; $(JAVA_HOME)/bin/jar cf ../../$(JAR) .) -+ -+arch-jar: $(ODIR)/libnative-platform.so $(ODIR)/libnative-platform-curses.so -+ (cd $(ODIR) ; $(JAVA_HOME)/bin/jar cf ../../$(JAR_ARCH) *.so) -+ -+$(ODIR)/%.o: $(SRCDIR)/%.cpp $(IGEN)/native.h -+ mkdir -p $(ODIR) -+ $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $@ $< -+ -+$(IGEN)/native.h: $(JCLASSESDIR)/%.class -+ mkdir -p $(IGEN) -+ $(JAVA_HOME)/bin/javah -o $(IGEN)/native.h -classpath $(JCLASSESDIR) \ -+ net.rubygrapefruit.platform.internal.jni.NativeLibraryFunctions \ -+ net.rubygrapefruit.platform.internal.jni.PosixFileFunctions \ -+ net.rubygrapefruit.platform.internal.jni.PosixFileSystemFunctions \ -+ net.rubygrapefruit.platform.internal.jni.PosixProcessFunctions \ -+ net.rubygrapefruit.platform.internal.jni.PosixTerminalFunctions \ -+ net.rubygrapefruit.platform.internal.jni.TerminfoFunctions \ -+ net.rubygrapefruit.platform.internal.jni.WindowsConsoleFunctions \ -+ net.rubygrapefruit.platform.internal.jni.WindowsHandleFunctions -+ -+clean: -+ -rm javafiles-list -+ -rm -Rf $(BUILD) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnative-platform-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
