1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx.bkl
--- wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl 2007-07-04 13:24:53.000000000 -0600
+++ wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx.bkl 2007-10-25 19:15:37.000000000 -0600
@@ -51,12 +51,12 @@
<set var="__wx_included_impl">0</set>
<if cond="FORMAT in ['autoconf','gnu']">
- <include file="wx_unix.bkl"/>
+ <include file="wx28_unix.bkl"/>
<set var="__wx_included_impl">1</set>
</if>
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
- <include file="wx_win32.bkl"/>
+ <include file="wx28_win32.bkl"/>
<set var="__wx_included_impl">1</set>
</if>
diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx_unix.bkl
--- wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-07-04 13:24:53.000000000 -0600
+++ wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-10-25 19:15:23.000000000 -0600
@@ -3,7 +3,7 @@
<!--
Presents for building wxWidgets applications using Autoconf or GNU toosets.
-See wx.bkl for platform-independent notes.
+See wx28.bkl for platform-independent notes.
Usage:
Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined.
@@ -71,7 +71,7 @@
<if cond="FORMAT not in ['gnu','autoconf']">
<error>
- Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
+ Don't include presets/wx28_unix.bkl directly, use presets/wx28.bkl.
</error>
</if>
diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.in
--- wxPython-src-2.8.6.0-orig/Makefile.in 2007-10-25 19:11:40.000000000 -0600
+++ wxPython-src-2.8.6.0/Makefile.in 2007-10-25 19:13:06.000000000 -0600
@@ -26,6 +26,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
BK_DEPS = @BK_DEPS@
BK_MAKE_PCH = @BK_MAKE_PCH@
srcdir = @srcdir@
@@ -11335,9 +11336,10 @@
install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
- (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
+ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
+ do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
for f in setup.h $(RCDEFS_H); do \
if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
@@ -12093,8 +12095,8 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
@@ -12102,7 +12104,7 @@
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
if test -f $(srcdir)/locale/$$l.mo ; then \
- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
fi ; \
done
diff -Naur wxPython-src-2.8.6.0-orig/src/common/intl.cpp wxPython-src-2.8.6.0/src/common/intl.cpp
--- wxPython-src-2.8.6.0-orig/src/common/intl.cpp 2007-07-04 13:25:04.000000000 -0600
+++ wxPython-src-2.8.6.0/src/common/intl.cpp 2007-10-25 19:13:06.000000000 -0600
@@ -1513,6 +1513,8 @@
m_initialized = false;
}
+#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
+
// NB: this function has (desired) side effect of changing current locale
bool wxLocale::Init(const wxChar *szName,
const wxChar *szShort,
@@ -1581,7 +1583,7 @@
bool bOk = true;
if ( bLoadDefault )
{
- bOk = AddCatalog(wxT("wxstd"));
+ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));bOk = AddCatalog(wxT("wxstd"));
// there may be a catalog with toolkit specific overrides, it is not
// an error if this does not exist
diff -Naur wxPython-src-2.8.6.0-orig/utils/wxrc/Makefile.in wxPython-src-2.8.6.0/utils/wxrc/Makefile.in
--- wxPython-src-2.8.6.0-orig/utils/wxrc/Makefile.in 2007-09-11 15:25:24.000000000 -0600
+++ wxPython-src-2.8.6.0/utils/wxrc/Makefile.in 2007-10-25 19:13:06.000000000 -0600
@@ -118,7 +118,6 @@
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
@COND_USE_XRC_1@uninstall_wxrc:
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
|
GitWeb