Commit c84b8ba6 authored by claes's avatar claes

V4.6.0

parent 34d24819
...@@ -3,11 +3,15 @@ ...@@ -3,11 +3,15 @@
# #
# Default QCOM Bus Id # Default QCOM Bus Id
# #
qcomBusId 999 qcomBusId 999
# #
# Web directory # Web directory
# #
webDirectory /var/www webDirectory /var/www
#
# Default privileges for SevXtt: Read, Admin or None
#
sevXttDefaultPriv Read
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
Name: pwr45 Name: pwr45
Summary: Proview/R development and runtime environment Summary: Proview/R development and runtime environment
Version: 4.5.0 Version: 4.6.0
Release: 7 Release: 1
License: GPL License: GPL
BuildArch: i386 BuildArch: i386
Packager: claes.sjofors@proview.se Packager: claes.sjofors@proview.se
...@@ -68,6 +68,15 @@ echo "$ver" ...@@ -68,6 +68,15 @@ echo "$ver"
echo "</topic>" echo "</topic>"
} > %{buildroot}/usr/pwr%{ver}/%{pwre_target}/exp/exe/wtt_version_help.dat } > %{buildroot}/usr/pwr%{ver}/%{pwre_target}/exp/exe/wtt_version_help.dat
# Convert to html
co_convert -t -d %{buildroot}/usr/pwr%{ver}/%{pwre_target}/exp/doc %{buildroot}/usr/pwr%{ver}/%{pwre_target}/exp/exe/wtt_version_help.dat
{
echo "<html><head>"
echo "<meta http-equiv=\"Refresh\" content=\"5;../wtt_version_help_version.html\">"
echo "</head></html>"
} > %{buildroot}/usr/pwr%{ver}/%{pwre_target}/exp/doc/en_us/package_version.html
#%clean #%clean
%files %files
...@@ -80,25 +89,30 @@ echo "$ver" ...@@ -80,25 +89,30 @@ echo "$ver"
aroot="/usr/pwrp/adm" aroot="/usr/pwrp/adm"
# Create group pwrp # Create group pwrp
if ! grep -q "\bpwrp:" /etc/group; then if getent group pwrp > /dev/null; then
echo "-- Add group pwrp" echo "-- group pwrp already exist"
groupadd pwrp else
if groupadd pwrp; then
echo "-- group pwrp added"
fi
fi fi
if ! grep -q "\bpwrp:" /etc/passwd; then if getent passwd pwrp > /dev/null; then
echo "-- Add user pwrp" echo "-- user pwrp already exist"
useradd -s /bin/bash -p aaupl/kQs1p3U -g pwrp -d /home/pwrp pwrp else
new_user=1
if useradd -s /bin/bash -p aaupl/kQs1p3U -g pwrp -d /home/pwrp pwrp; then
echo "-- user pwrp added"
fi
if [ ! -e /home/pwrp ]; then if [ ! -e /home/pwrp ]; then
mkdir /home/pwrp mkdir /home/pwrp
fi fi
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.bashrc /home/pwrp cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.bashrc /home/pwrp
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.bash_profile /home/pwrp cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.bash_profile /home/pwrp
# cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.mwmrc /home/pwrp
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.rtt_start /home/pwrp cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.rtt_start /home/pwrp
chmod a+x /home/pwrp/.rtt_start chmod a+x /home/pwrp/.rtt_start
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.xtt_start /home/pwrp cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.xtt_start /home/pwrp
chmod a+x /home/pwrp/.xtt_start chmod a+x /home/pwrp/.xtt_start
# cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/.xsession /home/pwrp
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/wtt_init.pwr_com /home/pwrp cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/wtt_init.pwr_com /home/pwrp
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/wtt_init1.pwr_com /home/pwrp cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/wtt_init1.pwr_com /home/pwrp
...@@ -177,10 +191,6 @@ fi ...@@ -177,10 +191,6 @@ fi
#%postun #%postun
%changelog %changelog
* Fri May 16 2008 Claes Sjofors <claes.sjofors@ssabox.com> 4.5.0-6 * Mon Nov 10 2008 Claes Sjofors <claes.sjofors@ssabox.com> 4.6.0-1
- Xtt Fileview added. - Base release.
- Function objects DataFRead and DataFWrite added.
- Bugfix in directory database creation.
- Bugfix in creation of wb_load file.
- Bugfix in Modbus TCP.
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
Name: pwrdemo45 Name: pwrdemo45
Summary: Proview/R demo project Summary: Proview/R demo project
Version: 4.5.0 Version: 4.6.0
Release: 7 Release: 1
License: GPL License: GPL
BuildArch: i386 BuildArch: i386
Packager: claes.sjofors@proview.se Packager: claes.sjofors@proview.se
...@@ -115,6 +115,6 @@ fi ...@@ -115,6 +115,6 @@ fi
#%postun #%postun
%changelog %changelog
* Fri May 16 2008 Claes Sjofors <claes.sjofors@proview.se> 4.5.0-6 * Mon Nov 10 2008 Claes Sjofors <claes.sjofors@proview.se> 4.6.0-1
- Base release - Base release
...@@ -3,11 +3,15 @@ ...@@ -3,11 +3,15 @@
# #
# Default QCOM Bus Id # Default QCOM Bus Id
# #
qcomBusId 517 qcomBusId 517
# #
# Web directory # Web directory
# #
webDirectory /pwrp/common/web webDirectory /pwrp/common/web
#
# Default privileges for SevXtt: Read, Admin or None
#
sevXttDefaultPriv Read
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
pwr - start and stop Proview runtime environment pwr - start and stop Proview runtime environment
.SH SYNOPSIS .SH SYNOPSIS
.B pwr .B pwr
[start][stop][restart] [start][stop][restart][reload][reset]
.SH DESCRIPTION .SH DESCRIPTION
Start and stop command for Proview runtime environment. Start and stop command for Proview runtime environment.
...@@ -23,6 +23,16 @@ Stop Proview runtime environment. ...@@ -23,6 +23,16 @@ Stop Proview runtime environment.
.IP .IP
First stop and then start the Proview runtime environment. First stop and then start the Proview runtime environment.
.HP
\fBreload\fR
.IP
Soft restart of Proview runtime environment.
.HP
\fBreset\fR
.IP
Remove all processes and resources.
.SH FILES .SH FILES
/etc/pwrp_profile /etc/pwrp_profile
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
Name: pwrrt Name: pwrrt
Summary: Proview/R runtime environment Summary: Proview/R runtime environment
Version: 4.5.0 Version: 4.6.0
Release: 7 Release: 1
License: GPL License: GPL
BuildArch: i386 BuildArch: i386
Packager: claes.sjofors@proview.se Packager: claes.sjofors@proview.se
...@@ -70,6 +70,12 @@ For more information please see www.proview.se. ...@@ -70,6 +70,12 @@ For more information please see www.proview.se.
# Convert to html # Convert to html
co_convert -t -d %{buildroot}/usr/pwrrt/doc %{buildroot}/usr/pwrrt/exe/xtt_version_help.dat co_convert -t -d %{buildroot}/usr/pwrrt/doc %{buildroot}/usr/pwrrt/exe/xtt_version_help.dat
{
echo "<html><head>"
echo "<meta http-equiv=\"Refresh\" content=\"5;../xtt_version_help_version.html\">"
echo "</head></html>"
} > %{buildroot}/usr/pwrrt/doc/en_us/package_version.html
# Print rt version file # Print rt version file
echo "Version: %{version}-%{release}" > %{buildroot}/usr/pwrrt/exe/rt_version.dat echo "Version: %{version}-%{release}" > %{buildroot}/usr/pwrrt/exe/rt_version.dat
...@@ -87,88 +93,105 @@ proot="/pwrp" ...@@ -87,88 +93,105 @@ proot="/pwrp"
# Create users ... # Create users ...
if ! grep -q "\bpwrp:" /etc/group; then if getent group pwrp > /dev/null; then
echo "-- Add group pwrp" echo "-- group pwrp already exist"
groupadd pwrp else
if groupadd pwrp; then
echo "-- group pwrp added"
fi
fi fi
if ! grep -q "\bb55:" /etc/group; then
echo "-- Add group b55" if getent group b55 > /dev/null; then
groupadd b55 echo "-- group b55 already exist"
else
if groupadd b55; then
echo "-- group b55 added"
fi
fi fi
if ! grep -q "\bskiftel:" /etc/group; then
echo "-- Add group skiftel" if getent group skiftel > /dev/null; then
groupadd skiftel echo "-- group skiftel already exist"
else
if groupadd skiftel; then
echo "-- group skiftel added"
fi
fi fi
if ! grep -q "\bpwrp:" /etc/passwd; then
echo "-- Add user pwrp" if getent passwd pwrp > /dev/null; then
useradd -s /bin/bash -p aaupl/kQs1p3U -g pwrp -d /home/pwrp pwrp echo "-- user pwrp already exist"
else
new_user=1
if useradd -s /bin/bash -p aaupl/kQs1p3U -g pwrp -G b55,b66,skiftel -d /home/pwrp pwrp; then
echo "-- user pwrp added"
fi
if [ ! -e /home/pwrp ]; then if [ ! -e /home/pwrp ]; then
mkdir /home/pwrp mkdir /home/pwrp
/bin/cp /usr/pwrrt/cnf/user/.bashrc /home/pwrp
/bin/cp /usr/pwrrt/cnf/user/.bash_profile /home/pwrp
/bin/cp /usr/pwrrt/cnf/user/.rtt_start /home/pwrp
chmod a+x /home/pwrp/.rtt_start
/bin/cp /usr/pwrrt/cnf/user/.xtt_start /home/pwrp
chmod a+x /home/pwrp/.xtt_start
chown -R pwrp /home/pwrp
chgrp -R pwrp /home/pwrp
fi fi
/bin/cp /usr/pwrrt/cnf/user/.bashrc /home/pwrp
/bin/cp /usr/pwrrt/cnf/user/.bash_profile /home/pwrp
# /bin/cp /usr/pwrrt/cnf/user/.mwmrc /home/pwrp
/bin/cp /usr/pwrrt/cnf/user/.rtt_start /home/pwrp
chmod a+x /home/pwrp/.rtt_start
/bin/cp /usr/pwrrt/cnf/user/.xtt_start /home/pwrp
chmod a+x /home/pwrp/.xtt_start
# /bin/cp /usr/pwrrt/cnf/user/.xsession /home/pwrp
chown -R pwrp /home/pwrp
chgrp -R pwrp /home/pwrp
fi fi
if ! grep -q "\bskiftel:" /etc/passwd; then if getent passwd skiftel > /dev/null; then
echo "-- Add user skiftel" echo "-- user skiftel already exist"
else
new_user=1 new_user=1
useradd -s /bin/bash -p aa6NzxS/aBgP6 -g skiftel -G pwrp -d /home/skiftel skiftel
if [ ! -e /home/pwrp ]; then if useradd -s /bin/bash -p aa6NzxS/aBgP6 -g skiftel -G pwrp -d /home/skiftel skiftel; then
echo "-- user skiftel added"
fi
if [ ! -e /home/skiftel ]; then
mkdir /home/skiftel mkdir /home/skiftel
cp /usr/pwrrt/cnf/user/.bashrc /home/skiftel
cp /usr/pwrrt/cnf/user/.bash_profile /home/skiftel
cp /usr/pwrrt/cnf/user/.rtt_start /home/skiftel
chmod a+x /home/skiftel/.rtt_start
cp /usr/pwrrt/cnf/user/.xtt_start /home/skiftel
chmod a+x /home/skiftel/.xtt_start
chown -R pwrp /home/skiftel
chgrp -R pwrp /home/skiftel
fi fi
/bin/cp /usr/pwrrt/cnf/user/.bashrc /home/skiftel
/bin/cp /usr/pwrrt/cnf/user/.bash_profile /home/skiftel
# /bin/cp /usr/pwrrt/cnf/user/.mwmrc /home/skiftel
/bin/cp /usr/pwrrt/cnf/user/.rtt_start /home/skiftel
chmod a+x /home/skiftel/.rtt_start
/bin/cp /usr/pwrrt/cnf/user/.xtt_start /home/skiftel
chmod a+x /home/skiftel/.xtt_start
# /bin/cp /usr/pwrrt/cnf/user/.xsession /home/skiftel
chown -R pwrp /home/skiftel
chgrp -R pwrp /home/skiftel
fi fi
if ! grep -q "\bb55:" /etc/passwd; then if getent passwd b55 > /dev/null; then
echo "-- Add user b55"
new_user=1 new_user=1
# Check if group audio exist # Check if group audio exist
if grep -q "\baudio:" /etc/group; then if getent group audio > /dev/null; then
groups="pwrp,audio" groups="pwrp,audio"
else else
groups="pwrp" groups="pwrp"
fi fi
useradd -s /bin/bash -p aaQPClsglxJP6 -g b55 -G $groups -d /home/b55 b55
if useradd -s /bin/bash -p aaQPClsglxJP6 -g b55 -G $groups -d /home/b55 b55; then
echo "-- user b55 added"
fi
if [ ! -e /home/b55 ]; then if [ ! -e /home/b55 ]; then
mkdir /home/b55 mkdir /home/b55
cp /usr/pwrrt/cnf/op/.bashrc /home/b55
/bin/cp /usr/pwrrt/cnf/op/.bashrc /home/b55 cp /usr/pwrrt/cnf/op/.bash_profile /home/b55
/bin/cp /usr/pwrrt/cnf/op/.bash_profile /home/b55 cp /usr/pwrrt/cnf/op/.rtt_start /home/b55
# /bin/cp /usr/pwrrt/cnf/op/.mwmrc /home/b55
/bin/cp /usr/pwrrt/cnf/op/.rtt_start /home/b55
chmod a+x /home/b55/.rtt_start chmod a+x /home/b55/.rtt_start
/bin/cp /usr/pwrrt/cnf/op/.xtt_start /home/b55 cp /usr/pwrrt/cnf/op/.xtt_start /home/b55
chmod a+x /home/b55/.xtt_start chmod a+x /home/b55/.xtt_start
# /bin/cp /usr/pwrrt/cnf/op/.xsession /home/b55
chown -R b55 /home/b55 chown -R b55 /home/b55
chgrp -R pwrp /home/b55 chgrp -R pwrp /home/b55
chmod a+rwx /home/b55 chmod g+rwx /home/b55
fi fi
fi fi
#echo "Change owner of files to pwrp" #echo "Change owner of files to pwrp"
chown -R pwrp /usr/pwrrt chown -R pwrp /usr/pwrrt
chgrp -R pwrp /usr/pwrrt chgrp -R pwrp /usr/pwrrt
...@@ -230,6 +253,7 @@ if [ ! -e $proot ]; then ...@@ -230,6 +253,7 @@ if [ ! -e $proot ]; then
mkdir $proot/common/inc mkdir $proot/common/inc
mkdir $proot/common/load mkdir $proot/common/load
mkdir $proot/common/log mkdir $proot/common/log
mkdir $proot/common/doc
mkdir $proot/common/db mkdir $proot/common/db
mkdir $proot/common/web mkdir $proot/common/web
mkdir $proot/x86_linux mkdir $proot/x86_linux
...@@ -385,7 +409,7 @@ if [ "$remove_all" = "y" ]; then ...@@ -385,7 +409,7 @@ if [ "$remove_all" = "y" ]; then
set -e set -e
echo "-- Remove user b55" echo "-- Remove user b55"
if grep -q "\bb55:" /etc/passwd; then if getent passwd b55 > /dev/null; then
userdel b55 userdel b55
fi fi
if [ -e /home/b55 ]; then if [ -e /home/b55 ]; then
...@@ -393,7 +417,7 @@ if [ "$remove_all" = "y" ]; then ...@@ -393,7 +417,7 @@ if [ "$remove_all" = "y" ]; then
fi fi
echo "-- Remove user pwrp" echo "-- Remove user pwrp"
if grep -q "\bpwrp:" /etc/passwd; then if getent passwd pwrp > /dev/null; then
userdel pwrp userdel pwrp
fi fi
if [ -e /home/pwrp ]; then if [ -e /home/pwrp ]; then
...@@ -401,22 +425,22 @@ if [ "$remove_all" = "y" ]; then ...@@ -401,22 +425,22 @@ if [ "$remove_all" = "y" ]; then
fi fi
echo "-- Remove user skiftel" echo "-- Remove user skiftel"
if grep -q "\bskiftel:" /etc/passwd; then if getent skiftel pwrp > /dev/null; then
userdel skiftel userdel skiftel
fi fi
if [ -e /home/skiftel ]; then if [ -e /home/skiftel ]; then
rm -r /home/skiftel rm -r /home/skiftel
fi fi
if grep -q "\bb55:" /etc/group; then if getent group b55 > /dev/null; then
groupdel b55 groupdel b55
fi fi
if grep -q "\bpwrp:" /etc/group; then if getent group pwrp > /dev/null; then
groupdel pwrp groupdel pwrp
fi fi
if grep -q "\bskiftel:" /etc/group; then if getent group skiftel > /dev/null; then
groupdel skiftel groupdel skiftel
fi fi
...@@ -459,8 +483,6 @@ fi ...@@ -459,8 +483,6 @@ fi
#%postun #%postun
%changelog %changelog
* Fri May 16 2008 Claes Sjofors <claes.sjofors@ssabox.com> 4.5.0-6 * Mon Nov 10 2008 Claes Sjofors <claes.sjofors@ssabox.com> 4.6.0-1
- Xtt Fileview added. - Base release.
- Function objects DataFRead and DataFWrite added.
- Bugfix in Modbus TCP.
...@@ -44,6 +44,9 @@ en_us English ...@@ -44,6 +44,9 @@ en_us English
.RS .RS
sv_se Swedish. sv_se Swedish.
.RE .RE
.RS
de_de German.
.RE
.RS .RS
en_us is default. en_us is default.
...@@ -52,6 +55,18 @@ en_us is default. ...@@ -52,6 +55,18 @@ en_us is default.
\fB\-u\fR \fB\-u\fR
.IP .IP
Use opplace object with the same name as the current user. Use opplace object with the same name as the current user.
.HP
\fB\-s\fR
.IP
Show a selection list of available OpPlace objects.
.HP
\fB\-a\fR
.IP
Connect to audio device.
.HP
\fB\-q\fR
.IP
Quiet. Hide license information.
.SH AUTHOR .SH AUTHOR
Written by cs. Written by cs.
.SH "SEE ALSO" .SH "SEE ALSO"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment