Commit 4634de31859c80b8c943aa78a1e9b918240f226d
1 parent
f1cdbb80
Exists in
master
Ajustes para empacotamento windows.
Showing
2 changed files
with
45 additions
and
7 deletions
Show diff stats
.gitignore
Makefile.in
| @@ -106,7 +106,7 @@ install-%: \ | @@ -106,7 +106,7 @@ install-%: \ | ||
| 106 | all: \ | 106 | all: \ |
| 107 | $(BINRLS)/$(LIBNAME) \ | 107 | $(BINRLS)/$(LIBNAME) \ |
| 108 | $(BINRLS)/$(PLUGIN) \ | 108 | $(BINRLS)/$(PLUGIN) \ |
| 109 | - doc | 109 | + javadoc |
| 110 | 110 | ||
| 111 | install: \ | 111 | install: \ |
| 112 | install-jni \ | 112 | install-jni \ |
| @@ -114,20 +114,49 @@ install: \ | @@ -114,20 +114,49 @@ install: \ | ||
| 114 | install-doc | 114 | install-doc |
| 115 | 115 | ||
| 116 | install-doc: \ | 116 | install-doc: \ |
| 117 | - doc | 117 | + javadoc |
| 118 | 118 | ||
| 119 | @$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) | 119 | @$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) |
| 120 | - @cp -rv ./doc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) | 120 | + @cp -rv ./javadoc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) |
| 121 | @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \; | 121 | @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \; |
| 122 | @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type d -exec chmod 755 {} \; | 122 | @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type d -exec chmod 755 {} \; |
| 123 | 123 | ||
| 124 | - | ||
| 125 | Release: \ | 124 | Release: \ |
| 126 | $(BINRLS)/$(LIBNAME) \ | 125 | $(BINRLS)/$(LIBNAME) \ |
| 127 | $(BINRLS)/$(PLUGIN) \ | 126 | $(BINRLS)/$(PLUGIN) \ |
| 128 | - doc | 127 | + javadoc |
| 128 | + | ||
| 129 | +zip: \ | ||
| 130 | + pw3270-java-@PACKAGE_VERSION@.@host@.zip | ||
| 131 | + | ||
| 132 | + | ||
| 133 | +pw3270-java-@PACKAGE_VERSION@.@host@.zip: \ | ||
| 134 | + $(BINRLS)/$(LIBNAME) \ | ||
| 135 | + $(BINRLS)/$(PLUGIN) \ | ||
| 136 | + $(BINRLS)/pw3270.jar \ | ||
| 137 | + javadoc | ||
| 138 | + | ||
| 139 | + @rm -f $@ | ||
| 140 | + @zip -9 -r $@ ./javadoc | ||
| 141 | + | ||
| 142 | + @$(MKDIR) ./jvm-exports | ||
| 143 | + @$(INSTALL_DATA) $(BINRLS)/pw3270.jar ./jvm-exports | ||
| 144 | + @zip -9 -m -r $@ ./jvm-exports | ||
| 145 | + @rm -fr ./jvm-exports | ||
| 129 | 146 | ||
| 130 | -doc: src/terminal.java | 147 | + @$(MKDIR) ./plugin |
| 148 | + @$(INSTALL_PROGRAM) $(BINRLS)/$(PLUGIN) ./plugin | ||
| 149 | + @zip -9 -m -r $@ ./plugin/ | ||
| 150 | + @rm -fr ./plugin | ||
| 151 | + | ||
| 152 | + @$(MKDIR) ./jni | ||
| 153 | + @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) ./jni | ||
| 154 | + @zip -9 -m -r $@ ./jni | ||
| 155 | + @rm -fr ./jni | ||
| 156 | + | ||
| 157 | + @zip -9 -r $@ ./testprograms | ||
| 158 | + | ||
| 159 | +javadoc: src/terminal.java | ||
| 131 | @$(JAVADOC) -encoding utf-8 -d $@ $^ | 160 | @$(JAVADOC) -encoding utf-8 -d $@ $^ |
| 132 | 161 | ||
| 133 | rpm: \ | 162 | rpm: \ |
| @@ -208,6 +237,12 @@ $(SRCDIR): \ | @@ -208,6 +237,12 @@ $(SRCDIR): \ | ||
| 208 | @cp src/plugin/*.in $(SRCDIR)/src/plugin | 237 | @cp src/plugin/*.in $(SRCDIR)/src/plugin |
| 209 | @cp src/plugin/*.cc $(SRCDIR)/src/plugin | 238 | @cp src/plugin/*.cc $(SRCDIR)/src/plugin |
| 210 | 239 | ||
| 240 | +$(BINRLS)/pw3270.jar: \ | ||
| 241 | + src/jni/*.cc \ | ||
| 242 | + src/include/*.h | ||
| 243 | + | ||
| 244 | + @make -C src/jni $@ | ||
| 245 | + | ||
| 211 | 246 | ||
| 212 | $(BINRLS)/$(LIBNAME): \ | 247 | $(BINRLS)/$(LIBNAME): \ |
| 213 | src/jni/*.cc \ | 248 | src/jni/*.cc \ |
| @@ -253,6 +288,8 @@ clean: | @@ -253,6 +288,8 @@ clean: | ||
| 253 | @rm -fr $(BINDIR) | 288 | @rm -fr $(BINDIR) |
| 254 | @rm -fr $(OBJDIR) | 289 | @rm -fr $(OBJDIR) |
| 255 | @rm -fr $(SRCDIR) | 290 | @rm -fr $(SRCDIR) |
| 291 | + @rm -fr jni | ||
| 292 | + @rm -fr javadoc | ||
| 256 | 293 | ||
| 257 | 294 | ||
| 258 | 295 |