Download as
Browse Code »

Commit 6df069da83f1345a61ba0fe570721908f6e240dc

Authored by Perry Werneck
1 parent 981dd162
Exists in master and in 1 other branch develop

Updating library package.

Showing 5 changed files with 86 additions and 9 deletions   Show diff stats
@@ -44,6 +44,7 @@ LIBRARY_NAME=hllapi @@ -44,6 +44,7 @@ LIBRARY_NAME=hllapi
44 44
45 LIBRARY_SOURCES= \ 45 LIBRARY_SOURCES= \
46 $(wildcard src/$(LIBRARY_NAME)/*.c) \ 46 $(wildcard src/$(LIBRARY_NAME)/*.c) \
  47 + $(wildcard src/$(LIBRARY_NAME)/*.cc) \
47 $(wildcard src/$(LIBRARY_NAME)/@OSNAME@/*.c) \ 48 $(wildcard src/$(LIBRARY_NAME)/@OSNAME@/*.c) \
48 $(wildcard src/$(LIBRARY_NAME)/@OSNAME@/*.rc) 49 $(wildcard src/$(LIBRARY_NAME)/@OSNAME@/*.rc)
49 50
@@ -146,6 +147,19 @@ $(OBJDBG)/%.o: \ @@ -146,6 +147,19 @@ $(OBJDBG)/%.o: \
146 -o $@ -c $< 147 -o $@ -c $<
147 148
148 $(OBJDBG)/%.o: \ 149 $(OBJDBG)/%.o: \
  150 + %.cc \
  151 + $(DEPENDS)
  152 +
  153 + @echo $< ...
  154 + @$(MKDIR) $(@D)
  155 +
  156 + @$(CXX) \
  157 + $(CFLAGS) \
  158 + -Wall -Wextra -fstack-check \
  159 + -DDEBUG=1 \
  160 + -o $@ -c $<
  161 +
  162 +$(OBJDBG)/%.o: \
149 %.rc 163 %.rc
150 164
151 @echo $< ... 165 @echo $< ...
@@ -166,6 +180,17 @@ $(OBJRLS)/%.o: \ @@ -166,6 +180,17 @@ $(OBJRLS)/%.o: \
166 -o $@ -c $< 180 -o $@ -c $<
167 181
168 $(OBJRLS)/%.o: \ 182 $(OBJRLS)/%.o: \
  183 + %.cc \
  184 + $(DEPENDS)
  185 +
  186 + @echo $< ...
  187 + @$(MKDIR) $(@D)
  188 + @$(CXX) \
  189 + $(CFLAGS) \
  190 + -DNDEBUG=1 \
  191 + -o $@ -c $<
  192 +
  193 +$(OBJRLS)/%.o: \
169 %.rc 194 %.rc
170 195
171 @echo $< ... 196 @echo $< ...
@@ -89,6 +89,7 @@ case &quot;$host&quot; in @@ -89,6 +89,7 @@ case &quot;$host&quot; in
89 app_win32_revision=$(date +%y.%m.%d.%H) 89 app_win32_revision=$(date +%y.%m.%d.%H)
90 AC_SUBST(WIN32_VERSION,$app_win32_revision) 90 AC_SUBST(WIN32_VERSION,$app_win32_revision)
91 AC_CONFIG_FILES(src/plugin/windows/resources.rc) 91 AC_CONFIG_FILES(src/plugin/windows/resources.rc)
  92 + AC_CONFIG_FILES(src/hllapi/windows/resources.rc)
92 ;; 93 ;;
93 94
94 *) 95 *)
@@ -32,24 +32,46 @@ @@ -32,24 +32,46 @@
32 <Compiler> 32 <Compiler>
33 <Add option="-Wall" /> 33 <Add option="-Wall" />
34 </Compiler> 34 </Compiler>
35 - <Unit filename="src/plugin/linux/daemon.h" />  
36 - <Unit filename="src/plugin/linux/globals.h" />  
37 - <Unit filename="src/plugin/linux/gobject.c"> 35 + <Unit filename="src/daemon/linux/daemon.c">
38 <Option compilerVar="CC" /> 36 <Option compilerVar="CC" />
39 </Unit> 37 </Unit>
40 - <Unit filename="src/plugin/linux/main.c"> 38 + <Unit filename="src/daemon/linux/iocallback.c">
41 <Option compilerVar="CC" /> 39 <Option compilerVar="CC" />
42 </Unit> 40 </Unit>
43 - <Unit filename="src/plugin/linux/misc.c"> 41 + <Unit filename="src/hllapi/calls.cc" />
  42 + <Unit filename="src/hllapi/client.h" />
  43 + <Unit filename="src/hllapi/hllapi.c">
44 <Option compilerVar="CC" /> 44 <Option compilerVar="CC" />
45 </Unit> 45 </Unit>
46 - <Unit filename="src/plugin/linux/service.h" />  
47 - <Unit filename="src/plugin/windows/main.c"> 46 + <Unit filename="src/hllapi/remotectl.h" />
  47 + <Unit filename="src/include/config.h" />
  48 + <Unit filename="src/include/dbus-glue.h" />
  49 + <Unit filename="src/ipc3270c/linux/daemon.h" />
  50 + <Unit filename="src/ipc3270c/linux/globals.h" />
  51 + <Unit filename="src/ipc3270c/linux/gobject.c">
  52 + <Option compilerVar="CC" />
  53 + </Unit>
  54 + <Unit filename="src/ipc3270c/linux/main.c">
  55 + <Option compilerVar="CC" />
  56 + </Unit>
  57 + <Unit filename="src/ipc3270c/linux/misc.c">
48 <Option compilerVar="CC" /> 58 <Option compilerVar="CC" />
49 </Unit> 59 </Unit>
  60 + <Unit filename="src/ipc3270c/linux/service.h" />
  61 + <Unit filename="src/ipc3270c/windows/main.c">
  62 + <Option compilerVar="CC" />
  63 + </Unit>
  64 + <Unit filename="src/ipc3270c/windows/private.h" />
  65 + <Unit filename="src/ipc3270c/windows/resources.rc" />
  66 + <Unit filename="src/plugin/linux/daemon.h" />
  67 + <Unit filename="src/plugin/linux/globals.h" />
  68 + <Unit filename="src/plugin/linux/service.h" />
50 <Unit filename="src/plugin/windows/private.h" /> 69 <Unit filename="src/plugin/windows/private.h" />
51 <Unit filename="src/plugin/windows/resources.rc" /> 70 <Unit filename="src/plugin/windows/resources.rc" />
52 - <Unit filename="src/testprogram/testprogram.c"> 71 + <Unit filename="src/testprograms/hllapi.c">
  72 + <Option compilerVar="CC" />
  73 + </Unit>
  74 + <Unit filename="src/testprograms/ipc3270c.c">
53 <Option compilerVar="CC" /> 75 <Option compilerVar="CC" />
54 </Unit> 76 </Unit>
55 <Extensions> 77 <Extensions>
src/hllapi/calls.cc
  Diff comments   View file @6df069d
@@ -31,8 +31,8 @@ @@ -31,8 +31,8 @@
31 #include <cstdlib> 31 #include <cstdlib>
32 #include <cstring> 32 #include <cstring>
33 33
34 - #include <pw3270cpp.h>  
35 #include <pw3270/hllapi.h> 34 #include <pw3270/hllapi.h>
  35 + #include <pw3270cpp.h>
36 #include "client.h" 36 #include "client.h"
37 37
38 using namespace std; 38 using namespace std;
src/hllapi/windows/resources.rc.in 0 → 100644
  Diff comments   View file @6df069d
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
  1 +#include <windows.h>
  2 +
  3 +VS_VERSION_INFO VERSIONINFO
  4 +FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0
  5 +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0
  6 +
  7 +BEGIN
  8 +
  9 + BLOCK "StringFileInfo"
  10 + BEGIN
  11 + BLOCK "080904E4"
  12 + BEGIN
  13 + VALUE "FileDescription", "pw3270 HLLAPI Client Module\0"
  14 + VALUE "CompanyName", "Banco do Brasil S/A.\0"
  15 + VALUE "FileVersion", "@WIN32_VERSION@\0"
  16 + VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"
  17 + VALUE "OriginalFilename", "ipc3270@DLLEXT@\0"
  18 + VALUE "ProductName", "@PACKAGE_NAME@\0"
  19 + VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0"
  20 + END
  21 + END
  22 +
  23 + BLOCK "VarFileInfo"
  24 + BEGIN
  25 + VALUE "Translation", 0x809, 0x04E4
  26 + END
  27 +
  28 +END
  29 +