better use of <wx-data>

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in
index 85f007ed001936eeca6f445aec16b7df7fb8e51d..44b5e9b76c70fae171efaa356fee0aecebcfd408 100644 (file)
--- a/utils/screenshotgen/src/Makefile.in
+++ b/utils/screenshotgen/src/Makefile.in
@@ -163,7 +163,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
 
 ### Targets: ###
 
-all: screenshotgen$(EXEEXT) $(__screenshotgen_bundle___depname) data
+all: screenshotgen$(EXEEXT) $(__screenshotgen_bundle___depname) bitmaps xml
 
 install: install_screenshotgen
 
@@ -217,9 +217,21 @@ install_screenshotgen: screenshotgen$(EXEEXT)
 uninstall_screenshotgen: 
        rm -f $(DESTDIR)$(bindir)/screenshotgen$(EXEEXT)
 
-data: 
+bitmaps: 
+       @mkdir -p ./bitmaps
+       @for f in wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif; do \
+       if test ! -f ./bitmaps/$$f -a ! -d ./bitmaps/$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/bitmaps/$$f -newer ./bitmaps/$$f -print` ; \
+       fi; \
+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/bitmaps/$$f ./bitmaps ;; \
+       esac; \
+       done
+
+xml: 
        @mkdir -p .
-       @for f in richtext.xml bitmaps/wxwin32x32.png bitmaps/bell.png bitmaps/sound.png bitmaps/dropbuth.png bitmaps/dropbutn.png bitmaps/dropbutp.png bitmaps/throbber.gif; do \
+       @for f in richtext.xml; do \
        if test ! -f ./$$f -a ! -d ./$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
@@ -264,4 +276,4 @@ $(srcdir)/include/wx/stc/stc.h
 @IF_GNU_MAKE@-include ./.deps/*.d
 
 .PHONY: all install uninstall clean distclean screenshotgen_bundle \
-       install_screenshotgen uninstall_screenshotgen data
+       install_screenshotgen uninstall_screenshotgen bitmaps xml

diff --git a/utils/screenshotgen/src/makefile.bcc b/utils/screenshotgen/src/makefile.bcc
index bc6b21811e22126725544b91d5f334c93ace14a9..75d0acee263ab0350c4ba0f9dbd65bd60d3d3a12 100644 (file)
--- a/utils/screenshotgen/src/makefile.bcc
+++ b/utils/screenshotgen/src/makefile.bcc
@@ -240,7 +240,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\screenshotgen.exe data
+all: $(OBJS)\screenshotgen.exe bitmaps xml
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -258,9 +258,13 @@ $(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS)  $(OBJS)\screenshotgen_scree
        c0w32.obj $(SCREENSHOTGEN_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_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 $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\screenshotgen_screenshotgen.res
 |
 
-data: 
+bitmaps: 
+       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+       for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
+
+xml: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (richtext.xml bitmaps\wxwin32x32.png bitmaps\bell.png bitmaps\sound.png bitmaps\dropbuth.png bitmaps\dropbutn.png bitmaps\dropbutp.png bitmaps\throbber.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
        $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp

diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc
index c1f0cd3dcdb8287afa43bf346cb19918a9446b8b..7826d30794d37145946a4e5ccc9f9cec34d62e09 100644 (file)
--- a/utils/screenshotgen/src/makefile.gcc
+++ b/utils/screenshotgen/src/makefile.gcc
@@ -241,7 +241,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\screenshotgen.exe data
+all: $(OBJS)\screenshotgen.exe bitmaps xml
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
@@ -251,9 +251,13 @@ clean:
 $(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen_rc.o
        $(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_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) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 
-data: 
+bitmaps: 
+       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+       for %%f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%%f copy .\bitmaps\%%f $(OBJS)\bitmaps
+
+xml: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %%f in (richtext.xml bitmaps\wxwin32x32.png bitmaps\bell.png bitmaps\sound.png bitmaps\dropbuth.png bitmaps\dropbutn.png bitmaps\dropbutp.png bitmaps\throbber.gif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+       for %%f in (richtext.xml) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\screenshotgen_screenshot_app.o: ./screenshot_app.cpp
        $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
@@ -276,7 +280,7 @@ $(OBJS)\screenshotgen_autocapture.o: ./autocapture.cpp
 $(OBJS)\screenshotgen_screenshotgen_rc.o: ./screenshotgen.rc
        windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
 
-.PHONY: all clean data
+.PHONY: all clean bitmaps xml
 
 
 SHELL := $(COMSPEC)

diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc
index 21fba509c0548811db8ef3b67a98dee724720960..1fb5ed106be456f1aa72551b9e0957f67ac3493e 100644 (file)
--- a/utils/screenshotgen/src/makefile.vc
+++ b/utils/screenshotgen/src/makefile.vc
@@ -319,7 +319,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\screenshotgen.exe data
+all: $(OBJS)\screenshotgen.exe bitmaps xml
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -334,9 +334,13 @@ $(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screen
        $(SCREENSHOTGEN_OBJECTS)  $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_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 $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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
 <<
 
-data: 
+bitmaps: 
+       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+       for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
+
+xml: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (richtext.xml bitmaps\wxwin32x32.png bitmaps\bell.png bitmaps\sound.png bitmaps\dropbuth.png bitmaps\dropbutn.png bitmaps\dropbutp.png bitmaps\throbber.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp

diff --git a/utils/screenshotgen/src/makefile.wat b/utils/screenshotgen/src/makefile.wat
index d28fd01ab826ef6a55714837d783d4dfc27d5cdc..0473d604001e608420b276de0e06061d216807f9 100644 (file)
--- a/utils/screenshotgen/src/makefile.wat
+++ b/utils/screenshotgen/src/makefile.wat
@@ -266,7 +266,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\screenshotgen.exe data
+all : .SYMBOLIC $(OBJS)\screenshotgen.exe bitmaps xml
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -288,9 +288,13 @@ $(OBJS)\screenshotgen.exe :  $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_scre
        @for %i in () do @%append $(OBJS)\screenshotgen.lbc option stack=%i
        wlink @$(OBJS)\screenshotgen.lbc
 
-data : .SYMBOLIC 
+bitmaps : .SYMBOLIC 
+       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+       for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
+
+xml : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (richtext.xml bitmaps\wxwin32x32.png bitmaps\bell.png bitmaps\sound.png bitmaps\dropbuth.png bitmaps\dropbutn.png bitmaps\dropbutp.png bitmaps\throbber.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\screenshotgen_screenshot_app.obj :  .AUTODEPEND .\screenshot_app.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<

diff --git a/utils/screenshotgen/src/screenshotgen.bkl b/utils/screenshotgen/src/screenshotgen.bkl
index ba087abae257d22ce1b7a770afd58f1b7da50d6d..1e32b9aedafb319b95910d16e130a61c744ed690 100644 (file)
--- a/utils/screenshotgen/src/screenshotgen.bkl
+++ b/utils/screenshotgen/src/screenshotgen.bkl
@@ -42,16 +42,23 @@
         <install-to>$(BINDIR)</install-to>
     </exe>
 
-    <wx-data id="data">
+    <wx-data id="bitmaps">
+        <dstdir>$(BUILDDIR)/bitmaps</dstdir>
+        <srcdir>$(SRCDIR)/bitmaps</srcdir>
+        <files>
+            wxwin32x32.png
+            bell.png
+            sound.png
+            dropbuth.png
+            dropbutn.png
+            dropbutp.png
+            throbber.gif
+        </files>
+    </wx-data>
+
+    <wx-data id="xml">
         <files>
             richtext.xml
-            bitmaps$(DIRSEP)wxwin32x32.png
-            bitmaps$(DIRSEP)bell.png
-            bitmaps$(DIRSEP)sound.png
-            bitmaps$(DIRSEP)dropbuth.png
-            bitmaps$(DIRSEP)dropbutn.png
-            bitmaps$(DIRSEP)dropbutp.png
-            bitmaps$(DIRSEP)throbber.gif
         </files>
     </wx-data>