This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository libnative-platform-java.
commit a92cb571da1854c1fd39da6d23e64d0dc2fe219d Author: Kai-Chung Yan <[email protected]> Date: Fri Jun 5 20:10:48 2015 +0800 Refresh Makefile --- debian/Makefile | 49 +++++++++++++++++------------- debian/control | 2 ++ debian/libnative-platform-java-doc.install | 1 + debian/libnative-platform-jni.install | 1 + debian/rules | 11 ++++--- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/debian/Makefile b/debian/Makefile index c546a48..8ea0cf8 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -6,13 +6,15 @@ # 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) +JAVA_HOME ?= /usr/lib/jvm/default-java +JOPT_JAR ?= /usr/share/java/joptsimple.jar JTARGET ?= 1.5 JSOURCE ?= 1.5 -IDIR=src/main/headers -SRCDIR=src/main/cpp +IDIR=src/shared/headers +MAINCPPDIR=src/main/cpp +SHAREDCPPDIR=src/shared/cpp +CURSESCPPDIR=src/curses/cpp JSRCDIR=src/main/java BUILD=build IGEN=$(BUILD)/headers @@ -24,11 +26,11 @@ 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 = freebsd.o generic.o generic_posix.o linux.o osx.o posix.o unix_strings.o win.o +_OBJ_CURSES = curses.o generic.o generic_posix.o osx.o unix_strings.o OBJ_STD = $(patsubst %,$(ODIR)/%,$(_OBJ_STD)) OBJ_CURSES = $(patsubst %,$(ODIR)/%,$(_OBJ_CURSES)) -_JAVA = $(shell find $(JSRCDIR) -name "*.java" -print) +JAVA_SRC_FILEPATHS = $(shell find $(JSRCDIR) -name "*.java" -print) .PHONY: clean jar javadoc @@ -42,31 +44,36 @@ $(ODIR)/libnative-platform-curses.so: $(OBJ_CURSES) $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -lcurses -shared -fPIC -o $@ $^ $(STRIP) $@ -$(JCLASSESDIR)/%.class: javafiles-list +$(JCLASSESDIR)/%.class: $(JAVA_SRC_FILEPATHS) mkdir -p $(JCLASSESDIR) - $(JAVA_HOME)/bin/javac -source $(JTARGET) -target $(JSOURCE) -d $(JCLASSESDIR) -classpath $(JOPT_JAR) @javafiles-list + javac -source $(JTARGET) -target $(JSOURCE) -d $(JCLASSESDIR) -classpath $(JOPT_JAR) $(JAVA_SRC_FILEPATHS) -javafiles-list: $(_JAVA) - echo $^ > javafiles-list - -javadoc: javafiles-list +javadoc: $(JAVA_SRC_FILEPATHS) mkdir -p $(JDOCDIR) - $(JAVA_HOME)/bin/javadoc -d $(JDOCDIR) -classpath $(JOPT_JAR) @javafiles-list + javadoc -d $(JDOCDIR) -classpath $(JOPT_JAR) $(JAVA_SRC_FILEPATHS) jar: $(JCLASSESDIR)/%.class mkdir -p $(JDOCDIR) - (cd $(JCLASSESDIR) ; $(JAVA_HOME)/bin/jar cf ../../$(JAR) .) + (cd $(JCLASSESDIR) ; 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 +$(ODIR)/%.o: $(MAINCPPDIR)/*.cpp $(SHAREDCPPDIR)/*.cpp $(CURSESCPPDIR)/*.cpp $(IGEN)/native.h mkdir -p $(ODIR) - $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $@ $< + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/curses.o src/curses/cpp/curses.cpp + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/freebsd.o src/main/cpp/freebsd.cpp + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/linux.o src/main/cpp/linux.cpp + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/posix.o src/main/cpp/posix.cpp + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/win.o src/main/cpp/win.cpp + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/generic.o src/shared/cpp/generic.cpp + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/generic_posix.o src/shared/cpp/generic_posix.cpp + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/osx.o src/shared/cpp/osx.cpp + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/unix_strings.o src/shared/cpp/unix_strings.cpp $(IGEN)/native.h: $(JCLASSESDIR)/%.class mkdir -p $(IGEN) - $(JAVA_HOME)/bin/javah -o $(IGEN)/native.h -classpath $(JCLASSESDIR) \ + 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 \ @@ -74,8 +81,8 @@ $(IGEN)/native.h: $(JCLASSESDIR)/%.class net.rubygrapefruit.platform.internal.jni.PosixTerminalFunctions \ net.rubygrapefruit.platform.internal.jni.TerminfoFunctions \ net.rubygrapefruit.platform.internal.jni.WindowsConsoleFunctions \ - net.rubygrapefruit.platform.internal.jni.WindowsHandleFunctions + net.rubygrapefruit.platform.internal.jni.WindowsHandleFunctions \ + net.rubygrapefruit.platform.internal.jni.WindowsRegistryFunctions clean: - -rm javafiles-list - -rm -Rf $(BUILD) + -rm -rf $(BUILD) diff --git a/debian/control b/debian/control index c1a7150..c869886 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,10 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]> Build-Depends: ant, + build-essential, debhelper (>= 9), default-jdk (>= 1:1.6), + findutils, libjoptsimple-java, libncurses5-dev, maven-repo-helper (>= 1.5~) diff --git a/debian/libnative-platform-java-doc.install b/debian/libnative-platform-java-doc.install new file mode 100644 index 0000000..5510ae8 --- /dev/null +++ b/debian/libnative-platform-java-doc.install @@ -0,0 +1 @@ +build/docs/javadoc/* /usr/share/doc/libnative-platform-java/api/ \ No newline at end of file diff --git a/debian/libnative-platform-jni.install b/debian/libnative-platform-jni.install new file mode 100644 index 0000000..b5d2cb9 --- /dev/null +++ b/debian/libnative-platform-jni.install @@ -0,0 +1 @@ +build/binaries/libnative-platform*.so /usr/lib/jni/ \ No newline at end of file diff --git a/debian/rules b/debian/rules index 445c388..3d18ab0 100755 --- a/debian/rules +++ b/debian/rules @@ -11,11 +11,14 @@ INDEP_DIR := net/rubygrapefruit/native-platform dh $@ --with maven_repo_helper override_dh_auto_build: - dh_auto_build -- JAVA_HOME=$(JAVA_HOME) JOPT_JAR=/usr/share/java/joptsimple.jar + cp debian/Makefile . + dh_auto_build + rm -f Makefile -override_dh_auto_install: - dh_install -plibnative-platform-jni build/binaries/libnative-platform*.so /usr/lib/jni/ - dh_install -plibnative-platform-java-doc build/docs/javadoc/* /usr/share/doc/libnative-platform-java/api/ +override_dh_auto_clean: + cp debian/Makefile . + dh_auto_clean + rm -f Makefile get-orig-source: # Extract version from github -- 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
