Build on Ubuntu 12.10

java/exe/jpwr_rt_gdh/src/jpwr_rt_hist.cpp

@@ -210,7 +210,7 @@ JNIEXPORT jobjectArray JNICALL Java_jpwr_rt_Hist_getHistList
     printf(" Fel vid skapande av databashandtag avslutar\n");
     goto err;
   }
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0
+#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR > 0
   ret = dataBaseP->open(dataBaseP, NULL, dbName, NULL, DATABASETYPE, DB_RDONLY, 0);
 #else
   ret = dataBaseP->open(dataBaseP, dbName, NULL, DATABASETYPE, DB_RDONLY, 0);

src/exe/rt_report/src/rt_report.cpp

@@ -460,15 +460,15 @@ void rt_report::create_report( pwr_sClass_Report *o)
 	return;
       }
 
-      unsigned int i = 0;
-      while( ftext.good() && i < sizeof(text) - 1) {
-	text[i++] = ftext.get();
+      unsigned int j = 0;
+      while( ftext.good() && j < sizeof(text) - 1) {
+	text[j++] = ftext.get();
       }
       ftext.close();
 
-      if ( i == 0)
+      if ( j == 0)
 	return;
-      text[i-1] = 0;
+      text[j-1] = 0;
       
       // snprintf( text, sizeof(text), "Proview report\n%s\n", o->Subject);
       // strcpy( text, "Proview report");

src/tools/pkg/deb/pwr/control

 Package: pwr48
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: i386
@@ -47,3 +47,6 @@ Description: Proview development and runtime environment package
    - Configure operator log in OpPlace object.
    - Plc, several processes, handling of error log and process status.
    - DataArithmL with 8191 characters added.
+ 4.8.6-3
+   - Ge axis with dynamic scale.
+   - sqlite history database.

src/tools/pkg/deb/pwrdemo/control

 Package: pwrdemo48
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: i386
-Depends: pwr48 (>= 4.8.6-1)
+Depends: pwr48 (>= 4.8.6-3)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  Proview Demo Project

src/tools/pkg/deb/pwrrt/control

 Package: pwrrt
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: i386
@@ -40,3 +40,6 @@ Description:
    - Configure operator log in OpPlace object.
    - Plc, several processes, handling of error log and process status.
    - DataArithmL with 8191 characters added.
+ 4.8.6-3
+   - Ge axis with dynamic scale.
+   - sqlite history database.

src/tools/pkg/deb/pwrsev/control

 Package: pwrsev
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: i386
@@ -9,3 +9,6 @@ Maintainer: Proview <postmaster@proview.se>
 Description:
  Proview storage environment
  4.8.0-1 Base release
+ 4.8.6-3
+   - sqlite history database.
+   - statistic table.

src/tools/pkg/ubu/pwr/control

@@ -3,9 +3,9 @@ Section: devel
 Package: pwr48
 Priority: optional
 Maintainer: Proview <postmaster@proview.se>
-Version: 4.8.6-1
+Version: 4.8.6-3
 Architecture: i386
-Depends: libc6 (>= 2.15-0ubuntu10), libgtk2.0-0 (>= 2.24.10-0ubuntu6), libasound2 (>= 1.0.25-1ubuntu10), libdb5.1 (>=5.1.25-11build1), libdb5.1++ (>=5.1.25-11build1), libmysql++3 (>= 3.1.0-2), g++ (>= 4:4.6.1-2ubuntu5), xfonts-100dpi
+Depends: libc6 (>= 2.15-0ubuntu20), libgtk2.0-0 (>= 2.24.13-0ubuntu2), libasound2 (>= 1.0.25-3ubuntu3), libdb5.1 (>=5.1.29-5ubuntu2), libdb5.1++ (>=5.1.29-5ubuntu2), libmysql++3 (>= 3.1.0-2), libsqlite3-0 (>= 3.7.13-1), g++ (>= 4:4.7.2-1ubuntu2), xfonts-100dpi
 Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Homepage: http://www.proview.se
 Installed-Size: 1114020
@@ -50,3 +50,6 @@ Description: Proview development and runtime environment package
    - Configure operator log in OpPlace object.
    - Plc, several processes, handling of error log and process status.
    - DataArithmL with 8191 characters added.
+ 4.8.6-3
+   - Ge axis with dynamic scale.
+   - sqlite history database.
\ No newline at end of file

src/tools/pkg/ubu/pwrdemo/control

 Package: pwrdemo48
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: i386
-Depends: pwr48 (>= 4.8.6-1)
+Depends: pwr48 (>= 4.8.6-3)
 Replaces:
 Maintainer: Proview <postmaster@proview.se>
 Homepage: http://www.proview.se

src/tools/pkg/ubu/pwrrt/control

 Package: pwrrt
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: i386
-Depends: libc6 (>= 2.15-0ubuntu10), libgtk2.0-0 (>= 2.24.10-0ubuntu5), libasound2 (>= 1.0.25-1ubuntu10), libdb5.1 (>=5.1.25-11build1), xfonts-100dpi
+Depends: libc6 (>= 2.15-0ubuntu20), libgtk2.0-0 (>= 2.24.13-0ubuntu2), libasound2 (>= 1.0.25-3ubuntu3), libdb5.1 (>=5.1.29-5ubuntu2), libsqlite3-0 (>= 3.7.13-1), xfonts-100dpi
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48
 Maintainer: Proview <postmaster@proview.se>
 Homepage: http://www.proview.se
@@ -37,3 +37,6 @@ Description:
    - Configure operator log in OpPlace object.
    - Plc, several processes, handling of error log and process status.
    - DataArithmL with 8191 characters added.
+ 4.8.6-3
+   - Ge axis with dynamic scale.
+   - sqlite history database.
\ No newline at end of file

src/tools/pkg/ubu/pwrsev/control

 Package: pwrsev
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: i386
-Depends: libc6 (>= 2.15-0ubuntu10), libgtk2.0-0 (>= 2.24.10-0ubuntu6), libasound2 (>= 1.0.25-1ubuntu10), libdb5.1 (>=5.1.25-11build1), libmysql++3 (>= 3.1.0-2), xfonts-100dpi
+Depends: libc6 (>= 2.15-0ubuntu20), libgtk2.0-0 (>= 2.24.13-0ubuntu2), libasound2 (>= 1.0.25-3ubuntu3), libdb5.1 (>=5.1.25-5ubuntu2), libmysql++3 (>= 3.1.0-2), libsqlite3-0 (>= 3.7.13-1), xfonts-100dpi
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48
 Maintainer: Proview <postmaster@proview.se>
 Homepage: http://www.proview.se
@@ -11,3 +11,6 @@ Installed-Size: 655536
 Description:
  Proview storage environment
  4.8.0-1 Base release
+ 4.8.6-3
+   - sqlite history database.
+   - statistic table.

src/tools/pkg/ubu_x86_64/pwr/control

@@ -3,9 +3,9 @@ Section: devel
 Package: pwr48
 Priority: optional
 Maintainer: Proview <postmaster@proview.se>
-Version: 4.8.6-1
+Version: 4.8.6-3
 Architecture: amd64
-Depends: libc6 (>= 2.15-0ubuntu10), libgtk2.0-0 (>= 2.24.10-0ubuntu6), libasound2 (>= 1.0.25-1ubuntu10), libdb5.1 (>=5.1.25-11build1), libdb5.1++ (>=5.1.25-11build1), libmysql++3 (>= 3.1.0-2), g++ (>= 4:4.6.1-2ubuntu5), xfonts-100dpi
+Depends: libc6 (>= 2.15-0ubuntu20), libgtk2.0-0 (>= 2.24.13-0ubuntu2), libasound2 (>= 1.0.25-3ubuntu3), libdb5.1 (>=5.1.29-5ubuntu2), libdb5.1++ (>=5.1.29-5ubuntu2), libmysql++3 (>= 3.1.0-2), libsqlite3-0 (>= 3.7.13-1), g++ (>= 4:4.7.2-1ubuntu2), xfonts-100dpi
 Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Homepage: http://www.proview.se
 Installed-Size: 1114020
@@ -50,3 +50,6 @@ Description: Proview development and runtime environment package
    - Configure operator log in OpPlace object.
    - Plc, several processes, handling of error log and process status.
    - DataArithmL with 8191 characters added.
+ 4.8.6-3
+   - Ge axis with dynamic scale.
+   - sqlite history database.

src/tools/pkg/ubu_x86_64/pwrdemo/control

 Package: pwrdemo48
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: pwr48 (>= 4.8.6-1)
+Depends: pwr48 (>= 4.8.6-3)
 Replaces:
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package

src/tools/pkg/ubu_x86_64/pwrrt/control

 Package: pwrrt
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: libc6 (>= 2.15-0ubuntu10), libgtk2.0-0 (>= 2.24.10-0ubuntu5), libasound2 (>= 1.0.25-1ubuntu10), libdb5.1 (>=5.1.25-11build1), xfonts-100dpi
+Depends: libc6 (>= 2.15-0ubuntu20), libgtk2.0-0 (>= 2.24.13-0ubuntu2), libasound2 (>= 1.0.25-3ubuntu3), libdb5.1 (>=5.1.29-5ubuntu2), libsqlite3-0 (>= 3.7.13-1), xfonts-100dpi
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Maintainer: Proview <postmaster@proview.se>
 Homepage: http://www.proview.se
@@ -37,3 +37,6 @@ Description:
    - Configure operator log in OpPlace object.
    - Plc, several processes, handling of error log and process status.
    - DataArithmL with 8191 characters added.
+ 4.8.6-3
+   - Ge axis with dynamic scale.
+   - sqlite history database.

src/tools/pkg/ubu_x86_64/pwrsev/control

 Package: pwrsev
-Version: 4.8.6-1
+Version: 4.8.6-3
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: libc6 (>= 2.15-0ubuntu10), libgtk2.0-0 (>= 2.24.10-0ubuntu6), libasound2 (>= 1.0.25-1ubuntu10), libdb5.1 (>=5.1.25-11build1), libmysql++3 (>= 3.1.0-2), xfonts-100dpi
+Depends: libc6 (>= 2.15-0ubuntu20), libgtk2.0-0 (>= 2.24.13-0ubuntu2), libasound2 (>= 1.0.25-3ubuntu3), libdb5.1 (>=5.1.25-5ubuntu2), libmysql++3 (>= 3.1.0-2), libsqlite3-0 (>= 3.7.13-1), xfonts-100dpi
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Maintainer: Proview <postmaster@proview.se>
 Description:
  Proview storage environment
  4.8.0-1 Base release
+ 4.8.6-3
+   - sqlite history database.
+   - statistic table.

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -238,6 +238,10 @@ let inc_cnt=0
 let lib_cnt=0
 let i=0
 hwpl=`eval uname -i`
+ubuntu_ver=`cat /etc/issue | grep Ubuntu | awk '{ print $2 }'`
+if [ "$ubuntu_ver" != "" ] &&[ "$ubuntu_ver" != "12.04" ] && [ $hwpl == "i686" ] ; then
+  hwpl=i386
+fi
 
 # Bash
 if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then
@@ -368,7 +372,7 @@ else
   pwre_config_check_lib libz      LIBZ     lib lib 0 "/usr/lib/libz.so:/usr/lib/libz.a:/usr/lib/$hwpl-linux-gnu/libz.so"
   pwre_config_check_lib libcrypt  LIBCRYPT lib lib 0 "/usr/lib/libcrypt.so:/usr/lib/libcrypt.a:/usr/lib/$hwpl-linux-gnu/libcrypt.so"
   pwre_config_check_lib librt     LIBRT    lib lib 0 "/usr/lib/librt.so:/usr/lib/librt.a:/usr/lib/$hwpl-linux-gnu/librt.so"
-  pwre_config_check_lib libfl     LIBFL    lib lib 0 "/usr/lib/libfl.so:/usr/lib/libfl.a"
+  pwre_config_check_lib libfl     LIBFL    lib lib 0 "/usr/lib/libfl.so:/usr/lib/libfl.a:/usr/lib/$hwpl-linux-gnu/libfl.so"
   pwre_config_check_lib libX11    LIBX11   lib lib 0 "/usr/lib/libX11.so:/usr/lib/$hwpl-linux-gnu/libX11.so"
 
   pwre_config_check_include antlr ANTLR 1 "/usr/include/antlr/CommonAST.hpp:/usr/local/include/antlr/CommonAST.hpp"

xtt/lib/cow/src/cow_log.cpp

@@ -39,6 +39,7 @@
 #include <fstream>
 #include <iomanip>
 #include <string.h>
+#include <unistd.h>
 #include "pwr.h"
 #include "co_cdh.h"
 #include "co_time.h"