There is no reason to have our own db2html hack. It creates
problems, we never got it to work reliably on different distros,
etc. We should use the one provided with the system, it's a far
safer bet. Also, our build system uses the standard db2html,
it's only the make_winehq script that used it. And that script
is used only on WineHQ, where we should be able to control the
environment to have a half-decent db2html that supports the
-d option.
Remember to:
cvs rm -f documentation/db2html-winehq
after applying the patch.
ChangeLog
Dimitrie O. Paun <dpaun@rogers.com>
Use the standard db2html instead of our db2html-winehq script.
Index: documentation/make_winehq
===================================================================
RCS file: /home/wine/wine/documentation/make_winehq,v
retrieving revision 1.7
diff -u -r1.7 make_winehq
--- documentation/make_winehq 14 Apr 2003 21:31:49 -0000 1.7
+++ documentation/make_winehq 18 Apr 2003 17:19:45 -0000
@@ -27,23 +27,17 @@
mkdir "$WWWDIR"
## Create five-book HTML tarball
-echo "./db2html-winehq wine-user.sgml"
-./db2html-winehq wine-user.sgml
-echo "./db2html-winehq wine-devel.sgml"
-./db2html-winehq wine-devel.sgml
-echo "./db2html-winehq winelib-user.sgml"
-./db2html-winehq winelib-user.sgml
-echo "./db2html-winehq wine-faq.sgml"
-./db2html-winehq wine-faq.sgml
+echo "db2html -d ./default.dsl wine-user.sgml"
+db2html -d ./default.dsl wine-user.sgml
+echo "db2html -d ./default.dsl wine-devel.sgml"
+db2html -d ./default.dsl wine-devel.sgml
+echo "db2html -d ./default.dsl winelib-user.sgml"
+db2html -d ./default.dsl winelib-user.sgml
+echo "db2html -d ./default.dsl wine-faq.sgml"
+db2html -d ./default.dsl wine-faq.sgml
tar czf winedoc-html.tgz wine-user wine-devel winelib-user wine-faq
cp winedoc-html.tgz "$WWWDIR"
@@ -70,25 +64,22 @@
## Create SGML tarball
echo "Creating SGML package..."
-tar czf winedoc-sgml.tgz *.sgml *.dsl *.ent db2html-winehq
+tar czf winedoc-sgml.tgz *.sgml *.dsl *.ent
cp winedoc-sgml.tgz "$WWWDIR"
## Done creating downloadable tarballs for users. Now we want to
## create a tarball of SHTML in a slightly different form, for the
## website. These versions use special server-side includes which
## aren't appropriate outside of winehq.com.
-##
-## Use the special website stylesheet
-export WINEDOC_STYLESHEET=../winehq.dsl
## Create four-book SHTML tarball
-echo "./db2html-winehq wine-user.sgml"
-./db2html-winehq wine-user.sgml
-echo "./db2html-winehq wine-devel.sgml"
-./db2html-winehq wine-devel.sgml
-echo "./db2html-winehq winelib-user.sgml"
-./db2html-winehq winelib-user.sgml
-echo "./db2html-winehq wine-faq.sgml"
-./db2html-winehq wine-faq.sgml
+echo "db2html -d ./winehq.dsl wine-user.sgml"
+db2html -d ./winehq.dsl wine-user.sgml
+echo "db2html -d ./winehq.dsl wine-devel.sgml"
+db2html -d ./winehq.dsl wine-devel.sgml
+echo "db2html -d ./winehq.dsl winelib-user.sgml"
+db2html -d ./winehq.dsl winelib-user.sgml
+echo "db2html -d ./winehq.dsl wine-faq.sgml"
+db2html -d ./winehq.dsl wine-faq.sgml
tar czf winehq-shtml.tgz wine-user wine-devel winelib-user wine-faq
cp winehq-shtml.tgz "$WWWDIR"
--
Dimi.
