You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2009/11/03 20:15:42 UTC
svn commit: r832520 - in
/incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs: builddocs.cmd
uimacppdocs.mak
Author: eae
Date: Tue Nov 3 19:15:41 2009
New Revision: 832520
URL: http://svn.apache.org/viewvc?rev=832520&view=rev
Log:
UIMA-1602
Modified:
incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/builddocs.cmd
incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/uimacppdocs.mak (contents, props changed)
Modified: incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/builddocs.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/builddocs.cmd?rev=832520&r1=832519&r2=832520&view=diff
==============================================================================
--- incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/builddocs.cmd (original)
+++ incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/builddocs.cmd Tue Nov 3 19:15:41 2009
@@ -29,17 +29,17 @@
:build
@echo building uimacpp docs in ..\docs
- nmake -f uimacppdocs.mak build DEL=DEL RD="RM /s /q" MDFILES=html\*.md5 MAPFILES=html\*.map DOTFILES=html\*.dot DOCDIR=.
+ nmake -f uimacppdocs.mak build CP=copy DEL=DEL RD="RM /s /q" MDFILES=html\*.md5 MAPFILES=html\*.map DOTFILES=html\*.dot HTMLDIR=.\html\
goto TheEnd
:rebuild
@echo rebuilding uimacpp docs in ..\docs
- nmake -f uimacppdocs.mak rebuild DEL=DEL RD="RM /s /q" MDFILES=html\*.md5 MAPFILES=html\*.map DOTFILES=html\*.dot DOCDIR=.
+ nmake -f uimacppdocs.mak rebuild CP=copy DEL=DEL RD="RM /s /q" MDFILES=html\*.md5 MAPFILES=html\*.map DOTFILES=html\*.dot HTMLDIR=.\html\
goto TheEnd
:clean
@echo cleaning uimacpp docs in ..\docs
- nmake -f uimacppdocs.mak clean DEL=DEL RD="RM /s /q" DOCDIR=.
+ nmake -f uimacppdocs.mak clean RD="RM /s /q" HTMLDIR=.\html\
goto TheEnd
:TheEnd
Modified: incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/uimacppdocs.mak
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/uimacppdocs.mak?rev=832520&r1=832519&r2=832520&view=diff
==============================================================================
--- incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/uimacppdocs.mak (original)
+++ incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/uimacppdocs.mak Tue Nov 3 19:15:41 2009
@@ -1,60 +1,43 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-#This makefile builds the UIMACPP documentation
-#Requires Doxygen 1.3.6 and Graphviz 1.8.10 installed and
-#PATH environment variable must include
-#doxygen/bin;graphviz/bin;graphviz/bin/tools
-#Must be run from the uimacpp/docs subdirectory
-
-#use these to run in WIN environment
-#RM=RD /s /q
-#DEL=del
-#MDFILES=..\docs\html\*.md5
-#MAPFILES=..\docs\html\*.map
-#DOTFILES=..\docs\html\*.dot
-#DOCDIR=..\docs
-
-#use these to run in LINUX environment
-#RM=rm -rf
-#DEL=rm
-#MDFILES=../docs/html/*.md5
-#MAPFILES=../docs/html/*.map
-#DOTFILES=../docs/html/*.dot
-#DOCDIR=../docs
-
-DOXYGENCMD=doxygen
-
-build : ../docs/html/index.html
-
-../docs/html/index.html : uimacpp.dox
- @echo building docs....
- $(DOXYGENCMD) uimacpp.dox
- $(DEL) $(MDFILES)
- $(DEL) $(MAPFILES)
- $(DEL) $(DOTFILES)
-
-rebuild : clean build
-
-clean :
- @echo deleting $(DOCDIR)/html
- $(RM) $(DOCDIR)/html
- @echo deleting tags file
- $(RM) $(DOCDIR)/uimadoxytags.tag
-
-
-
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+#This makefile builds the UIMACPP documentation
+#Requires Doxygen 1.3.6
+#PATH must include doxygen command
+#Must be run from the uimacpp/docs subdirectory
+
+DOXYGENCMD=doxygen
+
+build : ../docs/html/index.html
+
+../docs/html/index.html : uimacpp.dox
+ @echo building docs....
+ $(DOXYGENCMD) uimacpp.dox
+ $(DEL) $(MDFILES)
+ $(DEL) $(MAPFILES)
+ $(DEL) $(DOTFILES)
+# can't get doxygen to build correctly without graphical hierarchy
+ $(CP) $(HTMLDIR)hierarchy.html $(HTMLDIR)inherits.html
+
+rebuild : clean build
+
+clean :
+ @echo deleting $(DOCDIR)/html
+ $(RD) $(HTMLDIR)
+ @echo deleting tags file
+ $(DEL) uimadoxytags.tag
+
Propchange: incubator/uima/uimacpp/branches/uimacpp-2.3.0/docs/uimacppdocs.mak
------------------------------------------------------------------------------
svn:eol-style = native