5.7.1-1 Release

src/exe/rt_post/src/rt_post.cpp

@@ -201,7 +201,7 @@ pwr_tStatus rt_post::mh_alarm_bc(mh_sMessage* MsgP)
     return 1;
 
   if (!(event->Info.EventFlags & pwr_mEventFlagsMask_Email)
-      || !(event->Info.EventFlags & pwr_mEventFlagsMask_SMS))
+      && !(event->Info.EventFlags & pwr_mEventFlagsMask_SMS))
     return 1;
 
   // Skip events older than 10 minutes

src/exp/com/src/rt_webmonelog.sh

@@ -38,4 +38,5 @@
 export LD_LIBRARY_PATH=$pwr_exe
 export CLASSPATH=$pwr_lib/pwr_rt.jar:$pwr_lib/pwr_jop.jar
 #$jdk_home/java jpwr.rt.HistServer
-$jdk_home/java -Djava.library.path=$jdk/lib/i386/client:$jdk/lib/i386:$jdk/../lib/i386:$pwr_exe jpwr.rt.HistServer
+java jpwr.rt.HistServer
+#$jdk_home/java -Djava.library.path=$jdk/lib/i386/client:$jdk/lib/i386:$jdk/../lib/i386:$pwr_exe jpwr.rt.HistServer

src/exp/com/src/rt_websocketserver.sh

@@ -37,4 +37,5 @@
 #
 export LD_LIBRARY_PATH=$pwr_exe
 export CLASSPATH=$pwr_lib/pwr_rt.jar:$pwr_lib/pwr_jop.jar
-$jdk_home/java -Djava.library.path=$jdk/lib/i386/client:$jdk/lib/i386:$jdk/../lib/i386:$pwr_exe jpwr.rt.GdhWebSocketServer
+java  jpwr.rt.GdhWebSocketServer
+#$jdk_home/java -Djava.library.path=$jdk/lib/i386/client:$jdk/lib/i386:$jdk/../lib/i386:$pwr_exe jpwr.rt.GdhWebSocketServer

src/exp/pwrrt/src/makefile

@@ -35,18 +35,23 @@ silent :
 .SUFFIXES:
 
 $(exe_dir)/pwrrt.so : pwrrtmodule.c
-	@ if [ "$(PWRE_CONF_PYDEV)" ==  "1" ]; then\
-	    echo "Bulding Python c extension pwrrt";\
-	    python setup_pwrrt.py -q build --build-base $(bld_dir);\
-	    if [ "$(pwre_hw)" == "hw_x86_64" ]; then \
-	      mv $(bld_dir)/lib.linux-x86_64-2.7/pwrrt.so $(pwr_exe); \
-	    elif [ "$(pwre_hw)" == "hw_x86" ]; then \
-	      mv $(bld_dir)/lib.linux-i686-2.7/pwrrt.so $(pwr_exe); \
-	    fi;\
-	    python setup_pwrrt.py -q install_egg_info --install-dir $(pwr_exe);\
-	  else\
-	    echo "Not building Python c extension pwrrt";\
-	  fi
+	echo "Bulding Python c extension pwrrt";\
+	python setup_pwrrt.py -q build --build-base $(bld_dir);\
+	mv $(bld_dir)/lib.linux-x86_64-2.7/pwrrt.so $(pwr_exe); \
+
+#$(exe_dir)/pwrrt.so : pwrrtmodule.c
+#	if [ "$(PWRE_CONF_PYDEV)" == "1" ]; then\
+#	    echo "Bulding Python c extension pwrrt";\
+#	    python setup_pwrrt.py -q build --build-base $(bld_dir);\
+#	    if [ "$(pwre_hw)" == "hw_x86_64" ]; then \
+#	      mv $(bld_dir)/lib.linux-x86_64-2.7/pwrrt.so $(pwr_exe); \
+#	    elif [ "$(pwre_hw)" == "hw_x86" ]; then \
+#	      mv $(bld_dir)/lib.linux-i686-2.7/pwrrt.so $(pwr_exe); \
+#	    fi;\
+#	    python setup_pwrrt.py -q install_egg_info --install-dir $(pwr_exe);\
+#	  else\
+#	    echo "Not building Python c extension pwrrt";\
+#	  fi
 
 clean_pwrrt.so : pwrrtmodule.c
 	rm $(pwr_exe)/pwrrt.so

src/tools/pkg/deb_x86_64/pwr/control

@@ -3,7 +3,7 @@ Version: 5.7.1-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: libc6 (>= 2.24-11), libgtk2.0-0 (>= 2.24.31-2), libasound2 (>= 1.1.3-5), libdb5.3 (>=5.3.28-12), libdb5.3++ (>= 5.3.28-12), libsqlite3-0 (>= 3.16.2-5), librsvg2-2 (>= 2.40.16-1), g++ (>= 4:6.3.0-4), xterm, libmysql++3v5 (>=3.2.2+pristine-2), librabbitmq4 (>= 0.8.0-1)
+Depends: libc6 (>= 2.28-10), libgtk2.0-0 (>= 2.24.32-3), libasound2 (>= 1.1.8-1), libdb5.3 (>=5.3.28+dfsg1-0.5), libdb5.3++ (>= 5.3.28+dfsg1-0.5), libsqlite3-0 (>= 3.27.2-3), librsvg2-2 (>= 2.44.10-2.1), g++ (>= 4:8.3.0-1), libmariadb3 (>=1:10.3.18-0+deb10u1), librabbitmq4 (>= 0.9.0-0.2), libusb-1.0-0 (>= 2:1.0.22-2), libhdf5-openmpi-103 (>= 1.10.4+repack-10), libgstreamer1.0-0 (>= 1.14.4-1), libgstreamer-plugins-base1.0-0 (>= 1.14.4-2), xfonts-100dpi, sudo, procps, xterm
 Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54,pwr55,pwr56
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview development and runtime environment package

src/tools/pkg/deb_x86_64/pwrdemo/control

@@ -3,7 +3,7 @@ Version: 5.7.1-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: sudo, pwr57 (>= 5.7.0-1)
+Depends: sudo, pwr57 (>= 5.7.1-1)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  5.7.1-1 Base release

src/tools/pkg/deb_x86_64/pwrrpi/control

-Package: pwrrpi56
-Version: 5.6.1-1
+Package: pwrrpi57
+Version: 5.7.1-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: pwr56 (>= 5.6.1-1)
-Replaces: pwr56
+Depends: pwr57 (>= 5.7.1-1)
+Replaces: pwr57
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview RPI development package
- 5.6.1-1 Base release
+ 5.7.1-1 Base release

src/tools/pkg/deb_x86_64/pwrrt/control

@@ -3,7 +3,7 @@ Version: 5.7.1-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: libc6 (>= 2.24-11), libgtk2.0-0 (>= 2.24.31-2), libasound2 (>= 1.1.3-5), libsqlite3-0 (>= 3.16.2-5), libdb5.3 (>=5.3.28-12), librabbitmq4 (>= 0.8.0-1)
+Depends: libc6 (>= 2.28-10), libgtk2.0-0 (>= 2.24.32-3), libasound2 (>= 1.1.8-1), libdb5.3 (>=5.3.28+dfsg1-0.5), libdb5.3++ (>= 5.3.28+dfsg1-0.5), libsqlite3-0 (>= 3.27.2-3), librsvg2-2 (>= 2.44.10-2.1), g++ (>= 4:8.3.0-1), libmariadb3 (>=1:10.3.18-0+deb10u1), librabbitmq4 (>= 0.9.0-0.2), libusb-1.0-0 (>= 2:1.0.22-2), libhdf5-openmpi-103 (>= 1.10.4+repack-10), libgstreamer1.0-0 (>= 1.14.4-1), libgstreamer-plugins-base1.0-0 (>= 1.14.4-2), xfonts-100dpi, sudo, procps, xterm
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54,pwr55,pwr56
 Maintainer: Proview <postmaster@proview.se>
 Description:

src/tools/pkg/deb_x86_64/pwrsev/control

@@ -3,7 +3,7 @@ Version: 5.7.1-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: libc6 (>= 2.24-11), libgtk2.0-0 (>= 2.24.31-2), libasound2 (>= 1.1.3-5), libsqlite3-0 (>= 3.16.2-5), libdb5.3 (>=5.3.28-12), libmariadbclient18 (>= 10.1.26-0)
+Depends: libc6 (>= 2.28-10), libgtk2.0-0 (>= 2.24.32-3), libasound2 (>= 1.1.8-1), libdb5.3 (>=5.3.28+dfsg1-0.5), libdb5.3++ (>= 5.3.28+dfsg1-0.5), libsqlite3-0 (>= 3.27.2-3), librsvg2-2 (>= 2.44.10-2.1), g++ (>= 4:8.3.0-1), libmariadb3 (>=1:10.3.18-0+deb10u1), librabbitmq4 (>= 0.9.0-0.2), libusb-1.0-0 (>= 2:1.0.22-2), libhdf5-openmpi-103 (>= 1.10.4+repack-10), libgstreamer1.0-0 (>= 1.14.4-1), libgstreamer-plugins-base1.0-0 (>= 1.14.4-2), xfonts-100dpi, sudo, procps, xterm
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54,pwr55,pwr56
 Maintainer: Proview <postmaster@proview.se>
 Description:

wb/exp/pwrwb/src/makefile

@@ -35,18 +35,22 @@ silent :
 .SUFFIXES:
 
 $(exe_dir)/pwrwb.so : pwrwbmodule.cpp
-	@ if [ $(PWRE_CONF_PYDEV) -eq 1 ]; then\
-	    echo "Bulding Python c extension pwrwb";\
-	    python setup_pwrwb.py -q build --build-base $(bld_dir);\
-	    if [ "$(pwre_hw)" == "hw_x86_64" ]; then \
-	      mv $(bld_dir)/lib.linux-x86_64-2.7/pwrwb.so $(pwr_exe); \
-	    elif [ "$(pwre_hw)" == "hw_x86" ]; then \
-	      mv $(bld_dir)/lib.linux-i686-2.7/pwrwb.so $(pwr_exe); \
-	    fi;\
-	    python setup_pwrwb.py -q install_egg_info --install-dir $(pwr_exe);\
-	  else\
-	    echo "Not building Python c extension pwrwb";\
-	  fi
+	python setup_pwrwb.py -q build --build-base $(bld_dir);\
+	mv $(bld_dir)/lib.linux-x86_64-2.7/pwrwb.so $(pwr_exe);
+
+#$(exe_dir)/pwrwb.so : pwrwbmodule.cpp
+#	@ if [ $(PWRE_CONF_PYDEV) -eq 1 ]; then\
+#	    echo "Bulding Python c extension pwrwb";\
+#	    python setup_pwrwb.py -q build --build-base $(bld_dir);\
+#	    if [ "$(pwre_hw)" == "hw_x86_64" ]; then \
+#	      mv $(bld_dir)/lib.linux-x86_64-2.7/pwrwb.so $(pwr_exe); \
+#	    elif [ "$(pwre_hw)" == "hw_x86" ]; then \
+#	      mv $(bld_dir)/lib.linux-i686-2.7/pwrwb.so $(pwr_exe); \
+#	    fi;\
+#	    python setup_pwrwb.py -q install_egg_info --install-dir $(pwr_exe);\
+#	  else\
+#	    echo "Not building Python c extension pwrwb";\
+#	  fi
 
 clean_pwrwb.so : pwrwbmodule.cpp
 	rm $(pwr_exe)/pwrwb.so

wb/exp/pwrwb/src/setup_pwrwb.py

@@ -7,7 +7,7 @@ pwr_lib = os.environ['pwr_elib']
 pwr_obj = os.environ['pwr_eobj']
 pwr_inc = os.environ['pwr_einc']
 try:
-    pwre_conf_qt = os.environ['PWRE_CONF_QT']
+    pwre_conf_qt = os.environ['PWRE_CONF_GTK']
 except:
     pwre_conf_qt = ""
 
@@ -46,8 +46,8 @@ pwrwbmodule = Extension( name='pwrwb',
                          library_dirs=[pwr_lib],
                          libraries=libs +
                          ['db_cxx', 'rpcsvc', 'asound', 'pthread',
-                          'm', 'db', 'z', 'crypt', 'rt', 'fl', 'X11', 'mysqlclient',
-                          'sqlite3', 'rsvg-2', 'QtCore', 'QtGui'] + xlibs,
+                          'm', 'db', 'z', 'crypt', 'rt', 'X11', 'mysqlclient',
+                          'sqlite3', 'rsvg-2'] + xlibs,
 #                        extra_link_args=['-L/usr/lib/x86_64-linux-gnu', commands.getoutput('pkg-config --libs gtk+-2.0')],
                          language='c++'
                        )

xtt/lib/flow/src/flow_ctx.cpp

@@ -104,8 +104,8 @@ FlowCtx::~FlowCtx()
   move_clear();
   paste_clear();
   delete_all();
-  if (scroll_data)
-    free(scroll_data);
+  //if (scroll_data)
+  //  free(scroll_data);
 
   for (int i = 0; i < a_nc.a_size; i++) {
     element = a_nc.a[i];