From 4634de31859c80b8c943aa78a1e9b918240f226d Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 21 Mar 2017 11:17:41 -0300 Subject: [PATCH] Ajustes para empacotamento windows. --- .gitignore | 3 ++- Makefile.in | 49 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4c4432d..a6076a5 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,8 @@ revision revision.m4 *.ini jni3270.h -doc +javadoc +jni rpm/BUILD rpm/BUILDROOT rpm/RPMS diff --git a/Makefile.in b/Makefile.in index 50f4012..88e10a1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -106,7 +106,7 @@ install-%: \ all: \ $(BINRLS)/$(LIBNAME) \ $(BINRLS)/$(PLUGIN) \ - doc + javadoc install: \ install-jni \ @@ -114,20 +114,49 @@ install: \ install-doc install-doc: \ - doc + javadoc @$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) - @cp -rv ./doc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) + @cp -rv ./javadoc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \; @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type d -exec chmod 755 {} \; - Release: \ $(BINRLS)/$(LIBNAME) \ $(BINRLS)/$(PLUGIN) \ - doc + javadoc + +zip: \ + pw3270-java-@PACKAGE_VERSION@.@host@.zip + + +pw3270-java-@PACKAGE_VERSION@.@host@.zip: \ + $(BINRLS)/$(LIBNAME) \ + $(BINRLS)/$(PLUGIN) \ + $(BINRLS)/pw3270.jar \ + javadoc + + @rm -f $@ + @zip -9 -r $@ ./javadoc + + @$(MKDIR) ./jvm-exports + @$(INSTALL_DATA) $(BINRLS)/pw3270.jar ./jvm-exports + @zip -9 -m -r $@ ./jvm-exports + @rm -fr ./jvm-exports -doc: src/terminal.java + @$(MKDIR) ./plugin + @$(INSTALL_PROGRAM) $(BINRLS)/$(PLUGIN) ./plugin + @zip -9 -m -r $@ ./plugin/ + @rm -fr ./plugin + + @$(MKDIR) ./jni + @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) ./jni + @zip -9 -m -r $@ ./jni + @rm -fr ./jni + + @zip -9 -r $@ ./testprograms + +javadoc: src/terminal.java @$(JAVADOC) -encoding utf-8 -d $@ $^ rpm: \ @@ -208,6 +237,12 @@ $(SRCDIR): \ @cp src/plugin/*.in $(SRCDIR)/src/plugin @cp src/plugin/*.cc $(SRCDIR)/src/plugin +$(BINRLS)/pw3270.jar: \ + src/jni/*.cc \ + src/include/*.h + + @make -C src/jni $@ + $(BINRLS)/$(LIBNAME): \ src/jni/*.cc \ @@ -253,6 +288,8 @@ clean: @rm -fr $(BINDIR) @rm -fr $(OBJDIR) @rm -fr $(SRCDIR) + @rm -fr jni + @rm -fr javadoc -- libgit2 0.21.2