X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7716111cb0a8a62f068b4cdb6211833a366dd3b..01168e9591c6114140768de014695e3908922033:/build/bakefiles/make_dist.mk diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 6ae6bf880a..13f129a055 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -77,6 +77,7 @@ ALL_DIST: distrib_clean cp $(WXDIR)/install-sh $(DISTDIR) cp $(WXDIR)/mkinstalldirs $(DISTDIR) cp $(WXDIR)/wx-config.in $(DISTDIR) + cp $(WXDIR)/wx-config-inplace.in $(DISTDIR) cp $(WXDIR)/version-script.in $(DISTDIR) cp $(WXDIR)/setup.h.in $(DISTDIR) cp $(WXDIR)/setup.h_vms $(DISTDIR) @@ -101,7 +102,7 @@ ALL_DIST: distrib_clean cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib - cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib +# cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib mkdir $(DISTDIR)/src/regex cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex @@ -138,6 +139,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/include/wx/xml + mkdir $(DISTDIR)/include/wx/xrc cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx @@ -145,6 +147,7 @@ ALL_GUI_DIST: ALL_DIST cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix cp $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml + cp $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/art mkdir $(DISTDIR)/art/gtk @@ -159,12 +162,13 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/jpeg mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/unix + mkdir $(DISTDIR)/src/xrc + cp $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common cp $(COMMDIR)/*.inc $(DISTDIR)/src/common cp $(COMMDIR)/*.h $(DISTDIR)/src/common cp $(COMMDIR)/*.mms $(DISTDIR)/src/common - cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix cp $(UNIXDIR)/*.mms $(DISTDIR)/src/unix cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic @@ -218,6 +222,7 @@ BASE_DIST: ALL_DIST GTK_DIST: ALL_GUI_DIST cp $(WXDIR)/wxGTK.spec $(DISTDIR) cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk + cp $(GTKDIR)/*.h $(DISTDIR)/src/gtk cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk @@ -257,16 +262,27 @@ MOTIF_DIST: ALL_GUI_DIST MACX_DIST: ALL_GUI_DIST cp $(INCDIR)/*.* $(DISTDIR)/include + mkdir $(DISTDIR)/include/wx/mac/carbon + mkdir $(DISTDIR)/include/wx/mac/private + mkdir $(DISTDIR)/include/wx/mac/carbon/private cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac - cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac - cp $(MACDIR)/*.c $(DISTDIR)/src/mac - cp $(MACDIR)/*.h $(DISTDIR)/src/mac - cp $(MACDIR)/*.r $(DISTDIR)/src/mac - mkdir $(DISTDIR)/src/mac/morefile - cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile - cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile - mkdir $(DISTDIR)/src/mac/macsock - cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock + cp $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon + cp $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private + cp $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private + cp $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/*.c $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon + mkdir $(DISTDIR)/src/mac/carbon/morefile + cp $(MACDIR)/carbon/morefile/*.h $(DISTDIR)/src/mac/carbon/morefile + cp $(MACDIR)/carbon/morefile/*.c $(DISTDIR)/src/mac/carbon/morefile + mkdir $(DISTDIR)/src/mac/carbon/morefilex + cp $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex + cp $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex + cp $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex +# obsolete +# mkdir $(DISTDIR)/src/mac/macsock +# cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock mkdir $(DISTDIR)/contrib cp -R $(WXDIR)/contrib $(DISTDIR) @@ -517,6 +533,10 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event + mkdir $(DISTDIR)/samples/except + cp $(SAMPDIR)/except/Makefile.in $(DISTDIR)/samples/except + cp $(SAMPDIR)/except/*.cpp $(DISTDIR)/samples/except + mkdir $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec @@ -817,6 +837,11 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/sound/*.cpp $(DISTDIR)/samples/sound cp $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound + mkdir $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash + mkdir $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter @@ -981,7 +1006,7 @@ distrib_clean: # VZ: the -only targets allow to do "make dist bzip-dist-only" without copying # the files twice dist-only: - @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets distribution in $(DISTDIR)..." @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE); @if test "$(USE_GUI)" = 1; then \ cd $(DISTDIR); \ @@ -996,7 +1021,7 @@ dist-only: fi dist: @GUIDIST@ - @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets distribution in $(DISTDIR)..." @# now prune away a lot of the crap included by using cp -R @# in other dist targets. find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \ @@ -1016,7 +1041,7 @@ dist: @GUIDIST@ fi bzip-dist-only: - @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets distribution in $(DISTDIR)..." @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP); @if test "$(USE_GUI)" = 1; then \ cd $(DISTDIR); \ @@ -1031,7 +1056,7 @@ bzip-dist-only: fi bzip-dist: @GUIDIST@ - @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets distribution in $(DISTDIR)..." @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP) @if test "$(USE_GUI)" = 1; then \ cd $(DISTDIR); \ @@ -1045,7 +1070,7 @@ bzip-dist: @GUIDIST@ # RR: Copy text and binary data separatly win-dist: MSW_ZIP_TEXT_DIST - @echo "*** Creating wxWindows ZIP distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets ZIP distribution in $(DISTDIR)..." @cd _dist_dir && mv $(DISTDIRNAME) wxMSW @cd _dist_dir && zip -r -l ../$(WXARCHIVE_ZIP) * cp $(INCDIR)/wx/msw/*.cur _dist_dir/wxMSW/include/wx/msw @@ -1055,6 +1080,7 @@ win-dist: MSW_ZIP_TEXT_DIST @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp +debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST mkdir $(DISTDIR)/debian -cp $(WXDIR)/debian/* $(DISTDIR)/debian @@ -1083,16 +1109,8 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST rm -rf $(DISTDIR)/wxPython/contrib/iewin find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf - - @# We can't get at the individual components of the version here - @# anymore, so strip the major and minor version out of the blob. - - ( \ - wx_version=$(WX_VERSION); \ - wx_release=$${wx_version%.*}; \ - rm -rf $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version}; \ - mv $(DISTDIR) $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};\ - ) + rm -rf $(DEBIAN_SOURCE_DIR) + mv $(DISTDIR) $(DEBIAN_SOURCE_DIR) debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST