Author: titmuss
Date: Thu Jan 17 08:36:15 2008
New Revision: 1486
URL: http://svn.slimdevices.com?rev=1486&root=Jive&view=rev
Log:
Bug: N/A
Description:
Add desktop applets to Windows build.
Fix parsing mac address on windows.
Modified:
trunk/jive/src/pkg/jive/VisualC/PostBuild.bat
trunk/jive/src/pkg/jive_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
Modified: trunk/jive/src/pkg/jive/VisualC/PostBuild.bat
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/VisualC/PostBuild.bat?rev=1486&root=Jive&r1=1485&r2=1486&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/VisualC/PostBuild.bat (original)
+++ trunk/jive/src/pkg/jive/VisualC/PostBuild.bat Thu Jan 17 08:36:15 2008
@@ -9,6 +9,7 @@
md %1\lua
md %1\lua\applets
xcopy jive\share\applets\*.* %1\lua\applets\*.* /S/Y
+xcopy jive_desktop\share\applets\*.* %1\lua\applets\*.* /S/Y
md %1\lua\jive
xcopy jive\share\jive\*.* %1\lua\jive\*.* /S/Y
Modified:
trunk/jive/src/pkg/jive_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua?rev=1486&root=Jive&r1=1485&r2=1486&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
(original)
+++
trunk/jive/src/pkg/jive_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
Thu Jan 17 08:36:15 2008
@@ -58,17 +58,13 @@
end
if not settings.mac then
- -- FIXME this needs testing
local f = io.popen("ipconfig /all")
if f then
local ipconfig = f:read("*a")
f:close()
- log:debug("ipconfig: ", ipconfig)
-
store = true
- local mac = string.match(ipconfig, "Physical
Address.-:([%x%-]+)")
- log:debug("mac: ", mac)
+ local mac = string.match(ipconfig, "Physical Address[
%.%-]-:%s([%x%-]+)")
if mac then
settings.mac = string.gsub(mac, "%-", ":")
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
