From: Václav Slavík Date: Thu, 1 Jul 2004 07:07:52 +0000 (+0000) Subject: copy doc/ directory to builddir X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9cce386aba8eaa756a5d74cec9f72ac646e990c9?ds=inline copy doc/ directory to builddir git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 6afdcd2500..001c9a1aba 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -110,7 +110,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ ### Targets: ### -all: help$(EXEEXT) $(__help_bundle___depname) +all: help$(EXEEXT) $(__help_bundle___depname) data install: all @@ -157,6 +157,18 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist @COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP) +data: + @mkdir -p ./doc + @for f in aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \ + if test ! -e ./doc/$$f ; \ + then x=yep ; \ + else x=`find $(srcdir)/doc/$$f -newer ./doc/$$f -print` ; \ + fi; \ + case "$$x" in ?*) \ + cp -pRf $(srcdir)/doc/$$f ./doc ;; \ + esac; \ + done + help_demo.o: $(srcdir)/demo.cpp $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $< @@ -167,4 +179,4 @@ help_demo_rc.o: $(srcdir)/demo.rc # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all install uninstall clean distclean help_bundle +.PHONY: all install uninstall clean distclean help_bundle data diff --git a/samples/help/help.bkl b/samples/help/help.bkl index 28bf7e42b1..fa12112403 100644 --- a/samples/help/help.bkl +++ b/samples/help/help.bkl @@ -11,4 +11,50 @@ demo.rc + + + back.gif + books.gif + bullet.bmp + contents.gif + cshelp.txt + doc.chm + doc.cnt + doc.hhc + doc.hhk + doc.hhp + doc.hlp + doc.hpj + doc.zip + forward.gif + up.gif + + + + + $(BUILDDIR)/doc + $(SRCDIR)/doc + + aindex.html + ClassGraph.class + ClassGraphPanel.class + ClassLayout.class + down.gif + dxxgifs.tex + HIER.html + HIERjava.html + icon1.gif + icon2.gif + index.html + logo.gif + NavigatorButton.class + USE_HELP.html + wx204.htm + wx34.htm + wxExtHelpController.html + wxhelp.map + wx.htm + + + diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc index f71c5f4ed6..08a6f98ccb 100644 --- a/samples/help/makefile.bcc +++ b/samples/help/makefile.bcc @@ -156,7 +156,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\help.exe +all: $(OBJS)\help.exe data clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -173,8 +173,13 @@ $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\help_demo.res | +data: + if not exist $(OBJS)\doc mkdir $(OBJS)\doc + for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc + $(OBJS)\help_demo.obj: .\demo.cpp $(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) $** $(OBJS)\help_demo.res: .\demo.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $** + diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc index e485e9a85d..5dcec69e12 100644 --- a/samples/help/makefile.gcc +++ b/samples/help/makefile.gcc @@ -161,7 +161,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\help.exe +all: $(OBJS)\help.exe data clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o @@ -170,10 +170,15 @@ clean: $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo_rc.o $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 +data: + if not exist $(OBJS)\doc mkdir $(OBJS)\doc + for %%f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc + $(OBJS)\help_demo.o: ./demo.cpp $(CXX) -c -o $@ $(HELP_CXXFLAGS) $< $(OBJS)\help_demo_rc.o: ./demo.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples -.PHONY: all clean +.PHONY: all clean data + diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index ad15e26ae1..67eee54c82 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -243,7 +243,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\help.exe +all: $(OBJS)\help.exe data clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -257,8 +257,13 @@ $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res $(HELP_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib << +data: + if not exist $(OBJS)\doc mkdir $(OBJS)\doc + for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc + $(OBJS)\help_demo.obj: .\demo.cpp $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) $** $(OBJS)\help_demo.res: .\demo.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $** + diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat index 4cecae999b..e939558c7e 100644 --- a/samples/help/makefile.wat +++ b/samples/help/makefile.wat @@ -103,6 +103,13 @@ __RUNTIME_LIBS_5 = -br !ifeq RUNTIME_LIBS static __RUNTIME_LIBS_5 = !endif +__EXCEPTIONSFLAG_6 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_6 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_6 = -xr +!endif __EXCEPTIONSFLAG_7 = !ifeq USE_EXCEPTIONS 0 __EXCEPTIONSFLAG_7 = @@ -179,7 +186,7 @@ SETUPHDIR = & HELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & - $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = & $(OBJS)\help_demo.obj @@ -190,7 +197,7 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC $(OBJS)\help.exe +all : .SYMBOLIC $(OBJS)\help.exe data clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -210,8 +217,13 @@ $(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res wlink @$(OBJS)\help.lbc +data : .SYMBOLIC + if not exist $(OBJS)\doc mkdir $(OBJS)\doc + for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc + $(OBJS)\help_demo.obj : .AUTODEPEND .\demo.cpp $(CXX) -zq -fo=$^@ $(HELP_CXXFLAGS) $< $(OBJS)\help_demo.res : .AUTODEPEND .\demo.rc wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $< +