Download as
Browse Code »

Commit 9ea7f21c15eaeb42c26d778690d6fde0831cc937

Authored by Perry Werneck
1 parent 9909320d
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes no empacotamento.

Showing 3 changed files with 38 additions and 16 deletions   Show diff stats
po/pt_BR.po
  Diff comments   View file @9ea7f21
... ... @@ -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: 2016-05-31 10:44-0300\n"
  8 +"POT-Creation-Date: 2016-06-07 08:45-0300\n"
9 9 "PO-Revision-Date: 2016-05-31 11:16-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
... ... @@ -103,7 +103,7 @@ msgstr &quot;- Emulador 3270 para GTK&quot;
103 103 msgid "16 colors"
104 104 msgstr "16 cores"
105 105  
106   -#: screen.c:691 screen.c:721 screen.c:735 screen.c:860
  106 +#: screen.c:688 screen.c:718 screen.c:732 screen.c:862
107 107 msgid "3270 Error"
108 108 msgstr "Erro 3270"
109 109  
... ... @@ -111,7 +111,7 @@ msgstr &quot;Erro 3270&quot;
111 111 msgid "3270 File transfer"
112 112 msgstr "Transferência de arquivos 3270"
113 113  
114   -#: screen.c:706
  114 +#: screen.c:703
115 115 msgid "3270 Warning"
116 116 msgstr "Alerta 3270"
117 117  
... ... @@ -806,7 +806,7 @@ msgstr &quot;Apagar até o final do campo&quot;
806 806 msgid "Erase to end of line"
807 807 msgstr "Apagar até o final da linha"
808 808  
809   -#: print.c:247 v3270/widget.c:194 util.c:981
  809 +#: print.c:247 v3270/widget.c:194 util.c:982
810 810 msgid "Error"
811 811 msgstr "Erro"
812 812  
... ... @@ -2486,7 +2486,7 @@ msgstr &quot;Janela&quot;
2486 2486 msgid "Windows Western languages (CP1252)"
2487 2487 msgstr "Windows ocidental (CP1252)"
2488 2488  
2489   -#: util.c:159
  2489 +#: util.c:160
2490 2490 #, c-format
2491 2491 msgid "Windows error %d"
2492 2492 msgstr "Erro windows %d"
... ... @@ -2711,7 +2711,7 @@ msgstr &quot;Atributo inesperado \&quot;action\&quot; em &lt;%s&gt;&quot;
2711 2711 msgid "an action attribute"
2712 2712 msgstr "um atributo \"action\""
2713 2713  
2714   -#: session.c:267
  2714 +#: session.c:268
2715 2715 msgid "bracket"
2716 2716 msgstr "bracket"
2717 2717  
... ...
src/classlib/class.mak.in
  Diff comments   View file @9ea7f21
... ... @@ -34,12 +34,16 @@ CLASS_RELEASE_OBJECTS=$(foreach SRC, $(basename $(CLASS_SRC)), $(OBJRLS)/classli
34 34  
35 35 #---[ Rules ]------------------------------------------------------------------
36 36  
37   -$(OBJDBG)/classlib/%.o: $(CLASSLIBDIR)/%.cc
  37 +$(OBJDBG)/classlib/%.o: \
  38 + $(CLASSLIBDIR)/%.cc
  39 +
38 40 @echo " CC `basename $@`"
39 41 @$(MKDIR) `dirname $@`
40 42 @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(DEBUG_CFLAGS) -o $@ -c $<
41 43  
42   -$(OBJRLS)/classlib/%.o: $(CLASSLIBDIR)/%.cc
  44 +$(OBJRLS)/classlib/%.o: \
  45 + $(CLASSLIBDIR)/%.cc
  46 +
43 47 @echo " CC `basename $@`"
44 48 @$(MKDIR) `dirname $@`
45 49 @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $<
... ...
src/java/Makefile.in
  Diff comments   View file @9ea7f21
... ... @@ -111,32 +111,48 @@ $(OBJRLS)/j3270/%.o: %.cc Makefile private.h
111 111 @mkdir -p `dirname $@`
112 112 @$(CXX) -DNDEBUG=1 $(PLUGIN_CFLAGS) -o $@ -c $<
113 113  
114   -$(BINDIR)/java/%.class: %.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
  114 +$(BINDIR)/java/%.class: \
  115 + %.java \
  116 + $(BINDIR)/java/pw3270/terminal.class
  117 +
115 118 @echo $< ...
116 119 @mkdir -p `dirname $@`
117 120 @$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
118 121  
119   -$(BINDIR)/java/%.class: sample/%.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
  122 +$(BINDIR)/java/%.class: \
  123 + sample/%.java \
  124 + $(BINDIR)/java/pw3270/terminal.class
  125 +
120 126 @echo $< ...
121 127 @mkdir -p `dirname $@`
122 128 @$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
123 129  
124   -$(BINDIR)/%.class: sample/%.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
  130 +$(BINDIR)/%.class: \
  131 + sample/%.java \
  132 + $(BINDIR)/java/pw3270/terminal.class
  133 +
125 134 @echo $< ...
126 135 @mkdir -p `dirname $@`
127 136 @$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
128 137  
129   -%.class: sample/%.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
  138 +%.class: \
  139 + sample/%.java \
  140 + $(BINDIR)/java/pw3270/terminal.class
  141 +
130 142 @echo $< ...
131 143 @mkdir -p `dirname $@`
132 144 @$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d `dirname $@` $<
133 145  
134   -$(BINDIR)/java/$(PACKAGE_NAME)/%.class: %.java
  146 +$(BINDIR)/java/pw3270/%.class: \
  147 + %.java
  148 +
135 149 @echo $< ...
136 150 @mkdir -p `dirname $@`
137 151 @$(JAVAC) -encoding utf-8 -d $(BINDIR)/java $^
138 152  
139   -$(BINRLS)/$(PACKAGE_NAME).jar: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
  153 +$(BINRLS)/$(PACKAGE_NAME).jar: \
  154 + $(BINDIR)/java/pw3270/terminal.class
  155 +
140 156 @echo $@ ...
141 157 @mkdir -p `dirname $@`
142 158 @$(JAR) -cvf "$@" -C "$(BINDIR)/java" "$(PACKAGE_NAME)"
... ... @@ -307,10 +323,12 @@ install: \
307 323 install-plugin \
308 324 install-doc
309 325  
310   -jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
  326 +jni3270.h: \
  327 + $(BINDIR)/java/pw3270/terminal.class
  328 +
311 329 @echo $< ...
312 330 @mkdir -p `dirname $@`
313   - @$(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal
  331 + @$(JAVAH) -o $@ -classpath $(BINDIR)/java pw3270.terminal
314 332  
315 333 cleanDebug: clean
316 334  
... ...