Skip to content

P
proview
Commit aedd8c80 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Desktop icons added, and manual dependencies dded

parent 82576419
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 8 deletions
src/tools/pkg/rpm/pwr/build.sh
View file @ aedd8c80
...@@ -160,6 +160,7 @@ cp $pwre_sroot/tools/pkg/deb/adm/pwra_env.sh $pkgroot/usr/pwr$ver/$pwre_target/e ...@@ -160,6 +160,7 @@ cp $pwre_sroot/tools/pkg/deb/adm/pwra_env.sh $pkgroot/usr/pwr$ver/$pwre_target/e
chmod a+x $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/pwra_env.sh chmod a+x $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/pwra_env.sh
cp $pwre_sroot/tools/pkg/deb/adm/pwr_volumelist.dat $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf cp $pwre_sroot/tools/pkg/deb/adm/pwr_volumelist.dat $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf
cp $pwre_sroot/tools/pkg/deb/adm/pwr_user2.dat $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf cp $pwre_sroot/tools/pkg/deb/adm/pwr_user2.dat $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf
cp $pwre_sroot/tools/pkg/deb/adm/proview_icon.png $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf
# Copy user to cnf # Copy user to cnf
mkdir $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user mkdir $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
...@@ -173,6 +174,19 @@ cp $pwre_sroot/tools/pkg/deb/user/.xsession $pkgroot/usr/pwr$ver/$pwre_target/ex ...@@ -173,6 +174,19 @@ cp $pwre_sroot/tools/pkg/deb/user/.xsession $pkgroot/usr/pwr$ver/$pwre_target/ex
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
# Generate desktop file
{
echo "[Desktop Entry]"
echo "Version=1.0"
echo "Encoding=UTF-8"
echo "Name=Proview V${version:0:3}"
echo "Type=Application"
echo "Comment=Start Proview"
echo "Exec=xterm -title \"Proview Development Console\" -e 'export pwra_db=$aroot/db;source \$pwra_db/pwra_env.sh set base V""${version:0:3}"";source \$pwra_db/pwra_env.sh set bus;wb -p pwrp pwrp'"
echo "Icon=$aroot/db/proview_icon.png"
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop
# Create package # Create package
echo "-- Building package" echo "-- Building package"
......
src/tools/pkg/rpm/pwr/pwr.spec
View file @ aedd8c80
...@@ -10,11 +10,12 @@ ...@@ -10,11 +10,12 @@
Name: pwr46 Name: pwr46
Summary: Proview/R development and runtime environment Summary: Proview/R development and runtime environment
Version: 4.6.0 Version: 4.6.1
Release: 6 Release: 1
License: GPL License: GPL
BuildArch: i386 BuildArch: i386
Packager: claes.sjofors@proview.se Packager: claes.sjofors@proview.se
Requires: gcc, gcc-c++, xorg-x11-fonts-ISO8859-1-100dpi, xorg-x11-fonts-ISO8859-1-75dpi, xorg-x11-fonts-Type1, xterm
Group: Development/Tools/Other Group: Development/Tools/Other
Url: http://www.proview.se Url: http://www.proview.se
...@@ -119,6 +120,13 @@ else ...@@ -119,6 +120,13 @@ else
chown -R pwrp /home/pwrp chown -R pwrp /home/pwrp
chgrp -R pwrp /home/pwrp chgrp -R pwrp /home/pwrp
fi fi
if [ ! -e /home/pwrp/Desktop ]; then
mkdir /home/pwrp/Desktop
chown pwrp:pwrp /home/pwrp/Desktop
fi
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/user/proview%{ver}.desktop /home/pwrp/Desktop
chown pwrp:pwrp /home/pwrp/Desktop/proview%{ver}.desktop
chmod a+x /home/pwrp/Desktop/proview%{ver}.desktop
echo "Change owner of files to pwrp" echo "Change owner of files to pwrp"
chown -R pwrp /usr/pwr%{ver} chown -R pwrp /usr/pwr%{ver}
...@@ -152,6 +160,7 @@ fi ...@@ -152,6 +160,7 @@ fi
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/pwra_env.sh $aroot/db cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/pwra_env.sh $aroot/db
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/pwr_setup.sh $aroot/db cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/pwr_setup.sh $aroot/db
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/proview_icon.png $aroot/db
if [ ! -e $aroot/db/pwr_volumelist.dat ]; then if [ ! -e $aroot/db/pwr_volumelist.dat ]; then
cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/pwr_volumelist.dat $aroot/db cp /usr/pwr%{ver}/%{pwre_target}/exp/cnf/pwr_volumelist.dat $aroot/db
fi fi
......
src/tools/pkg/rpm/pwrdemo/build.sh
View file @ aedd8c80
...@@ -42,6 +42,7 @@ gzip -fq --best $pkgroot/usr/share/doc/pwrdemo$ver/changelog ...@@ -42,6 +42,7 @@ gzip -fq --best $pkgroot/usr/share/doc/pwrdemo$ver/changelog
# Copy pwrdemo # Copy pwrdemo
mkdir $pkgroot/usr/pwrp/pwrdemo$ver mkdir $pkgroot/usr/pwrp/pwrdemo$ver
mkdir $pkgroot/usr/pwrp/pwrdemo$ver/cnf
currentdir="`eval pwd`" currentdir="`eval pwd`"
tarfile=$pwre_broot/$pwre_target/bld/pkg/pwrtmp.tar tarfile=$pwre_broot/$pwre_target/bld/pkg/pwrtmp.tar
cd $proot cd $proot
...@@ -53,8 +54,22 @@ tar -xf $tarfile ...@@ -53,8 +54,22 @@ tar -xf $tarfile
rm $tarfile rm $tarfile
cd $currentdir cd $currentdir
# Generate desktop file
{
echo "[Desktop Entry]"
echo "Version=1.0"
echo "Encoding=UTF-8"
echo "Name=Proview Demo"
echo "Type=Application"
echo "Comment=Start Proview Demo"
echo "Exec=xterm -title \"Proview Demo Console\" -e 'export pwra_db=$aroot/db;source \$pwra_db/pwr_setup.sh;source \$pwra_db/pwra_env.sh set project pwrdemo""$ver"";export PWR_BUS_ID=999;pwr_rtmon'"
echo "Icon=$aroot/db/proview_icon.png"
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop
# Create package # Create package
echo "-- Building package" echo "-- Building package"
rpmbuild -bb --quiet \ rpmbuild -bb --quiet \
--define "_topdir $pkgroot/rpm" \ --define "_topdir $pkgroot/rpm" \
--define "ver $ver" \ --define "ver $ver" \
......
src/tools/pkg/rpm/pwrdemo/pwrdemo.spec
View file @ aedd8c80
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
Name: pwrdemo46 Name: pwrdemo46
Summary: Proview/R demo project Summary: Proview/R demo project
Version: 4.6.0 Version: 4.6.1
Release: 6 Release: 1
License: GPL License: GPL
BuildArch: i386 BuildArch: i386
Packager: claes.sjofors@proview.se Packager: claes.sjofors@proview.se
...@@ -109,6 +109,12 @@ sudo -u pwrp $initsh ...@@ -109,6 +109,12 @@ sudo -u pwrp $initsh
rm $initsh rm $initsh
rm $initpwrc rm $initpwrc
if [ -e /home/pwrp/Desktop ]; then
cp /usr/pwrp/pwrdemo%{ver}/cnf/proviewdemo%{ver}.desktop /home/pwrp/Desktop/
chown pwrp:pwrp /home/pwrp/Desktop/proviewdemo%{ver}.desktop
chmod a+x /home/pwrp/Desktop/proviewdemo%{ver}.desktop
fi
%preun %preun
set -e set -e
......
src/tools/pkg/rpm/pwrrt/pwrrt.spec
View file @ aedd8c80
...@@ -10,11 +10,12 @@ ...@@ -10,11 +10,12 @@
Name: pwrrt Name: pwrrt
Summary: Proview/R runtime environment Summary: Proview/R runtime environment
Version: 4.6.0 Version: 4.6.1
Release: 6 Release: 1
License: GPL License: GPL
BuildArch: i386 BuildArch: i386
Packager: claes.sjofors@proview.se Packager: claes.sjofors@proview.se
Requires: xorg-x11-fonts-ISO8859-1-100dpi, xorg-x11-fonts-ISO8859-1-75dpi, xorg-x11-fonts-Type1
Group: Applications/System Group: Applications/System
Url: http://www.proview.se Url: http://www.proview.se
......
src/tools/pkg/rpm/pwrsev/pwrsev.spec
View file @ aedd8c80
...@@ -10,11 +10,12 @@ ...@@ -10,11 +10,12 @@
Name: pwrsev Name: pwrsev
Summary: Proview/R storage environment Summary: Proview/R storage environment
Version: 4.6.0 Version: 4.6.1
Release: 6 Release: 1
License: GPL License: GPL
BuildArch: i386 BuildArch: i386
Packager: claes.sjofors@proview.se Packager: claes.sjofors@proview.se
Requires: xorg-x11-fonts-ISO8859-1-100dpi, xorg-x11-fonts-ISO8859-1-75dpi, xorg-x11-fonts-Type1
Group: Applications/System Group: Applications/System
Url: http://www.proview.se Url: http://www.proview.se
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7