Merge branch 'master' of newton:/data1/x0-0-0/pwr

src/tools/bld/src/os_linux/hw_arm/variables.mk

@@ -22,6 +22,7 @@ lis_dir	:= $(module_root)/lis
 kit_dir	:= $(module_root)/kit
 src_dir	:= $(module_root)/src
 load_dir := $(module_root)/load
+web_dir := $(module_root)/web
 
 doc_dir	:= $(release_root)/exp/doc
 elib_dir := $(release_root)/exp/lib

src/tools/pkg/deb_x86_64/pwrrpi/README

+
+	Package pwrrpi containing runtime archives compiled with crosscompiler for raspbian on Raspberry PI.
+
+	1. Install cross compiler
+
+	sudo apt-get install gcc-6-arm-linux-gnueabihf-base
+	                     gcc-6-arm-linux-gnueabihf
+                             g++-6-arm-linux-gnueabihf
+
+	2. Define pwre links to the compiler tools
+
+	export pwre_cc=arm-linux-gnueabihf-gcc-6
+	export pwre_cxx=arm-linux-gnueabihf-g++-6
+	export pwre_ar=arm-linux-gnueabihf-ar
+
+	3. Define a link to the exe directory of the host release
+
+	export pwre_host_exe=/data1/x5-0-0/rls/os_linux/hw_x86/exp/exe
+
+	4. Create an pwre environment for the rpi release with hardware arm
+
+	pwre add x500rpi
+	Source root? /data0/x5-0-0/pwr/src
+	Import root? /data0/x5-0-0/rls/os_linux/hw_x86
+	Build root? /data0/x5-0-0/rls
+	Build type?
+	OS? linux
+	Hardware? arm
+
+	5. Build arm release
+
+	pwre init x500rpi
+	mkdir $pwre_broot
+	pwre configure --ebuild
+	pwre create_all_modules
+	pwre import rt
+	pwre import java
+	pwre ebuild rt
+
+	6. Build the package
+
+	Set version in the control file and build with
+
+	pwre build tools/pkg deb src rpi
+

src/tools/pkg/deb_x86_64/pwrrpi/build.sh

+#!/bin/bash
+
+aroot="/usr/pwrp/adm"
+
+# Get version
+if [ -e $pwr_inc/pwr_version.h ]; then
+  ver=`eval cat $pwr_inc/pwr_version.h | grep "\bpwrv_cWbdbVersionShortStr\b" | awk '{print $3}'`
+
+  if [ -z $ver ]; then
+    echo "Unable to get pwr version"
+    ver="V00"
+  fi
+  ver=${ver:2:2}
+fi
+
+if [ "$1" == "-v" ]; then
+  exit
+fi
+
+pkgroot=$pwre_broot/$pwre_target/bld/pkg/pwrrpi$ver
+pkgsrc=$pwre_sroot/tools/pkg/deb/pwrrpi
+rpi_target=os_linux/hw_arm
+
+echo "-- Building pwrrpi$ver"
+
+# Create directories
+mkdir -p $pkgroot/DEBIAN
+mkdir -p $pkgroot/usr/share/doc/pwrrpi$ver
+mkdir -p $pkgroot/usr/pwrp
+mkdir -p $pkgroot/etc
+
+find $pkgroot -type d | xargs chmod 755
+
+# control
+cp $pkgsrc/control $pkgroot/DEBIAN
+echo "#!/bin/bash" > $pkgroot/DEBIAN/postinst
+echo "ver=\"$ver\"" >> $pkgroot/DEBIAN/postinst
+echo "pwre_target=\"$pwre_target\"" >> $pkgroot/DEBIAN/postinst
+cat $pkgsrc/postinst >> $pkgroot/DEBIAN/postinst
+chmod a+x $pkgroot/DEBIAN/postinst
+cp $pkgsrc/prerm $pkgroot/DEBIAN
+
+# copyright
+cp $pkgsrc/copyright $pkgroot/usr/share/doc/pwrrpi$ver
+
+# changelog
+cp $pkgsrc/changelog $pkgroot/usr/share/doc/pwrrpi$ver
+gzip -fq --best $pkgroot/usr/share/doc/pwrrpi$ver/changelog
+
+# changelog.Debian
+cp $pkgsrc/changelog.Debian $pkgroot/usr/share/doc/pwrrpi$ver
+gzip -fq --best $pkgroot/usr/share/doc/pwrrpi$ver/changelog.Debian
+
+# Copy proview
+mkdir $pkgroot/usr/pwr$ver
+currentdir="`eval pwd`"
+tarfile=$pwre_broot/$pwre_target/bld/pkg/pwrtmp.tar
+cd $pwre_broot
+echo "-- copy release to package tree"
+tar -cf $tarfile $rpi_target/exp
+cd $pkgroot/usr/pwr$ver
+tar -xf $tarfile
+rm $tarfile
+cd $currentdir
+
+
+# Copy adm files to cnf
+#echo "pwrp set base V${ver:0:1}.${ver:1:1}" >> $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/pwr_setup.sh
+
+# Create package
+echo "-- Building package"
+if which fakeroot > /dev/null; then
+  fakeroot dpkg -b $pkgroot $pwre_broot/$pwre_target/bld/pkg
+else
+  dpkg -b $pkgroot $pwre_broot/$pwre_target/bld/pkg
+fi
+
+rm -r $pkgroot
+
+
+
+
+
+
+
+
+
+
+
+

src/tools/pkg/deb_x86_64/pwrrpi/changelog

+Proview V5.1.0 (5.1.0-1)
\ No newline at end of file

src/tools/pkg/deb_x86_64/pwrrpi/changelog.Debian

+Proview. See also normal changelog file.
\ No newline at end of file

src/tools/pkg/deb_x86_64/pwrrpi/control

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

src/tools/pkg/deb_x86_64/pwrrpi/copyright

+Proview
+
+Copyright: SSAB EMEA AB <www.ssab.com>
+
+2014-02-03
+
+The home page of Proview is at: 
+http://www.proview.se

src/tools/pkg/deb_x86_64/pwrrpi/postinst

+#!/bin/sh
+set -e
+
+# ver=""
+# pwre_target=""
+
+echo "Here in postinst..."
+# Automatically added by dh_installdocs
+if [ "$1" = "configure" ]; then
+        if [ -d /usr/doc -a ! -e /usr/doc/pwrtest -a -d /usr/share/doc/pwrtest ]; then
+                ln -sf ../share/doc/pwrtest /usr/doc/pwrtest
+        fi
+fi
+# End automatically added section
+
+aroot="/usr/pwrp/adm"
+
+
+echo "Change owner of files to pwrp"
+chown -R pwrp /usr/pwr$ver
+chgrp -R pwrp /usr/pwr$ver
+
+chmod u+s /usr/pwr$ver/$pwre_target/exp/exe/rt_ini
+chmod u+s /usr/pwr$ver/$pwre_target/exp/exe/rt_rtt
+
+# Insert base in projectlist
+#if [ ! -e $aroot/db/pwr_projectlist.dat ]; then
+#  echo "%base V${ver:0:1}.${ver:1:1}rpi /usr/pwr$ver" > $aroot/db/pwr_projectlist.dat
+#else
+#  set +e
+#  ptst=`eval grep "^%base" $aroot/db/pwr_projectlist.dat | grep "\bV${ver:0:1}.${ver:1:1}rpi\b"`
+#  set -e
+#  if [ "$ptst" = "" ]; then
+#    echo "%base V${ver:0:1}.${ver:1:1}rpi /usr/pwr$ver" >> $aroot/db/pwr_projectlist.dat
+#  fi
+#fi
+
+# Change group to pwrp
+chmod a+w /usr/pwr$ver/$pwre_target/exp/load/*.dbs
+
+
+
+
+

src/tools/pkg/deb_x86_64/pwrrpi/prerm

+#!/bin/sh
+set -e
+# Automatically added by dh_installdocs
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/pwrtest ]; then
+        rm -f /usr/doc/pwrtest
+fi
+# End automatically added section

src/tools/pkg/deb_x86_64/src/os_templ/hw_templ/makefile

@@ -30,6 +30,7 @@ copy :
 lib :
 
 exe : $(bld_dir)/control_pwrrt $(bld_dir)/control_pwr $(bld_dir)/control_pwrdemo $(bld_dir)/control_pwrsev
+rpi : $(bld_dir)/control_pwrrpi
 
 clean :
 
@@ -60,5 +61,9 @@ $(bld_dir)/control_pwrsev : ../../../pwrsev/control
 	@ ../../../pwrsev/build.sh
 	@ cp $(source) $(target)
 
+$(bld_dir)/control_pwrrpi : ../../../pwrrpi/control
+	@ echo "build $(target)"
+	@ ../../../pwrrpi/build.sh
+	@ cp $(source) $(target)
 
 

src/tools/pkg/raspbian/pwr/control

-Package: pwr55
+Package: pwr56
 Version: 5.6.1-1
 Section: base
 Priority: optional
 Architecture: armhf
-Depends: libc6 (>= 2.19-18+deb8u3), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1+rpi1), libdb5.3 (>=5.3.28-9), libdb5.3++ (>= 5.3.28-9), libmysql++3 (>= 3.2.1+pristine-1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), librsvg2-2 (>= 2.40.5-1), g++ (>= 4:4.9.2-1),xterm
-Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
+Depends: libc6 (>= 2.24-11), libgtk2.0-0 (>= 2.24.31-2), libasound2 (>= 1.1.3-5+rpi3), libdb5.3 (>=5.3.28-12), libsqlite3-0 (>= 3.16.2-5), libdb5.3++ (>= 5.3.28-12), libmysql++3v5 (>= 3.2.2+pristine-2), librsvg2-2 (>= 2.40.16-1), g++ (>= 4:6.3.0-4),xterm
+Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54,pwr55
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview development and runtime environment package
  5.6.1-1 Base release

src/tools/pkg/raspbian/pwrdemo/control

-Package: pwrdemo55
+Package: pwrdemo56
 Version: 5.6.1-1
 Section: base
 Priority: optional
 Architecture: armhf
-Depends: pwr55 (>= 5.5.0-1)
+Depends: pwr56 (>= 5.6.1-1)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  5.6.1-1 Base release

src/tools/pkg/raspbian/pwrrt/control

@@ -3,8 +3,8 @@ Version: 5.6.1-1
 Section: base
 Priority: optional
 Architecture: armhf
-Depends: libc6 (>= 2.19-18+deb8u3), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1+rpi1), libdb5.3 (>=5.3.28-9), libsqlite3-0 (>= 3.8.7.1-1+deb8u1)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
+Depends: libc6 (>= 2.24-11), libgtk2.0-0 (>= 2.24.31-2), libasound2 (>= 1.1.3-5+rpi3), libdb5.3 (>=5.3.28-12), libsqlite3-0 (>= 3.16.2-5)
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54,pwr55
 Maintainer: Proview <postmaster@proview.se>
 Description:
  5.6.1-1 Base release

src/tools/pkg/raspbian/pwrsev/control

@@ -3,8 +3,8 @@ Version: 5.6.1-1
 Section: base
 Priority: optional
 Architecture: armhf
-Depends: libc6 (>= 2.19-18+deb8u3), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1+rpi1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), libdb5.3 (>=5.3.28-9), libmysqlclient18 (>= 5.5.44-0+deb8u1)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
+Depends: libc6 (>= 2.24-11), libgtk2.0-0 (>= 2.24.31-2), libasound2 (>= 1.1.3-5+rpi3), libdb5.3 (>=5.3.28-12), libsqlite3-0 (>= 3.16.2-5), libmariadbclient18 (>= 10.1.23-9)
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54,pwr55
 Maintainer: Proview <postmaster@proview.se>
 Description:
  5.6.1-1 Base release