Author: mherger
Date: Tue Jan 31 02:05:32 2012
New Revision: 33785
URL: http://svn.slimdevices.com/slim?rev=33785&view=rev
Log:
Bug: 17852
Description: more readynas/arm work
- add removal script
- finish buildme.pl
Modified:
7.7/trunk/buildme.pl
7.7/trunk/platforms/readynas/addon_template/SQUEEZEBOX_AVAILABLE.xml
7.7/trunk/platforms/readynas/addon_template/addons.conf
7.7/trunk/platforms/readynas/addon_template/remove.sh
Modified: 7.7/trunk/buildme.pl
URL: http://svn.slimdevices.com/slim/7.7/trunk/buildme.pl?rev=33785&r1=33784&r2=33785&view=diff
==============================================================================
--- 7.7/trunk/buildme.pl (original)
+++ 7.7/trunk/buildme.pl Tue Jan 31 02:05:32 2012
@@ -514,7 +514,7 @@
## Build a Debian package ##
##############################################################################################
sub buildDebian {
- print "INFO: Building package for Debian Release... \n";
+ print "INFO: Building package for Debian Release... \n";
## Lets setup the right version/build #...
open (READ, "$sourceDir/platforms/debian/changelog") || die "Can't open changelog file to read: $!\n";
@@ -547,8 +547,8 @@
- ## Now that the package is built, lets put it into the destDir
- system("mv -f $buildDir/*.deb $destDir");
+ ## Now that the package is built, lets put it into the destDir
+ system("mv -f $buildDir/*.deb $destDir");
}
@@ -689,29 +689,42 @@
my $baseDir = "$buildDir/platforms/readynas";
my $workDir = "$baseDir/addons_sdk/SQUEEZEBOX/files";
- my $share = "usr/share/squeezeboxserver";
- my $varlib = "c/.squeezeboxserver";
+ my $share = "$workDir/usr/share/squeezeboxserver";
+ my $varlib = "$workDir/c/.squeezeboxserver";
print "INFO: Preparing add-on build environment...\n";
system("mv $baseDir/addon_template $baseDir/addons_sdk/SQUEEZEBOX");
system("install -d -m0755 $workDir/etc/default/ && install -d -m0755 $workDir/etc/init.d/ && install -d -m0755 $workDir/etc/squeezeboxserver/ && install -d -m0755 $workDir/usr/sbin/");
- system("install -d -m0755 $workDir/usr/share/perl5/ && install -d -m0755 $workDir/$share/ && install -d -m0755 $workDir/usr/share/doc/squeezeboxserver/ && install -d -m0755 $workDir/$varlib/prefs");
- system("install -d -m0755 $workDir/$varlib/cache && install -d -m0755 $workDir/$varlib/log");
-
- system("install -m0755 $buildDir/server/slimserver.pl $workDir/usr/sbin/squeezeboxserver && install -m0755 $buildDir/server/scanner.pl $workDir/usr/sbin/squeezeboxserver-scanner");
+ system("install -d -m0755 $workDir/usr/share/perl5/ && install -d -m0755 $share/ && install -d -m0755 $workDir/usr/share/doc/squeezeboxserver/");
+ system("install -d -m0755 $varlib/cache && install -d -m0755 $varlib/log && install -d -m0755 $varlib/prefs");
+
+ system("install -m0755 $baseDir/squeezeboxserver_safe $workDir/usr/sbin/ && install -m0755 $buildDir/server/slimserver.pl $workDir/usr/sbin/squeezeboxserver && install -m0755 $buildDir/server/scanner.pl $workDir/usr/sbin/squeezeboxserver-scanner");
system("mv $buildDir/server/Slim $workDir/usr/share/perl5/");
- system("mv $buildDir/server/CPAN $buildDir/server/lib $buildDir/server/Firmware $buildDir/server/Graphics $buildDir/server/HTML $workDir/$share/");
- system("mv $buildDir/server/IR $buildDir/server/SQL $buildDir/server/strings.txt $buildDir/server/MySQL $buildDir/server/icudt46*.dat $buildDir/server/Bin $workDir/$share/");
+ system("mv $buildDir/server/CPAN $buildDir/server/lib $buildDir/server/Firmware $buildDir/server/Graphics $buildDir/server/HTML $share/");
+ system("mv $buildDir/server/IR $buildDir/server/SQL $buildDir/server/strings.txt $buildDir/server/icudt46*.dat $buildDir/server/Bin $share/");
+
+ system("mv $buildDir/server/*.conf $workDir/etc/squeezeboxserver");
+ system("mv $baseDir/squeezeboxserver.default $workDir/etc/default/squeezeboxserver && mv $baseDir/squeezeboxserver.init $workDir/etc/init.d/squeezeboxserver");
+
+ system("install -d -m0755 $varlib/Plugins");
+
+ system("mv $buildDir/server/Change* $workDir/usr/share/doc/squeezeboxserver/ && mv $buildDir/$revisionTextFile $share");
## Build the addon now
-# print "INFO: Executing build_addon.sh...\n";
-# system("cd $buildDir/platforms/readynas/squeezeboxserver_addon_$archType/; ./build_addon.sh");
+ print "INFO: Executing build_addon...\n";
+ system("cd $baseDir/addons_sdk/SQUEEZEBOX; ../bin/build_addon");
## Move the final addon into place
-# print "INFO: Moving the final addon into [$destDir]\n";
-# system("mv $buildDir/platforms/readynas/squeezeboxserver_addon_$archType/*.bin $destDir/");
+ if ($releaseType eq "release") {
+ $destName =~ s/~\d[5,]-/-/;
+ }
+
+ $destName .= "-$archType-readynas.bin";
+
+ print "INFO: Moving the final addon into [$destDir] - $destName\n";
+ system("mv $baseDir/addons_sdk/SQUEEZEBOX/squeezebox*.bin $destDir/$destName");
}
##############################################################################################
Modified: 7.7/trunk/platforms/readynas/addon_template/SQUEEZEBOX_AVAILABLE.xml
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/addon_template/SQUEEZEBOX_AVAILABLE.xml?rev=33785&r1=33784&r2=33785&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/addon_template/SQUEEZEBOX_AVAILABLE.xml (original)
+++ 7.7/trunk/platforms/readynas/addon_template/SQUEEZEBOX_AVAILABLE.xml Tue Jan 31 02:05:32 2012
@@ -10,6 +10,6 @@
</description>
<detail_url>http://wiki.slimdevices.com</detail_url>
<download_url>http://downloads.slimdevices.com/lms/logitechmediaserver.bin</download_url>
- <icon>https://mysqueezebox.com/static/images/logitech-logo.png</icon>
+ <icon>/addons/SQUEEZEBOX/icon.png</icon>
<min_raidiator_version>4.1.3</min_raidiator_version>
</addon>
Modified: 7.7/trunk/platforms/readynas/addon_template/addons.conf
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/addon_template/addons.conf?rev=33785&r1=33784&r2=33785&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/addon_template/addons.conf (original)
+++ 7.7/trunk/platforms/readynas/addon_template/addons.conf Tue Jan 31 02:05:32 2012
@@ -1,1 +1,1 @@
-SQUEEZEBOX!!squeezebox!!1.0!!/etc/frontview/addons/bin/SQUEEZEBOX/start.sh!!/etc/frontview/addons/bin/SQUEEZEBOX/stop.sh!!Other!!current_url==http://downloads.slimdevices.com/lms/logitechmediaserver_latest.xml::detail_url==http://wiki.slimdevices.com::icon_url==https://mysqueezebox.com/static/images/logitech-logo.png
+SQUEEZEBOX!!squeezebox!!1.0!!/etc/frontview/addons/bin/SQUEEZEBOX/start.sh!!/etc/frontview/addons/bin/SQUEEZEBOX/stop.sh!!Other!!current_url==http://downloads.slimdevices.com/lms/logitechmediaserver_latest.xml::detail_url==http://wiki.slimdevices.com::icon_url==/addons/SQUEEZEBOX/icon.png
Modified: 7.7/trunk/platforms/readynas/addon_template/remove.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/addon_template/remove.sh?rev=33785&r1=33784&r2=33785&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/addon_template/remove.sh (original)
+++ 7.7/trunk/platforms/readynas/addon_template/remove.sh Tue Jan 31 02:05:32 2012
@@ -1,9 +1,17 @@
#!/bin/bash
SERVICE=SQUEEZEBOX
-CONF_FILES=""
+CONF_FILES="/etc/squeezeboxserver \
+ /c/.squeezeboxserver"
+
PROG_FILES="/etc/frontview/apache/addons/SQUEEZEBOX.conf* \
- /etc/frontview/addons/*/SQUEEZEBOX"
+ /etc/frontview/addons/*/SQUEEZEBOX \
+ /usr/share/squeezeboxserver \
+ /usr/share/perl5/Slim \
+ /usr/share/doc/squeezeboxserver \
+ /etc/default/squeezeboxserver \
+ /etc/init.d/squeezeboxserver \
+ /usr/sbin/squeezeboxserver*"
# Stop service from running
eval `awk -F'!!' "/^${SERVICE}\!\!/ { print \\$5 }" /etc/frontview/addons/addons.conf`
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.