From 54e83ca581eef6ba5b83935e4f25fb73f85cedfe Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Wed, 10 Nov 2004 13:52:51 +0000 Subject: [PATCH] Added wx.manifest to the msw source dist, it seems to be necessary now. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 18 ++++++++++++++++++ autoconf_inc.m4 | 3 --- build/bakefiles/make_dist.mk | 1 + configure | 2 -- debian/changelog | 9 +++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0879c0a5ce..13de7117f9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -423,6 +423,7 @@ ALL_BASE_SOURCES = \ src/mac/corefoundation/stdpaths_cf.cpp \ src/os2/dir.cpp \ src/os2/mimetype.cpp \ + src/os2/stdpaths.cpp \ src/os2/thread.cpp \ src/os2/utils.cpp \ src/os2/utilsexc.cpp \ @@ -2424,6 +2425,7 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS = \ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_dir.o \ monodll_mimetype.o \ + monodll_stdpaths.o \ monodll_thread.o \ monodll_utils.o \ monodll_utilsexc.o @@ -3399,6 +3401,7 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_dir.o \ monolib_mimetype.o \ + monolib_stdpaths.o \ monolib_thread.o \ monolib_utils.o \ monolib_utilsexc.o @@ -4409,6 +4412,7 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_dir.o \ basedll_mimetype.o \ + basedll_stdpaths.o \ basedll_thread.o \ basedll_utils.o \ basedll_utilsexc.o @@ -4526,6 +4530,7 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_dir.o \ baselib_mimetype.o \ + baselib_stdpaths.o \ baselib_thread.o \ baselib_utils.o \ baselib_utilsexc.o @@ -9294,6 +9299,9 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONODLL_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12573,6 +12581,9 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15417,6 +15428,9 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@basedll_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASEDLL_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + @COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -15852,6 +15866,9 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@baselib_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASELIB_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + @COND_PLATFORM_UNIX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -22077,6 +22094,7 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/include/wx/msw/wince cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw + cp $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32 cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 4d32b3c10f..7df543d77d 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -2,9 +2,6 @@ dnl This macro was generated by dnl Bakefile 0.1.4 (http://bakefile.sourceforge.net) dnl Do not modify, all changes will be overwritten! - -dnl Conditions: - dnl ### begin block 00_header ### dnl dnl This macro was generated by diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index a9461a0ec1..15d1dcfc99 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -324,6 +324,7 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/include/wx/msw/wince cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw + cp $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32 cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl diff --git a/configure b/configure index 4214041850..832f90f1cd 100755 --- a/configure +++ b/configure @@ -39619,8 +39619,6 @@ fi - - BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4" diff --git a/debian/changelog b/debian/changelog index 49b9f5b697..d3d29a159d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +wxwidgets2.5 (2.5.3.1) unstable; urgency=low + + * Functioning concurrent installs for both the C++ libs + and wxPython along with legacy support for existing 2.4 + users mean we can now safely introduce this release to + unstable without an adverse effect on existing users. + + -- Ron Lee Sun, 31 Oct 2004 15:54:46 +1030 + wxwidgets2.5 (2.5.3.0) experimental; urgency=low * Experimental prerelease. -- 2.45.2