Author: titmuss
Date: Wed Jul 23 07:34:28 2008
New Revision: 2725
URL: http://svn.slimdevices.com?rev=2725&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2720): adrian | 2008-07-19 22:19:28 +0100
Bug: 8545
Description: fix osx makefile to actually build zipfilter
[EMAIL PROTECTED] (orig r2721): adrian | 2008-07-19 23:49:57 +0100
Bug: 8545
Description: avoid error when no applets are installed on the server
[EMAIL PROTECTED] (orig r2722): titmuss | 2008-07-21 13:45:55 +0100
Bug: N/A
Description:
Fix 7.1 jive build.
Thanks to schiegl on the forums.
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeos/src/Makefile
7.2/trunk/squeezeos/src/scripts/mkversion
7.2/trunk/squeezeplay/src/Makefile.osx
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jul 23 07:34:28 2008
@@ -1,6 +1,6 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2502
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2709
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2722
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.2/trunk/squeezeos/src/Makefile
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/Makefile?rev=2725&root=Jive&r1=2724&r2=2725&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/Makefile (original)
+++ 7.2/trunk/squeezeos/src/Makefile Wed Jul 23 07:34:28 2008
@@ -69,7 +69,7 @@
# Create upgrade.md5
cd ${IMAGEDIR} && md5sum zImage-P7 root.cramfs > upgrade.md5
# Create jive.bin
- VERSION=`cat ${SQUEEZEPLAY_SRC}/squeezeplay/src/version.h | cut -sd\"
-f 2 | sed -e 's/ /_/'` && cd ${IMAGEDIR} && echo $$VERSION && zip
${IMAGEDIR}/jive_$$VERSION.bin jive.version upgrade.md5 zImage-P7 root.cramfs
+ SPREL=`cat ${SQUEEZEPLAY_SRC}/squeezeplay/src/version.h | grep "define
SQUEEZEPLAY_RELEASE" | cut -sd\" -f 2` && SPREV=`cat
${SQUEEZEPLAY_SRC}/squeezeplay/src/version.h | grep "define
SQUEEZEPLAY_REVISION" | cut -sd\" -f 2` && VERSION=`cat
${SQUEEZEPLAY_SRC}/squeezeplay/src/version.h | grep "JIVE_VERSION" | sed -e
"s/SQUEEZEPLAY_RELEASE/$$SPREL/" -e "s/SQUEEZEPLAY_REVISION/$$SPREV/" | tr -d
\" | cut -d" " -f3,4 | sed -e 's/ /_/'` && cd ${IMAGEDIR} && echo $$VERSION &&
zip ${IMAGEDIR}/jive_$$VERSION.bin jive.version upgrade.md5 zImage-P7
root.cramfs
@cat ${IMAGEDIR}/jive.version
Modified: 7.2/trunk/squeezeos/src/scripts/mkversion
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/scripts/mkversion?rev=2725&root=Jive&r1=2724&r2=2725&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/scripts/mkversion (original)
+++ 7.2/trunk/squeezeos/src/scripts/mkversion Wed Jul 23 07:34:28 2008
@@ -5,6 +5,8 @@
expr 0`cat .version` + 1 > .version
fi
-cat ../../squeezeplay/src/squeezeplay/src/version.h | cut -sd\" -f 2
+SPREL=`cat ../../squeezeplay/src/squeezeplay/src/version.h | grep "define
SQUEEZEPLAY_RELEASE" | cut -sd\" -f 2`
+SPREV=`cat ../../squeezeplay/src/squeezeplay/src/version.h | grep "define
SQUEEZEPLAY_REVISION" | cut -sd\" -f 2`
+cat ../../squeezeplay/src/squeezeplay/src/version.h | grep "JIVE_VERSION" |
sed -e "s/SQUEEZEPLAY_RELEASE/$SPREL/" -e "s/SQUEEZEPLAY_REVISION/$SPREV/" | tr
-d \" | cut -d" " -f3,4
echo [EMAIL PROTECTED] \#`cat .version` `date`
Modified: 7.2/trunk/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Makefile.osx?rev=2725&root=Jive&r1=2724&r2=2725&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Makefile.osx (original)
+++ 7.2/trunk/squeezeplay/src/Makefile.osx Wed Jul 23 07:34:28 2008
@@ -98,7 +98,7 @@
.PHONY: lua-all tolua++ luasocket slnunicode luajson loop lualogging luaexpat
luafilesystem luaprofiler luazipfilter
-lua-all: lua tolua++ luasocket slnunicode luajson loop lualogging luaexpat
luafilesystem luaprofiler
+lua-all: lua tolua++ luasocket slnunicode luajson loop lualogging luaexpat
luafilesystem luaprofiler luazipfilter
# lua (requires readline ncurses)
lua:
@@ -264,5 +264,8 @@
@echo "Cleaning: luajson"
-cd luajson; make distclean
@echo "----------------------------------------------------------"
+ @echo "Cleaning luazipfilter"
+ -cd luazipfilter; make distclean
+ @echo "----------------------------------------------------------"
@echo "Cleaning: tolua++"
-cd tolua++-1.0.92/src/lib; rm libtolua++.a; rm *.o
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua?rev=2725&root=Jive&r1=2724&r2=2725&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
Wed Jul 23 07:34:28 2008
@@ -107,44 +107,48 @@
local installed = self:getSettings()
local ip, port = self.server:getIpPort()
- for _,entry in pairs(data.item_loop) do
-
- local version
- local check = false
- local url
-
- if entry.relurl then
- url = 'http://' .. ip .. ':' .. port .. entry.relurl
- else
- url = entry.url
- end
-
- if installed[entry.applet] then
- version = installed[entry.applet] .. " > " ..
entry.version
- if entry.version > installed[entry.applet] then
+ if data.item_loop then
+
+ for _,entry in pairs(data.item_loop) do
+
+ local version
+ local check = false
+ local url
+
+ if entry.relurl then
+ url = 'http://' .. ip .. ':' .. port ..
entry.relurl
+ else
+ url = entry.url
+ end
+
+ if installed[entry.applet] then
+ version = installed[entry.applet] .. " > " ..
entry.version
+ if entry.version > installed[entry.applet] then
+ self.todownload[entry.applet] = { url =
url, ver = entry.version }
+ check = true
+ end
+ else
+ version = entry.version
self.todownload[entry.applet] = { url = url,
ver = entry.version }
check = true
end
- else
- version = entry.version
- self.todownload[entry.applet] = { url = url, ver =
entry.version }
- check = true
- end
-
- self.menu:addItem( {
- text = entry.name .. " [" .. version .. "]",
- icon = Checkbox("checkbox",
- function(object, isSelected)
- if isSelected then
- self.todownload[entry.applet] =
{ url = url, ver = entry.version }
- else
- self.todownload[entry.applet] =
nil
- end
- end,
- check
- ),
- weight = check and 2 or 4
- })
+
+ self.menu:addItem( {
+ text = entry.name .. " [" .. version .. "]",
+ icon = Checkbox("checkbox",
+ function(object, isSelected)
+ if isSelected then
+
self.todownload[entry.applet] = { url = url, ver = entry.version }
+ else
+
self.todownload[entry.applet] = nil
+ end
+ end,
+ check
+ ),
+ weight = check and 2 or 4
+ })
+ end
+
end
if self.menu:numItems() > 0 then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
