[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdoctools
From:       Luigi Toscano <luigi.toscano () tiscali ! it>
Date:       2010-05-11 23:24:25
Message-ID: 20100511232425.DCA83AC8B3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1125691 by ltoscano:

Remove last bits of xml-dtd-4.1.2


 M  +1 -1      CMakeLists.txt  
 D             docbook/xml-dtd-4.1.2 (directory)  
 M  +1 -1      meinproc.cpp  
 M  +0 -1      xslt.cpp  


--- trunk/KDE/kdelibs/kdoctools/CMakeLists.txt #1125690:1125691
@@ -128,7 +128,7 @@
     endforeach(_curentfile ${_file_CUST})
 endmacro(INSTALL_CUSTOMIZE_DIR _expr _directory)
 
-set(docbookdir xml-dtd-4.1.2  xml-dtd-4.2  xsl )
+set(docbookdir xml-dtd-4.2  xsl )
 
 
 set(expr "docbook/README.kde")
--- trunk/KDE/kdelibs/kdoctools/meinproc.cpp #1125690:1125691
@@ -136,7 +136,7 @@
         QByteArray catalogs;
         catalogs += KUrl::fromLocalFile( KStandardDirs::locate( "dtd", \
"customization/catalog.xml" ) ).toEncoded();  catalogs += ' ';
-        catalogs += KUrl::fromLocalFile( KStandardDirs::locate( "dtd", \
"docbook/xml-dtd-4.1.2/catalog.xml" ) ).toEncoded(); +        catalogs += \
KUrl::fromLocalFile( KStandardDirs::locate( "dtd", "docbook/xml-dtd-4.2/catalog.xml" \
) ).toEncoded();  
         QString exe;
 #if defined( XMLLINT )
--- trunk/KDE/kdelibs/kdoctools/xslt.cpp #1125690:1125691
@@ -140,7 +140,6 @@
     xmlSetExternalEntityLoader(xsltprocExternalEntityLoader);         
 	
 	QString dataPath = QDir::cleanPath( QCoreApplication::applicationDirPath() + \
                QLatin1String("/../share/apps") );
-	replaceURLList[QLatin1String("http://www.oasis-open.org/docbook/xml/4.1.2")] = \
QString("file:///%1/ksgmltools2/docbook/xml-dtd-4.1.2").arg(dataPath);  \
replaceURLList[QLatin1String("http://www.oasis-open.org/docbook/xml/4.2")] = \
QString("file:///%1/ksgmltools2/docbook/xml-dtd-4.2").arg(dataPath);  #endif
 


[prev in list] [next in list] [prev in thread] [next in thread]