Author: titmuss
Date: Fri Jul 18 08:22:16 2008
New Revision: 2716
URL: http://svn.slimdevices.com?rev=2716&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix some paths for the poky installed OS.
Make lua-lint make rules for checking lua syntax.
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=2716&root=Jive&r1=2715&r2=2716&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am Fri Jul 18 08:22:16 2008
@@ -9,12 +9,12 @@
$(TOLUA) $(TOLUAFLAGS) $(AM_TOLUAFLAGS) -n jive -o $@ $^
-# Check lua syntax
-#check_lua:
-# @rm -f badsyntax
-# @find . -name "*.lua" -and \( -exec luac -p '{}' \; -or -print \) >
badsyntax
-# @test \! -s badsyntax
-# @rm -f badsyntax
+ Check lua syntax
+lua-lint:
+ @rm -f badsyntax
+ @find . -name "*.lua" -and \( -exec luac -p '{}' \; -or -print \) >
badsyntax
+ @test \! -s badsyntax
+ @rm -f badsyntax
# Convenience library:
@@ -99,7 +99,6 @@
src/jive_debug.c
jive_LDADD = libjiveui.la libjiveaudio.la libjivenet.la -llua
-#jive_DEPENDENCIES = check_lua
# Test program: jiveblit
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=2716&root=Jive&r1=2715&r2=2716&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in Fri Jul 18 08:22:16 2008
@@ -351,13 +351,6 @@
SUFFIXES = .pkg
TOLUA = tolua++
-# Check lua syntax
-#check_lua:
-# @rm -f badsyntax
-# @find . -name "*.lua" -and \( -exec luac -p '{}' \; -or -print \) >
badsyntax
-# @test \! -s badsyntax
-# @rm -f badsyntax
-
# Convenience library:
noinst_LTLIBRARIES = libjiveui.la libjiveaudio.la libjivenet.la
BUILT_SOURCES = \
@@ -413,7 +406,6 @@
src/jive_debug.c
jive_LDADD = libjiveui.la libjiveaudio.la libjivenet.la -llua
-#jive_DEPENDENCIES = check_lua
# Test program: jiveblit
jiveblit_SOURCES = \
@@ -2378,6 +2370,13 @@
.pkg.c:
$(TOLUA) $(TOLUAFLAGS) $(AM_TOLUAFLAGS) -n jive -o $@ $^
+ Check lua syntax
+lua-lint:
+ @rm -f badsyntax
+ @find . -name "*.lua" -and \( -exec luac -p '{}' \; -or -print \) >
badsyntax
+ @test \! -s badsyntax
+ @rm -f badsyntax
+
src/version.h: FORCE
echo '/* This file is automatically generated */' > src/version.h
echo '#ifndef SQUEEZEPLAY_RELEASE' >> src/version.h
Modified: 7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am?rev=2716&root=Jive&r1=2715&r2=2716&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am Fri Jul 18 08:22:16
2008
@@ -2,7 +2,7 @@
# Check lua syntax
-check_lua:
+lua-lint:
@rm -f badsyntax
@find . -name "*.lua" -and \( -exec luac -p '{}' \; -or -print \) >
badsyntax
@test \! -s badsyntax
@@ -13,7 +13,6 @@
lib_LTLIBRARIES = jiveBSP.la jiveWireless.la jiveWatchdog.la
-jiveBSP_la_DEPENDENCIES = check_lua
jiveBSP_la_LDFLAGS = -module -no-version
jiveBSP_la_SOURCES = \
src/jive_bsp.c
Modified: 7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in?rev=2716&root=Jive&r1=2715&r2=2716&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in Fri Jul 18 08:22:16
2008
@@ -249,7 +249,6 @@
target_alias = @target_alias@
AM_CFLAGS = -Wall -Werror -D_GNU_SOURCE
lib_LTLIBRARIES = jiveBSP.la jiveWireless.la jiveWatchdog.la
-jiveBSP_la_DEPENDENCIES = check_lua
jiveBSP_la_LDFLAGS = -module -no-version
jiveBSP_la_SOURCES = \
src/jive_bsp.c
@@ -1021,7 +1020,7 @@
# Check lua syntax
-check_lua:
+lua-lint:
@rm -f badsyntax
@find . -name "*.lua" -and \( -exec luac -p '{}' \; -or -print \) >
badsyntax
@test \! -s badsyntax
Modified: 7.2/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua?rev=2716&root=Jive&r1=2715&r2=2716&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua Fri
Jul 18 08:22:16 2008
@@ -102,7 +102,7 @@
end
-- check marvell region
- local fh = assert(io.popen("/usr/sbin/iwpriv " .. self.interface .. "
getregioncode"))
+ local fh = assert(io.popen("/sbin/iwpriv " .. self.interface .. "
getregioncode"))
local line = fh:read("*a")
fh:close()
@@ -133,7 +133,7 @@
fh:close()
-- set new region
- local cmd = "/usr/sbin/iwpriv " .. self.interface .. " setregioncode "
.. mapping[1]
+ local cmd = "/sbin/iwpriv " .. self.interface .. " setregioncode " ..
mapping[1]
log:info("setRegion: ", cmd)
os.execute(cmd)
end
@@ -496,7 +496,7 @@
function getSNR(self)
- local f = io.popen("/usr/sbin/iwpriv " .. self.interface .. " getSNR 1")
+ local f = io.popen("/sbin/iwpriv " .. self.interface .. " getSNR 1")
if f == nil then
return 0
end
@@ -509,7 +509,7 @@
function getRSSI(self)
- local f = io.popen("/usr/sbin/iwpriv " .. self.interface .. " getRSSI
1")
+ local f = io.popen("/sbin/iwpriv " .. self.interface .. " getRSSI 1")
if f == nil then
return 0
end
@@ -522,7 +522,7 @@
function getNF(self)
- local f = io.popen("/usr/sbin/iwpriv " .. self.interface .. " getNF 1")
+ local f = io.popen("/sbin/iwpriv " .. self.interface .. " getNF 1")
if f == nil then
return 0
end
@@ -535,7 +535,7 @@
function getTxBitRate(self)
- local f = io.popen("/usr/sbin/iwconfig " .. self.interface)
+ local f = io.popen("/sbin/iwconfig " .. self.interface)
if f == nil then
return "0"
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
