X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4094f3f23312c67991bc04151640f21b0dc29603..75cb911c7c8a475269901bf5f0c69c583d79e498:/build/bakefiles/make_dist.mk diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index c71ad93821..467a6f194a 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -15,6 +15,7 @@ COMMDIR = $(WXDIR)/src/common HTMLDIR = $(WXDIR)/src/html RICHTEXTDIR = $(WXDIR)/src/richtext AUIDIR = $(WXDIR)/src/aui +RIBBONDIR = $(WXDIR)/src/ribbon PROPGRIDDIR = $(WXDIR)/src/propgrid STCDIR = $(WXDIR)/src/stc UNIXDIR = $(WXDIR)/src/unix @@ -131,13 +132,18 @@ ALL_DIST: distrib_clean # copy wxpresets mkdir $(DISTDIR)/build mkdir $(DISTDIR)/build/bakefiles + $(CP_P) $(WXDIR)/build/bakefiles/README $(DISTDIR)/build/bakefiles + $(CP_P) $(WXDIR)/build/bakefiles/*.* $(DISTDIR)/build/bakefiles mkdir $(DISTDIR)/build/bakefiles/wxpresets mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets - mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample + $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets + $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/wx_presets.py $(DISTDIR)/build/bakefiles/wxpresets/presets + mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample - $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets + mkdir $(DISTDIR)/build/bakefiles/wxpresets/libsample + $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/libsample/*.* $(DISTDIR)/build/bakefiles/wxpresets/libsample mkdir $(DISTDIR)/build/aclocal $(CP_P) $(WXDIR)/build/aclocal/*.m4 $(DISTDIR)/build/aclocal @@ -158,9 +164,12 @@ ALL_GUI_DIST: ALL_DIST fi mkdir $(DISTDIR)/include/wx/meta mkdir $(DISTDIR)/include/wx/generic + mkdir $(DISTDIR)/include/wx/generic/private mkdir $(DISTDIR)/include/wx/html mkdir $(DISTDIR)/include/wx/richtext mkdir $(DISTDIR)/include/wx/aui + mkdir $(DISTDIR)/include/wx/ribbon + mkdir $(DISTDIR)/include/wx/persist mkdir $(DISTDIR)/include/wx/propgrid mkdir $(DISTDIR)/include/wx/stc mkdir $(DISTDIR)/include/wx/protocol @@ -172,50 +181,56 @@ ALL_GUI_DIST: ALL_DIST $(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx $(CP_P) $(INCDIR)/wx/meta/*.h $(DISTDIR)/include/wx/meta $(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic + $(CP_P) $(INCDIR)/wx/generic/private/*.h $(DISTDIR)/include/wx/generic/private $(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html $(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext $(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui + $(CP_P) $(INCDIR)/wx/ribbon/*.h $(DISTDIR)/include/wx/ribbon + $(CP_P) $(INCDIR)/wx/persist/*.h $(DISTDIR)/include/wx/persist $(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid $(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc + $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix $(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private $(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml $(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc - $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol - + mkdir $(DISTDIR)/art mkdir $(DISTDIR)/art/gtk mkdir $(DISTDIR)/art/motif $(CP_P) $(WXDIR)/art/*.xpm $(DISTDIR)/art $(CP_P) $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk $(CP_P) $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif - + mkdir $(DISTDIR)/src/$(TOOLKITDIR) $(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common $(CP_P) $(COMMDIR)/*.c $(DISTDIR)/src/common $(CP_P) $(COMMDIR)/*.inc $(DISTDIR)/src/common $(CP_P) $(COMMDIR)/*.mms $(DISTDIR)/src/common - + mkdir $(DISTDIR)/src/xrc $(CP_P) $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc - + mkdir $(DISTDIR)/src/unix $(CP_P) $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix $(CP_P) $(UNIXDIR)/*.mms $(DISTDIR)/src/unix - + mkdir $(DISTDIR)/src/generic $(CP_P) $(GENDIR)/*.cpp $(DISTDIR)/src/generic $(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic - + mkdir $(DISTDIR)/src/html $(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html - + mkdir $(DISTDIR)/src/richtext $(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext - + mkdir $(DISTDIR)/src/aui $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui + mkdir $(DISTDIR)/src/ribbon + $(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon + mkdir $(DISTDIR)/src/propgrid $(CP_P) $(PROPGRIDDIR)/*.cpp $(DISTDIR)/src/propgrid @@ -226,17 +241,17 @@ ALL_GUI_DIST: ALL_DIST $(CP_P) $(STCDIR)/*.* $(DISTDIR)/src/stc $(CP_P) $(STCDIR)/scintilla/src/* $(DISTDIR)/src/stc/scintilla/src $(CP_P) $(STCDIR)/scintilla/include/* $(DISTDIR)/src/stc/scintilla/include - + mkdir $(DISTDIR)/src/png $(CP_PR) $(PNGDIR)/* $(DISTDIR)/src/png - + mkdir $(DISTDIR)/src/jpeg $(CP_P) $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg $(CP_P) $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg $(CP_P) $(JPEGDIR)/*.vc $(DISTDIR)/src/jpeg $(CP_P) $(JPEGDIR)/makefile.* $(DISTDIR)/src/jpeg $(CP_P) $(JPEGDIR)/README $(DISTDIR)/src/jpeg - + mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/tiff/config mkdir $(DISTDIR)/src/tiff/contrib @@ -280,6 +295,8 @@ BASE_DIST: ALL_DIST INTL_DIST mkdir $(DISTDIR)/include/wx/html mkdir $(DISTDIR)/include/wx/richtext mkdir $(DISTDIR)/include/wx/aui + mkdir $(DISTDIR)/include/wx/ribbon + mkdir $(DISTDIR)/include/wx/persist mkdir $(DISTDIR)/include/wx/propgrid mkdir $(DISTDIR)/include/wx/stc mkdir $(DISTDIR)/include/wx/osx @@ -346,7 +363,7 @@ GTK_DIST: UNIV_DIST mkdir $(DISTDIR)/src/gtk/hildon $(CP_P) $(INCDIR)/wx/gtk/hildon/*.h $(DISTDIR)/include/wx/gtk/hildon $(CP_P) $(GTKDIR)/hildon/*.cpp $(DISTDIR)/src/gtk/hildon - + mkdir $(DISTDIR)/src/osx mkdir $(DISTDIR)/src/osx/core $(CP_P) $(WXDIR)/src/osx/core/*.cpp $(DISTDIR)/src/osx/core @@ -557,9 +574,12 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples - # copy files common to all samples in a general way - for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \ + # copy files common to all samples in a general way (samples without + # Makefile.in in them are Windows-specific and shouldn't be included in + # Unix distribution) + for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \ -mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \ + if [ ! -f $$s/Makefile.in ]; then continue; fi; \ t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \ mkdir -p $$t; \ $(CP_P) $$s/Makefile.in \ @@ -580,8 +600,6 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/animate $(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate - $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console - $(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd @@ -622,8 +640,6 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest - $(CP_P) $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles - $(CP_P) $(SAMPDIR)/opengl/penguin/trackball.c $(DISTDIR)/samples/opengl/penguin $(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin $(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf @@ -639,7 +655,6 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc $(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc $(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc - $(CP_P) $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils @@ -703,7 +718,6 @@ INTL_DIST: mkdir $(DISTDIR)/locale $(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale $(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale - -$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \ for dir in "$$subdirs"; do \ mkdir $(DISTDIR)/locale/$$dir; \ @@ -733,10 +747,12 @@ MANUAL_DIST: mkdir $(DISTDIR)/interface mkdir $(DISTDIR)/interface/wx mkdir $(DISTDIR)/interface/wx/aui + mkdir $(DISTDIR)/interface/wx/ribbon mkdir $(DISTDIR)/interface/wx/generic mkdir $(DISTDIR)/interface/wx/html mkdir $(DISTDIR)/interface/wx/msw mkdir $(DISTDIR)/interface/wx/msw/ole + mkdir $(DISTDIR)/interface/wx/persist mkdir $(DISTDIR)/interface/wx/protocol mkdir $(DISTDIR)/interface/wx/propgrid mkdir $(DISTDIR)/interface/wx/richtext @@ -745,10 +761,12 @@ MANUAL_DIST: mkdir $(DISTDIR)/interface/wx/xrc $(CP_P) $(IFACEDIR)/wx/*.h $(DISTDIR)/interface/wx $(CP_P) $(IFACEDIR)/wx/aui/*.h $(DISTDIR)/interface/wx/aui + $(CP_P) $(IFACEDIR)/wx/ribbon/*.h $(DISTDIR)/interface/wx/ribbon $(CP_P) $(IFACEDIR)/wx/generic/*.h $(DISTDIR)/interface/wx/generic $(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html $(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw $(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole + $(CP_P) $(IFACEDIR)/wx/persist/*.h $(DISTDIR)/interface/wx/persist $(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol $(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid $(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext @@ -848,8 +866,7 @@ bzip-dist: @GUIDIST@ fi win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DIST -# RR: copy VC files common to all samples in a general way - for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \ + for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \ -mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \ t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \ $(CP_P) \ @@ -916,5 +933,5 @@ rpm: bzip-dist -mkdir $(RPMTOP)/RPMS -mkdir $(RPMTOP)/SRPMS cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES - rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec - mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` . + rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec + mv -f `find $(RPMTOP) -name "wx-*.rpm"` .