Commit 97d0b537 authored by claes's avatar claes

Adapted to ubuntu

parent b7f4a4de
#!/bin/bash #!/bin/bash
aroot="/usr/pwrp/adm" aroot="/usr/pwrp/adm"
pkgroot=$pwre_broot/$pwre_target/bld/pkg/pwr$ver
pkgsrc=$pwre_sroot/tools/pkg/ubu/pwr
# Get version # Get version
if [ -e $pwr_inc/pwr_version.h ]; then if [ -e $pwr_inc/pwr_version.h ]; then
...@@ -15,11 +17,11 @@ fi ...@@ -15,11 +17,11 @@ fi
# Generate version help file # Generate version help file
{ {
if [ ! -e $pwre_sroot/tools/pkg/deb/pwr/control ]; then if [ ! -e $pkgsrc/control ]; then
echo "Controlfile not found" echo "Controlfile not found"
exit 1 exit 1
fi fi
datfile=$pwre_sroot/tools/pkg/deb/pwr/control datfile=$pkgsrc/control
echo "<topic> version" echo "<topic> version"
d=`eval date +\"%F %X\"` d=`eval date +\"%F %X\"`
...@@ -84,9 +86,6 @@ if [ "$1" == "-v" ]; then ...@@ -84,9 +86,6 @@ if [ "$1" == "-v" ]; then
exit exit
fi fi
pkgroot=$pwre_broot/$pwre_target/bld/pkg/pwr$ver
pkgsrc=$pwre_sroot/tools/pkg/deb/pwr
echo "-- Building pwr$ver" echo "-- Building pwr$ver"
# Create directories # Create directories
...@@ -99,7 +98,7 @@ find $pkgroot -type d | xargs chmod 755 ...@@ -99,7 +98,7 @@ find $pkgroot -type d | xargs chmod 755
# control # control
cp $pkgsrc/control $pkgroot/DEBIAN cp $pkgsrc/control $pkgroot/DEBIAN
echo "#!/bin/sh" > $pkgroot/DEBIAN/postinst echo "#!/bin/bash" > $pkgroot/DEBIAN/postinst
echo "ver=\"$ver\"" >> $pkgroot/DEBIAN/postinst echo "ver=\"$ver\"" >> $pkgroot/DEBIAN/postinst
echo "pwre_target=\"$pwre_target\"" >> $pkgroot/DEBIAN/postinst echo "pwre_target=\"$pwre_target\"" >> $pkgroot/DEBIAN/postinst
cat $pkgsrc/postinst >> $pkgroot/DEBIAN/postinst cat $pkgsrc/postinst >> $pkgroot/DEBIAN/postinst
...@@ -161,10 +160,10 @@ mkdir $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user ...@@ -161,10 +160,10 @@ mkdir $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.bashrc $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user cp $pwre_sroot/tools/pkg/deb/user/.bashrc $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
echo "source $aroot/db/pwr_setup.sh" >> $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/.bashrc echo "source $aroot/db/pwr_setup.sh" >> $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/.bashrc
cp $pwre_sroot/tools/pkg/deb/user/.bash_profile $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user cp $pwre_sroot/tools/pkg/deb/user/.bash_profile $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.mwmrc $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user #cp $pwre_sroot/tools/pkg/deb/user/.mwmrc $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.rtt_start $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user cp $pwre_sroot/tools/pkg/deb/user/.rtt_start $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.xtt_start $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user cp $pwre_sroot/tools/pkg/deb/user/.xtt_start $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.xsession $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user #cp $pwre_sroot/tools/pkg/deb/user/.xsession $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/wtt_init.pwr_com $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user cp $pwre_sroot/tools/pkg/deb/user/wtt_init.pwr_com $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
......
Package: pwr44 Package: pwr44
Version: 4.4.2-1 Version: 4.4.4-2
Section: base Section: base
Priority: optional Priority: optional
Architecture: i386 Architecture: i386
Depends: libc6 (>= 2.3.6), libgtk2.0-0 (>= 2.8.16-0ubuntu1.1), libasound2 (>= 1.0.10-2ubuntu4), libdb4.3 (>=4.3.29) Depends: libc6 (>= 2.5-0ubuntu14), libgtk2.0-0 (>= 2.10.11-0ubuntu3), libasound2 (>= 1.0.13-1ubuntu5), libdb4.4 (>=4.4.20-8ubuntu2)
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44 Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44
Maintainer: Proview <postmaster@proview.se> Maintainer: Proview <postmaster@proview.se>
Description: Proview development and runtime environment package Description: Proview development and runtime environment package
......
#!/bin/sh #!/bin/bash
set -e set -e
# ver="" # ver=""
# pwre_target="" # pwre_target=""
echo "Here in postinst..." echo "Executing postinst"
# Automatically added by dh_installdocs # Automatically added by dh_installdocs
if [ "$1" = "configure" ]; then if [ "$1" = "configure" ]; then
if [ -d /usr/doc -a ! -e /usr/doc/pwrtest -a -d /usr/share/doc/pwrtest ]; then if [ -d /usr/doc -a ! -e /usr/doc/pwrtest -a -d /usr/share/doc/pwrtest ]; then
...@@ -14,6 +14,9 @@ fi ...@@ -14,6 +14,9 @@ fi
# End automatically added section # End automatically added section
aroot="/usr/pwrp/adm" aroot="/usr/pwrp/adm"
vermajor=${ver:0:1}
verminor=${ver:1:1}
verstr="V$vermajor.$verminor"
# Create group pwrp # Create group pwrp
if ! grep -q "\bpwrp:" /etc/group; then if ! grep -q "\bpwrp:" /etc/group; then
...@@ -30,12 +33,12 @@ if ! grep -q "\bpwrp:" /etc/passwd; then ...@@ -30,12 +33,12 @@ if ! grep -q "\bpwrp:" /etc/passwd; then
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/.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/.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
...@@ -84,13 +87,13 @@ fi ...@@ -84,13 +87,13 @@ fi
# Insert base in projectlist # Insert base in projectlist
if [ ! -e $aroot/db/pwr_projectlist.dat ]; then if [ ! -e $aroot/db/pwr_projectlist.dat ]; then
echo "%base V${ver:0:1}.${ver:1:1} /usr/pwr$ver" > $aroot/db/pwr_projectlist.dat echo "%base $verstr /usr/pwr$ver" > $aroot/db/pwr_projectlist.dat
else else
set +e set +e
ptst=`eval grep "^%base" $aroot/db/pwr_projectlist.dat | grep "\bV${ver:0:1}.${ver:1:1}\b"` ptst=`eval grep "^%base" $aroot/db/pwr_projectlist.dat | grep "\b$verstr\b"`
set -e set -e
if [ "$ptst" = "" ]; then if [ "$ptst" = "" ]; then
echo "%base V${ver:0:1}.${ver:1:1} /usr/pwr$ver" >> $aroot/db/pwr_projectlist.dat echo "%base $verstr /usr/pwr$ver" >> $aroot/db/pwr_projectlist.dat
fi fi
fi fi
......
#!/bin/sh #!/bin/bash
set -e set -e
echo "Here in prerm..." echo "Here in prerm..."
# Automatically added by dh_installdocs # Automatically added by dh_installdocs
......
...@@ -13,7 +13,7 @@ if [ -e $pwr_inc/pwr_version.h ]; then ...@@ -13,7 +13,7 @@ if [ -e $pwr_inc/pwr_version.h ]; then
ver=${ver:2:2} ver=${ver:2:2}
fi fi
proot=/data0/pwrp/pwrdemo$ver proot=/data1/pwrp/pwrdemo$ver
pkgroot=$pwre_broot/$pwre_target/bld/pkg/pwrdemo$ver pkgroot=$pwre_broot/$pwre_target/bld/pkg/pwrdemo$ver
pkgsrc=$pwre_sroot/tools/pkg/deb/pwrdemo pkgsrc=$pwre_sroot/tools/pkg/deb/pwrdemo
......
Package: pwrdemo44 Package: pwrdemo44
Version: 4.4.2-1 Version: 4.4.4-2
Section: base Section: base
Priority: optional Priority: optional
Architecture: i386 Architecture: i386
Depends: pwr44 (>= 4.4.2-1) Depends: pwr44 (>= 4.4.4-2)
Replaces: Replaces:
Maintainer: Proview <postmaster@proview.se> Maintainer: Proview <postmaster@proview.se>
Description: Proview Demo Project package Description: Proview Demo Project package
......
#!/bin/bash
#
set -e set -e
# Added by build.sh : # Added by build.sh :
# ver="" # ver=""
......
#!/bin/bash
# #
# ver='version' is added by build.sh # ver='version' is added by build.sh
# #
......
...@@ -157,19 +157,19 @@ cp $pkgsrc/proview.cnf $pkgroot/usr/pwrrt/cnf ...@@ -157,19 +157,19 @@ cp $pkgsrc/proview.cnf $pkgroot/usr/pwrrt/cnf
mkdir $pkgroot/usr/pwrrt/cnf/op mkdir $pkgroot/usr/pwrrt/cnf/op
cp $pwre_sroot/tools/pkg/deb/op/.bashrc $pkgroot/usr/pwrrt/cnf/op cp $pwre_sroot/tools/pkg/deb/op/.bashrc $pkgroot/usr/pwrrt/cnf/op
cp $pwre_sroot/tools/pkg/deb/op/.bash_profile $pkgroot/usr/pwrrt/cnf/op cp $pwre_sroot/tools/pkg/deb/op/.bash_profile $pkgroot/usr/pwrrt/cnf/op
cp $pwre_sroot/tools/pkg/deb/op/.mwmrc $pkgroot/usr/pwrrt/cnf/op #cp $pwre_sroot/tools/pkg/deb/op/.mwmrc $pkgroot/usr/pwrrt/cnf/op
cp $pwre_sroot/tools/pkg/deb/op/.rtt_start $pkgroot/usr/pwrrt/cnf/op cp $pwre_sroot/tools/pkg/deb/op/.rtt_start $pkgroot/usr/pwrrt/cnf/op
cp $pwre_sroot/tools/pkg/deb/op/.xtt_start $pkgroot/usr/pwrrt/cnf/op cp $pwre_sroot/tools/pkg/deb/op/.xtt_start $pkgroot/usr/pwrrt/cnf/op
cp $pwre_sroot/tools/pkg/deb/op/.xsession $pkgroot/usr/pwrrt/cnf/op #cp $pwre_sroot/tools/pkg/deb/op/.xsession $pkgroot/usr/pwrrt/cnf/op
# Copy user to cnf # Copy user to cnf
mkdir $pkgroot/usr/pwrrt/cnf/user mkdir $pkgroot/usr/pwrrt/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.bashrc $pkgroot/usr/pwrrt/cnf/user cp $pwre_sroot/tools/pkg/deb/user/.bashrc $pkgroot/usr/pwrrt/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.bash_profile $pkgroot/usr/pwrrt/cnf/user cp $pwre_sroot/tools/pkg/deb/user/.bash_profile $pkgroot/usr/pwrrt/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.mwmrc $pkgroot/usr/pwrrt/cnf/user #cp $pwre_sroot/tools/pkg/deb/user/.mwmrc $pkgroot/usr/pwrrt/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.rtt_start $pkgroot/usr/pwrrt/cnf/user cp $pwre_sroot/tools/pkg/deb/user/.rtt_start $pkgroot/usr/pwrrt/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.xtt_start $pkgroot/usr/pwrrt/cnf/user cp $pwre_sroot/tools/pkg/deb/user/.xtt_start $pkgroot/usr/pwrrt/cnf/user
cp $pwre_sroot/tools/pkg/deb/user/.xsession $pkgroot/usr/pwrrt/cnf/user #cp $pwre_sroot/tools/pkg/deb/user/.xsession $pkgroot/usr/pwrrt/cnf/user
# Create package # Create package
echo "-- Building package" echo "-- Building package"
......
Package: pwrrt Package: pwrrt
Version: 4.4.2-1 Version: 4.4.4-2
Section: base Section: base
Priority: optional Priority: optional
Architecture: i386 Architecture: i386
Depends: libc6 (>= 2.3.6), libgtk2.0-0 (>= 2.8.29-0ubuntu1.1), libasound2 (>= 1.0.10-2ubuntu4), libdb4.3 (>=4.3.29) Depends: libc6 (>= 2.5-0ubuntu14), libgtk2.0-0 (>= 2.10.11-0ubuntu3), libasound2 (>= 1.0.13-1ubuntu5), libdb4.4 (>=4.4.20-8ubuntu2)
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44
Maintainer: Proview <postmaster@proview.se> Maintainer: Proview <postmaster@proview.se>
Description: Description:
...@@ -23,3 +23,9 @@ Description: ...@@ -23,3 +23,9 @@ Description:
4.4.2-1 4.4.2-1
- Subgraphs for ventilation and circuit diagrams added. - Subgraphs for ventilation and circuit diagrams added.
- Baseobjects for threewayvalves, filters and dampers added. - Baseobjects for threewayvalves, filters and dampers added.
4.4.4-1
- Function to suppress alarms in basecomponents added.
- Classes IpDistribute, IpCollect, Demux, IDemux, GetDpPtr, StoDpPtr,
Eurotherm_TC3001, Eurotherm_TC3001Aggr and more added.
4.4.4-2
- Bugfix in gtk operatorwindow, long alarmtext could cause segfault
#!/bin/sh #!/bin/bash
set -e set -e
if [ "$pwrrt_xtrace" != "" ]; then if [ "$pwrrt_xtrace" != "" ]; then
set -o xtrace set -o xtrace
...@@ -43,12 +43,12 @@ if ! grep -q "\bpwrp:" /etc/passwd; then ...@@ -43,12 +43,12 @@ if ! grep -q "\bpwrp:" /etc/passwd; then
fi fi
cp /usr/pwrrt/cnf/user/.bashrc /home/pwrp cp /usr/pwrrt/cnf/user/.bashrc /home/pwrp
cp /usr/pwrrt/cnf/user/.bash_profile /home/pwrp cp /usr/pwrrt/cnf/user/.bash_profile /home/pwrp
cp /usr/pwrrt/cnf/user/.mwmrc /home/pwrp # cp /usr/pwrrt/cnf/user/.mwmrc /home/pwrp
cp /usr/pwrrt/cnf/user/.rtt_start /home/pwrp cp /usr/pwrrt/cnf/user/.rtt_start /home/pwrp
chmod a+x /home/pwrp/.rtt_start chmod a+x /home/pwrp/.rtt_start
cp /usr/pwrrt/cnf/user/.xtt_start /home/pwrp cp /usr/pwrrt/cnf/user/.xtt_start /home/pwrp
chmod a+x /home/pwrp/.xtt_start chmod a+x /home/pwrp/.xtt_start
cp /usr/pwrrt/cnf/user/.xsession /home/pwrp # cp /usr/pwrrt/cnf/user/.xsession /home/pwrp
chown -R pwrp /home/pwrp chown -R pwrp /home/pwrp
chgrp -R pwrp /home/pwrp chgrp -R pwrp /home/pwrp
......
#!/bin/sh #!/bin/bash
set -e set -e
# Automatically added by dh_installdocs # Automatically added by dh_installdocs
......
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