Download as
Browse Code »

Commit 597357974dfcdce5e71d319ae701322d173ebc28

Authored by perry.werneck@gmail.com
1 parent 50852ff4
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Incluindo documentação no pacote java

Showing 6 changed files with 25 additions and 19 deletions   Show diff stats
Makefile.in
  Diff comments   View file @5973579
... ... @@ -140,9 +140,11 @@ $(BINDIR)/Release/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Release/$(PACKAGE
140 140  
141 141 all: Release
142 142  
143   -Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
144   - $(foreach EXT, $(EXTENSIONS), $(EXT)) \
145   - locale pixmaps
  143 +Release: \
  144 + $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \
  145 + $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
  146 + $(foreach EXT, $(EXTENSIONS), $(EXT)) \
  147 + locale pixmaps
146 148  
147 149 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@ $(DEPENDS)
148 150 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
... ... @@ -164,7 +166,8 @@ $(BINDIR)/Release/tn3270.so: src/php/*
164 166 @$(MKDIR) `dirname $@`
165 167 @cp src/php/.bin/Release/php3270.so $@
166 168  
167   -java: $(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@
  169 +java: src/java/Makefile src/java/*.cc src/java/*.h src/java/*.java
  170 + @$(MAKE) -C src/java Release
168 171  
169 172 $(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@: src/java/*
170 173 @$(MAKE) -C src/java Release
... ...
po/pt_BR.po
  Diff comments   View file @5973579
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2015-06-12 11:42-0300\n"
  8 +"POT-Creation-Date: 2015-06-16 14:52-0300\n"
9 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Portugues <>\n"
... ...
pw3270.spec.in
  Diff comments   View file @5973579
... ... @@ -242,7 +242,6 @@ make all
242 242  
243 243 %install
244 244 rm -rf $RPM_BUILD_ROOT
245   -cd %{_builddir}/%{name}-%{version}
246 245 %makeinstall
247 246 %find_lang %{name} langfiles
248 247  
... ... @@ -330,6 +329,11 @@ rm -rf $RPM_BUILD_ROOT
330 329 %defattr(-,root,root)
331 330 %{_jnidir}/libjni3270.so
332 331 %{_jvmjardir}/pw3270.jar
  332 +
  333 +
  334 +%dir %{_javadocdir}/%{name}/*
  335 +%{_javadocdir}/%{name}/*
  336 +
333 337 %endif
334 338  
335 339  
... ...
src/java/Makefile.in
  Diff comments   View file @5973579
... ... @@ -99,7 +99,7 @@ $(BINDIR)/java/$(PACKAGE_NAME)/%.class: %.java
99 99 @mkdir -p `dirname $@`
100 100 @$(JAVAC) -encoding utf-8 -d $(BINDIR)/java $^
101 101  
102   -$(BINRLS)/$(PACKAGE_NAME).jar: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class Makefile
  102 +$(BINRLS)/$(PACKAGE_NAME).jar: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
103 103 @echo $@ ...
104 104 @mkdir -p `dirname $@`
105 105 @$(JAR) -cvf "$@" -C "$(BINDIR)/java" "$(PACKAGE_NAME)"
... ... @@ -112,19 +112,19 @@ Release: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
112 112  
113 113 zip: jni3270.zip
114 114  
115   -jni3270.zip: $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java doc
  115 +jni3270.zip: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java doc
116 116 @rm -fr .tmp.zip
117 117 @rm -f $@
118   - @zip -9 -j $@ $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java
  118 + @zip -9 -j $@ $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java
119 119 @zip -9 -r $@ doc
120 120  
121 121 doc: terminal.java
122 122 @$(JAVADOC) -d doc $^
123 123  
  124 +$(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@: \
  125 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \
  126 + $(CLASS_RELEASE_OBJECTS)
124 127  
125   -
126   -$(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \
127   - $(CLASS_RELEASE_OBJECTS)
128 128 @echo " LD `basename $@`"
129 129 @$(MKDIR) `dirname $@`
130 130 @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS)
... ... @@ -146,7 +146,8 @@ run: $(BINDBG)/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class
146 146  
147 147 #---[ Misc targets ]-----------------------------------------------------------
148 148  
149   -install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ doc
  149 +install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(BINRLS)/$(PACKAGE_NAME).jar doc
  150 +
150 151 @$(MKDIR) $(DESTDIR)/$(jnidir)
151 152 @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(DESTDIR)/$(jnidir)
152 153  
... ... @@ -158,12 +159,10 @@ install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ doc
158 159 @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \;
159 160 @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type d -exec chmod 755 {} \;
160 161  
161   -
162 162 jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
163 163 @echo $< ...
164 164 @mkdir -p `dirname $@`
165   - $(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal
166   -
  165 + @$(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal
167 166  
168 167 cleanDebug: clean
169 168  
... ...
src/php/Makefile.in
  Diff comments   View file @5973579
... ... @@ -90,7 +90,7 @@ $(BINRLS)/php3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SR
90 90 $(CLASS_RELEASE_OBJECTS)
91 91 @echo " LD `basename $@`"
92 92 @$(MKDIR) `dirname $@`
93   - $(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS)
  93 + @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS)
94 94  
95 95  
96 96 #---[ Debug targets ]----------------------------------------------------------
... ...
src/plugins/rx3270/Makefile.in
  Diff comments   View file @5973579
... ... @@ -65,12 +65,12 @@ $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ
65 65 $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
66 66 @echo " CCLD `basename $@`"
67 67 @$(MKDIR) `dirname $@`
68   - $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
  68 + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
69 69  
70 70 $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS)
71 71 @echo " CCLD `basename $@`"
72 72 @$(MKDIR) `dirname $@`
73   - $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
  73 + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
74 74  
75 75 install:
76 76 @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
... ...