Author: locilka Date: Tue Aug 5 09:40:30 2008 New Revision: 49662 URL: http://svn.opensuse.org/viewcvs/yast?rev=49662&view=rev Log: Package bindings in docu - final version At least for not... Modified: trunk/doc/_build-www.sh trunk/doc/tdg/Makefile.am trunk/doc/tdg/list_of_books.txt trunk/doc/tdg/yast.xml trunk/doc/webpage/layout.xml Modified: trunk/doc/_build-www.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/_build-www.sh?rev=49662&r1=49661&r2=49662&view=diff ============================================================================== --- trunk/doc/_build-www.sh (original) +++ trunk/doc/_build-www.sh Tue Aug 5 09:40:30 2008 @@ -202,6 +202,15 @@ make ${MAKE_PARAMS} >> ${BUILDLOG} 2>>${BUILDLOG} || (echo "5 exiting..." && exit 42) checkforerrors +# Creating pkg-bindings +cd ${SRCDIR} +make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} +cd pkg-bindings/doc +echo "| Current directory: "`pwd` +rm -rf html >> ${BUILDLOG} 2>>${BUILDLOG} +make >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors + # Checks the main doc directory # Builds the basic html doc echo @@ -211,8 +220,10 @@ echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors +echo "*** CLEANUP ***" >> ${BUILDLOG} 2>>${BUILDLOG} make clean >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors +echo "*** BUILDING ***" >> ${BUILDLOG} 2>>${BUILDLOG} make >> ${BUILDLOG} 2>>${BUILDLOG} || (echo "6 exiting..." && exit 42) checkforerrors @@ -310,6 +321,7 @@ echo "| Current directory: "`pwd` mkdir -pv ${TGTDIR}styleguide >> ${BUILDLOG} 2>>${BUILDLOG} cp -arf ${DOCDIR}styleguide/html/. ${TGTDIR}styleguide/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors echo echo "*** COPYING CODINGRULES ***" @@ -317,13 +329,16 @@ echo "| Current directory: "`pwd` mkdir -pv ${TGTDIR}codingrules >> ${BUILDLOG} 2>>${BUILDLOG} cp -arf ${DOCDIR}codingrules/html/. ${TGTDIR}codingrules/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors echo echo "*** COPYING TUTORIALS ***" echo "*** COPYING TUTORIALS ***" >> ${BUILDLOG} 2>>${BUILDLOG} echo "| Current directory: "`pwd` mkdir -pv ${TGTDIR}tutorials >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -arf ${DOCDIR}tutorials/html/. ${TGTDIR}tutorials/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors # Calls a script which installs YaST-based rpm's from work to the # ${TMPDIR} directory, builds the YCP Modules, Perl Modules and @@ -351,12 +366,29 @@ echo "*** COPYING -onefile DOCUMENTATION ***" echo "*** COPYING -onefile DOCUMENTATION ***" >> ${BUILDLOG} 2>>${BUILDLOG} mkdir -p cd ${TGTDIR}/onefile >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}modules/modules-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}perlmodules/perlmodules-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}scr/scr-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}styleguide/style-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}tdg/yast-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors cp -afv ${DOCDIR}tutorials/tutorial-onefile.html ${TGTDIR}onefile/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors + +echo "*** COPYING pkg-bindings ***" +echo "*** COPYING pkg-bindings ***" >> ${BUILDLOG} 2>>${BUILDLOG} +echo "| Current directory: "`pwd` +mkdir -pv ${TGTDIR}/pkg-bindings >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors +cp -arfv ${SRCDIR}/pkg-bindings/doc/html/*.html ${TGTDIR}/pkg-bindings/ >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors +cp -afv ${TGTDIR}/style/default.css ${TGTDIR}/pkg-bindings/yast2docs.css >> ${BUILDLOG} 2>>${BUILDLOG} +checkforerrors echo echo "*** Creating TGZ archive '"${PRODUCT}".tgz' from all the documentation ***" Modified: trunk/doc/tdg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/Makefile.am?rev=49662&r1=49661&r2=49662&view=diff ============================================================================== --- trunk/doc/tdg/Makefile.am (original) +++ trunk/doc/tdg/Makefile.am Tue Aug 5 09:40:30 2008 @@ -3,7 +3,7 @@ # XMLFILES=$(wildcard *.xml introduction/*.xml) -SUBDIRS = installation development ycp ui pkg-bindings library +SUBDIRS = installation development ycp ui library STYLESHEET_CSS = ../style/default.css all-local: html Modified: trunk/doc/tdg/list_of_books.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/list_of_books.txt?rev=49662&r1=49661&r2=49662&view=diff ============================================================================== --- trunk/doc/tdg/list_of_books.txt (original) +++ trunk/doc/tdg/list_of_books.txt Tue Aug 5 09:40:30 2008 @@ -10,4 +10,3 @@ Book-YaSTDevtools Book-YaSTReference Book-UIReference -Book-pkg-bindings Modified: trunk/doc/tdg/yast.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/yast.xml?rev=49662&r1=49661&r2=49662&view=diff ============================================================================== --- trunk/doc/tdg/yast.xml (original) +++ trunk/doc/tdg/yast.xml Tue Aug 5 09:40:30 2008 @@ -17,14 +17,11 @@ <!ENTITY modules SYSTEM "modules/modules.xml"> <!ENTITY app_ref SYSTEM "reference/app_ref.xml"> <!ENTITY generated-docu SYSTEM "generated-docu/documentation.xml"> -<!ENTITY generated-pkg-bindings SYSTEM "pkg-bindings/builtins.xml"> -<!-- <!ENTITY % libyui-entities SYSTEM "libyui/entities"> --> <!ENTITY % installation-entities SYSTEM "installation/entities"> <!ENTITY % library-entities SYSTEM "library/entities"> <!ENTITY % development-entities SYSTEM "development/entities"> <!ENTITY % ycpbuiltins-entities SYSTEM "ycp/entities"> -<!ENTITY % pkgbuiltins-entities SYSTEM "pkg-bindings/entities"> <!ENTITY % ui-entities SYSTEM "ui/entities"> <!-- %libyui-entities; --> %installation-entities; @@ -32,7 +29,6 @@ %development-entities; %ycpbuiltins-entities; %ui-entities; -%pkgbuiltins-entities; ]> <set> @@ -104,7 +100,6 @@ <chapter> <title>Modules and Libraries</title> &packages-section; - &pkg-bindings-section; &popups; &CommandLine-section; &runlevel-section; @@ -188,33 +183,4 @@ &YCP-UI-richtext; </book> - - - - - &generated-pkg-bindings; </set> Modified: trunk/doc/webpage/layout.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/webpage/layout.xml?rev=49662&r1=49661&r2=49662&view=diff ============================================================================== --- trunk/doc/webpage/layout.xml (original) +++ trunk/doc/webpage/layout.xml Tue Aug 5 09:40:30 2008 @@ -56,6 +56,9 @@ <tocentry id="scr" href="scr/index.html"> <title>SCR Agents</title> </tocentry> + <tocentry id="pkg-bindings" href="pkg-bindings/index.html"> + <title>Package Bindings</title> + </tocentry> </tocentry> <tocentry id="guides" href="index.html"> <title>Guides</title> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org