Mailinglist Archive: yast-commit (595 mails)

[locilka@xxxxxxxxxxxxxxxx]

Author: locilka
Date: Fri Dec  5 14:15:15 2008
New Revision: 53930

URL: http://svn.opensuse.org/viewcvs/yast?rev=53930&view=rev
Log:
Added checking of the XML files during build


Modified:
    trunk/installation/control/Makefile.am
    trunk/installation/control/add-on-template_installation.xml
    trunk/installation/yast2-installation.spec.in

Modified: trunk/installation/control/Makefile.am
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/Makefile.am?rev=53930&r1=53929&r2=53930&view=diff
==============================================================================
--- trunk/installation/control/Makefile.am (original)
+++ trunk/installation/control/Makefile.am Fri Dec  5 14:15:15 2008
@@ -25,6 +25,7 @@
 control.rng: control.rnc
        trang -I rnc -O rng control.rnc control.rng
 
-validate:
+# checks only those control files that belong to this package
+check-local:
        trang -I rnc -O rng control.rnc control.rng
-       for file in `ls *.xml`; do xmllint --relaxng control.rng --noout 
${file}; done
+       xmllint --relaxng control.rng --noout add-on-template_installation.xml 
control.xml

Modified: trunk/installation/control/add-on-template_installation.xml
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/add-on-template_installation.xml?rev=53930&r1=53929&r2=53930&view=diff
==============================================================================
--- trunk/installation/control/add-on-template_installation.xml (original)
+++ trunk/installation/control/add-on-template_installation.xml Fri Dec  5 
14:15:15 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE productDefines SYSTEM "/usr/share/YaST2/control/control.dtd">
 <productDefines  xmlns="http://www.suse.com/1.0/yast2ns";
     xmlns:config="http://www.suse.com/1.0/configns";>
        <textdomain>control</textdomain>

Modified: trunk/installation/yast2-installation.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=53930&r1=53929&r2=53930&view=diff
==============================================================================
--- trunk/installation/yast2-installation.spec.in (original)
+++ trunk/installation/yast2-installation.spec.in Fri Dec  5 14:15:15 2008
@@ -4,6 +4,9 @@
 @HEADER@
 BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer 
sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
 
+# xmllint
+BuildRequies:  libxml2
+
 # to convert control.rnc o control.rng
 BuildRequires: trang
 
@@ -119,6 +122,7 @@
 %defattr(-,root,root)
 %dir /usr/share/YaST2/control
 /usr/share/YaST2/control/*.xml
+# Fixme: move to another package (to make build of other packages faster)
 /usr/share/YaST2/control/*.rng
 /usr/share/YaST2/control/*.rnc
 

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx