From f0a5e9f6d9b94c846388d53d8eab347ff2f7c86e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 24 Jun 2005 14:10:57 +0000 Subject: [PATCH] Added corefoundation files to release scripts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/make_dist.mk | 6 ++++++ distrib/msw/generic.rsp | 2 ++ distrib/msw/mac.rsp | 3 +++ distrib/msw/makesetup.sh | 4 ++-- distrib/msw/patch.rsp | 14 +++++++++++--- distrib/msw/x11.rsp | 3 +++ 6 files changed, 27 insertions(+), 5 deletions(-) diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 88f3caf016..f1c486334d 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -240,6 +240,12 @@ X11_DIST: ALL_GUI_DIST UNIV_DIST cp $(X11DIR)/*.cpp $(DISTDIR)/src/x11 cp $(X11DIR)/*.c $(DISTDIR)/src/x11 cp $(X11DIR)/*.xbm $(DISTDIR)/src/x11 + mkdir $(DISTDIR)/src/mac + mkdir $(DISTDIR)/src/mac/corefoundation + cp $(WXDIR)/src/mac/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation + mkdir $(DISTDIR)/include/wx/mac + mkdir $(DISTDIR)/include/wx/mac/corefoundation + cp $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation mkdir $(DISTDIR)/contrib cp -R $(WXDIR)/contrib $(DISTDIR) diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 490bcfa8c6..0c8637c0e9 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -1415,6 +1415,8 @@ tests/regex/*.inc tests/regex/*.pl tests/regex/*.test +tests/scopeguard/*.cpp + tests/streams/*.cpp tests/streams/*.h diff --git a/distrib/msw/mac.rsp b/distrib/msw/mac.rsp index 6208be8092..295a89b7e8 100644 --- a/distrib/msw/mac.rsp +++ b/distrib/msw/mac.rsp @@ -28,6 +28,8 @@ samples/html/htmlctrl/*.bkl src/wxWindows.pbproj/project.pbxproj src/wxWindows.xcode/project.pbxproj +src/wxWindows.xcodeproj/project.pbxproj + src/mac/wxmac.icns src/mac/carbon/*.cpp @@ -68,4 +70,5 @@ include/wx/mac/corefoundation/*.h samples/minimal/minimal.pbproj/project.pbxproj samples/minimal/minimal.xcode/project.pbxproj +samples/minimal/minimal.xcodeproj/project.pbxproj diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh index 7afe376ecb..646b512fd7 100644 --- a/distrib/msw/makesetup.sh +++ b/distrib/msw/makesetup.sh @@ -25,7 +25,7 @@ PROGNAME=$0 SCRIPTDIR=$WXWIN/distrib/msw WEBFILES=c:/wx2dev/wxWebSite # Set this to the required version -VERSION=2.6.0 +VERSION=2.6.1 . $SCRIPTDIR/setup.var @@ -267,7 +267,7 @@ dospinwxall() fi cp $DESTDIR/wxWidgets-$VERSION-win.zip $DESTDIR/wxWidgets-$VERSION-all.zip - cat $APPDIR/distrib/msw/cw_mac.rsp $APPDIR/distrib/msw/vc.rsp $APPDIR/distrib/msw/x11.rsp $APPDIR/distrib/msw/cocoa.rsp $APPDIR/distrib/msw/motif.rsp $APPDIR/distrib/msw/mac.rsp $APPDIR/distrib/msw/mgl.rsp $APPDIR/distrib/msw/os2.rsp $APPDIR/distrib/msw/palmos.rsp | sort | uniq > /tmp/all.txt + cat $APPDIR/distrib/msw/cw_mac.rsp $APPDIR/distrib/msw/vc.rsp $APPDIR/distrib/msw/x11.rsp $APPDIR/distrib/msw/gtk.rsp $APPDIR/distrib/msw/cocoa.rsp $APPDIR/distrib/msw/motif.rsp $APPDIR/distrib/msw/mac.rsp $APPDIR/distrib/msw/mgl.rsp $APPDIR/distrib/msw/os2.rsp $APPDIR/distrib/msw/palmos.rsp | sort | uniq > /tmp/all.txt zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < /tmp/all.txt if [ -d $DESTDIR/wxWidgets-$VERSION ]; then diff --git a/distrib/msw/patch.rsp b/distrib/msw/patch.rsp index 867e2aef00..537c676392 100644 --- a/distrib/msw/patch.rsp +++ b/distrib/msw/patch.rsp @@ -1,3 +1,11 @@ -include/wx/msw/wince/*.rc -include/wx/platform.h -src/gtk/eggtrayicon.h +include/wx/msw/window.h +include/wx/msw/listbox.h +include/src/msw/window.cpp +include/wx/msw/notebook.h +include/wx/msw/uxthemep.h +src/msw/notebook.cpp +src/msw/tbar95.cpp +src/msw/helpchm.cpp +src/generic/grid.cpp +src/generic/splitter.cpp + diff --git a/distrib/msw/x11.rsp b/distrib/msw/x11.rsp index 864e3bc340..172e60db09 100644 --- a/distrib/msw/x11.rsp +++ b/distrib/msw/x11.rsp @@ -9,6 +9,9 @@ src/x11/*.xbm include/wx/x11/*.h include/wx/x11/nanox/X11/*.h +include/wx/mac/corefoundation/*.h +src/mac/corefoundation/*.cpp + docs/x11/*.txt docs/x11/makewxx11 -- 2.45.2