From 08d37a4e41897a93c2347db3e9357c0d557073dd Mon Sep 17 00:00:00 2001 From: rr2000 Date: Sun, 29 Jun 2014 11:09:17 +0000 Subject: [PATCH] Move xml file under subdir lib, otherwise it won't be deployed during update Add ID keyword substitution git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6177 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 ++ fhem/FHEM/37_SHC.pm | 2 +- fhem/FHEM/37_SHCdev.pm | 2 +- fhem/FHEM/SHC_datafields.pm | 2 +- fhem/FHEM/SHC_parser.pm | 4 ++-- fhem/FHEM/{ => lib}/SHC_packet_layout.xml | 0 6 files changed, 7 insertions(+), 5 deletions(-) rename fhem/FHEM/{ => lib}/SHC_packet_layout.xml (100%) diff --git a/fhem/CHANGED b/fhem/CHANGED index 32be99ac3..fbd613b25 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 37_SHC.pm: Move xml file under subdir lib, otherwise it won't be + deployed during update - bugfix: 70_PIONEERAVR.pm: player commands are now available for more inputs "play" was not in the drop down list of available set commands check every 120s if the data connection to the Pioneer AV receiver is still up diff --git a/fhem/FHEM/37_SHC.pm b/fhem/FHEM/37_SHC.pm index 1fbc7d557..7d6678a29 100644 --- a/fhem/FHEM/37_SHC.pm +++ b/fhem/FHEM/37_SHC.pm @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License along # with smarthomatic. If not, see . ########################################################################### -# $Id: 37_SHC.pm xxxx 2014-xx-xx xx:xx:xx rr2000 $ +# $Id$ package main; diff --git a/fhem/FHEM/37_SHCdev.pm b/fhem/FHEM/37_SHCdev.pm index 89f404b64..1d986dfc4 100644 --- a/fhem/FHEM/37_SHCdev.pm +++ b/fhem/FHEM/37_SHCdev.pm @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License along # with smarthomatic. If not, see . ########################################################################### -# $Id: 37_SHCdev.pm xxxx 2014-xx-xx xx:xx:xx rr2000 $ +# $Id$ package main; diff --git a/fhem/FHEM/SHC_datafields.pm b/fhem/FHEM/SHC_datafields.pm index 5dbd285dc..7b424eaae 100644 --- a/fhem/FHEM/SHC_datafields.pm +++ b/fhem/FHEM/SHC_datafields.pm @@ -21,7 +21,7 @@ # You should have received a copy of the GNU General Public License along # with smarthomatic. If not, see . ########################################################################## -# $Id: 37_SHC_Dev.pm xxxx 2014-xx-xx xx:xx:xx rr2000 $ +# $Id$ package SHC_util; diff --git a/fhem/FHEM/SHC_parser.pm b/fhem/FHEM/SHC_parser.pm index ee198c2c4..950cd2fa5 100644 --- a/fhem/FHEM/SHC_parser.pm +++ b/fhem/FHEM/SHC_parser.pm @@ -46,7 +46,7 @@ # 3.) Get send string: $str = $parser->getSendString($receiverID); # 4.) Send string to base station (over UART). ########################################################################## -# $Id: 37_SHC_Dev.pm xxxx 2014-xx-xx xx:xx:xx rr2000 $ +# $Id$ package SHC_parser; @@ -97,7 +97,7 @@ sub new sub init_datafield_positions() { my $x = XML::LibXML->new() or die "new on XML::LibXML failed"; - my $d = $x->parse_file("FHEM/SHC_packet_layout.xml") or die "parsing XML file failed"; + my $d = $x->parse_file("FHEM/lib/SHC_packet_layout.xml") or die "parsing XML file failed"; for my $element ($d->findnodes("/Packet/Header/EnumValue[ID='MessageType']/Element")) { my $value = ($element->findnodes("Value"))[0]->textContent; diff --git a/fhem/FHEM/SHC_packet_layout.xml b/fhem/FHEM/lib/SHC_packet_layout.xml similarity index 100% rename from fhem/FHEM/SHC_packet_layout.xml rename to fhem/FHEM/lib/SHC_packet_layout.xml