Download as
Browse Code »

Commit 012921c0118bf471c7e222e881b26d84c28f439a

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

Pequenas correções no módulos DBUS & Rexx

Showing 3 changed files with 18 additions and 17 deletions   Show diff stats
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @012921c
@@ -83,16 +83,16 @@ GLIB_LIBS=@GLIB_LIBS@ @@ -83,16 +83,16 @@ GLIB_LIBS=@GLIB_LIBS@
83 GTK_LIBS=@GTK_LIBS@ 83 GTK_LIBS=@GTK_LIBS@
84 84
85 ifeq ($(LIB3270_MODE),Debug) 85 ifeq ($(LIB3270_MODE),Debug)
86 - PW3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -lpw3270"  
87 - PW3270_CFLAGS="-I../../../src/include"  
88 - LIB3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -l3270" 86 + PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270
  87 + PW3270_CFLAGS=-I../../../src/include"
  88 + LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270
89 LIB3270_CFLAGS=-I../../../src/include 89 LIB3270_CFLAGS=-I../../../src/include
90 endif 90 endif
91 91
92 ifeq ($(LIB3270_MODE),Release) 92 ifeq ($(LIB3270_MODE),Release)
93 - PW3270_LIBS="-L../../../.bin/Release@DLLDIR@ -lpw3270"  
94 - PW3270_CFLAGS="-I../../../src/include"  
95 - LIB3270_LIBS="-L../../../.bin/Release@DLLDIR@ -l3270" 93 + PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -lpw3270
  94 + PW3270_CFLAGS=-I../../../src/include
  95 + LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l3270
96 LIB3270_CFLAGS=-I../../../src/include 96 LIB3270_CFLAGS=-I../../../src/include
97 endif 97 endif
98 98
@@ -125,6 +125,11 @@ $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $ @@ -125,6 +125,11 @@ $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $
125 @$(MKDIR) `dirname $@` 125 @$(MKDIR) `dirname $@`
126 $(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS) 126 $(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS)
127 127
  128 +$(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o)
  129 + @echo " CCLD `basename $@`"
  130 + @$(MKDIR) `dirname $@`
  131 + @$(CC) $(CFLAGS) -o $@ $^ $(DBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
  132 +
128 #---[ Debug targets ]---------------------------------------------------------- 133 #---[ Debug targets ]----------------------------------------------------------
129 134
130 Debug: $(BINDBG)/plugins/$(MODULE_NAME).so 135 Debug: $(BINDBG)/plugins/$(MODULE_NAME).so
src/plugins/dbus3270/test.sh
  Diff comments   View file @012921c
@@ -38,7 +38,7 @@ run_command() @@ -38,7 +38,7 @@ run_command()
38 ;; 38 ;;
39 39
40 enter) 40 enter)
41 - dbus-send --session --print-reply --dest=$DEST $BPATH $DEST.enter 41 + dbus-send --session --print-reply --dest=$DEST.$SESSION $BPATH $DEST.enter
42 ;; 42 ;;
43 43
44 *) 44 *)
@@ -78,14 +78,6 @@ do @@ -78,14 +78,6 @@ do
78 78
79 esac 79 esac
80 80
81 - elif [ -d $1 ]; then  
82 -  
83 - IMGNAME=$1  
84 -  
85 - if [ -e $IMGNAME/matriz.conf ]; then  
86 - . $IMGNAME/matriz.conf  
87 - fi  
88 -  
89 else 81 else
90 run_command $@ 82 run_command $@
91 exit 0 83 exit 0
src/plugins/rx3270/rxapimain.cc
  Diff comments   View file @012921c
@@ -59,6 +59,10 @@ @@ -59,6 +59,10 @@
59 int librx3270_unloaded(void) __attribute__((destructor)); 59 int librx3270_unloaded(void) __attribute__((destructor));
60 #endif 60 #endif
61 61
  62 + LIB3270_EXPORT RexxRoutineEntry rx3270_functions[];
  63 + LIB3270_EXPORT RexxPackageEntry rx3270_package_entry;
  64 +
  65 +
62 static enum rx3270mode active_mode = RX3270_MODE_UNDEFINED; 66 static enum rx3270mode active_mode = RX3270_MODE_UNDEFINED;
63 67
64 /*--[ Implement ]------------------------------------------------------------------------------------*/ 68 /*--[ Implement ]------------------------------------------------------------------------------------*/
@@ -116,7 +120,7 @@ int librx3270_unloaded(void) @@ -116,7 +120,7 @@ int librx3270_unloaded(void)
116 } 120 }
117 121
118 // now build the actual entry list 122 // now build the actual entry list
119 -LIB3270_EXPORT RexxRoutineEntry rx3270_functions[] = 123 +RexxRoutineEntry rx3270_functions[] =
120 { 124 {
121 REXX_TYPED_ROUTINE(rx3270version, rx3270version), 125 REXX_TYPED_ROUTINE(rx3270version, rx3270version),
122 REXX_TYPED_ROUTINE(rx3270QueryCState, rx3270QueryCState), 126 REXX_TYPED_ROUTINE(rx3270QueryCState, rx3270QueryCState),
@@ -139,7 +143,7 @@ LIB3270_EXPORT RexxRoutineEntry rx3270_functions[] = @@ -139,7 +143,7 @@ LIB3270_EXPORT RexxRoutineEntry rx3270_functions[] =
139 REXX_LAST_METHOD() 143 REXX_LAST_METHOD()
140 }; 144 };
141 145
142 -LIB3270_EXPORT RexxPackageEntry rx3270_package_entry = 146 +RexxPackageEntry rx3270_package_entry =
143 { 147 {
144 STANDARD_PACKAGE_HEADER 148 STANDARD_PACKAGE_HEADER
145 REXX_CURRENT_INTERPRETER_VERSION, // anything after 4.0.0 will work 149 REXX_CURRENT_INTERPRETER_VERSION, // anything after 4.0.0 will work