[Commits] (davids) Unicode support baseline:

[commits at osafoundation.org]

Commit by: davids
Modified files:
internal/wxPython-2.5/Makefile 1.48 1.49

Log message:

Unicode support baseline:
- no-op additions and reformatting only
- Unicode build is still disabled
r=TBD



ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/Makefile.diff?r1=text&tr1=1.48&r2=text&tr2=1.49

Index: internal/wxPython-2.5/Makefile
diff -u internal/wxPython-2.5/Makefile:1.48 internal/wxPython-2.5/Makefile:1.49
--- internal/wxPython-2.5/Makefile:1.48	Thu Mar 31 16:14:24 2005
+++ internal/wxPython-2.5/Makefile	Mon Apr  4 00:13:16 2005
@@ -42,14 +42,15 @@
 	cp $(SRC)/wxPython/src/winxp.manifest $(BUILD_ROOT)/$(SNAP)/bin/chandler.exe.manifest; \
 	cp $(SRC)/wxPython/src/winxp.manifest $(BUILD_ROOT)/$(SNAP)/bin/python$(PYTHON_SUFFIX).exe.manifest; \
 	chmod a+x $(BUILD_ROOT)/$(SNAP)/bin/python$(PYTHON_SUFFIX).exe.manifest; \
-	$(PYTHON) setup.py BUILD_BASE=$(BUILD) BUILD_ACTIVEX=0 \
-                           USE_SWIG=$(SWIG_OPTION) \
-                           SWIG=`cygpath -aw $(SWIG)` \
-                           INSTALL_MULTIVERSION=0 \
-                           MONOLITHIC=0 \
-                           build $(DIST_OPT) \
-                           install \
-                           FINAL=$(FINAL) HYBRID=0
+	$(PYTHON) setup.py BUILD_BASE=$(BUILD) \
+                UNICODE=0 BUILD_ACTIVEX=0 \
+                USE_SWIG=$(SWIG_OPTION) \
+                SWIG=`cygpath -aw $(SWIG)` \
+                INSTALL_MULTIVERSION=0 \
+                MONOLITHIC=0 \
+                build $(DIST_OPT) \
+                install \
+                FINAL=$(FINAL) HYBRID=0
 
 MANIFEST=$(SNAP)/$(SITE)/wx $(SNAP)/bin/chandler.exe.manifest $(SNAP)/bin/python$(PYTHON_SUFFIX).exe.manifest
 
@@ -81,13 +82,14 @@
 
 wxPython:
 	cd $(SRC)/wxPython; \
-        MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) $(PYTHON) setup.py BUILD_OGL=0 BUILD_GLCANVAS=0 \
-                           USE_SWIG=$(SWIG_OPTION) \
-                           SWIG=$(SWIG) \
-                           INSTALL_MULTIVERSION=0 \
-                           BUILD_BASE=$(BUILD) \
-                           WX_CONFIG=$(PREFIX)/bin/wx-config \
-                           build $(DIST_OPT) install FINAL=$(FINAL)
+        MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) $(PYTHON) setup.py \
+                UNICODE=0 BUILD_OGL=0 BUILD_GLCANVAS=0 \
+                USE_SWIG=$(SWIG_OPTION) \
+                SWIG=$(SWIG) \
+                INSTALL_MULTIVERSION=0 \
+                BUILD_BASE=$(BUILD) \
+                WX_CONFIG=$(PREFIX)/bin/wx-config \
+                build $(DIST_OPT) install FINAL=$(FINAL)
 
 MANIFEST=$(SNAP)/$(SITE)/wx \
          $(SNAP)/$(SITE)/wxPython \
@@ -119,14 +121,15 @@
 wxPython:
 	cd $(SRC)/wxPython; \
         export LD_LIBRARY_PATH=$(PREFIX)/lib; \
-        $(PYTHON) setup.py BUILD_OGL=0 BUILD_GLCANVAS=0 \
-                           USE_SWIG=$(SWIG_OPTION) \
-                           SWIG=$(SWIG) \
-                           INSTALL_MULTIVERSION=0 \
-                           BUILD_BASE=$(BUILD) \
-                           WX_CONFIG=$(PREFIX)/bin/wx-config \
-                           WXPORT=gtk2 \
-                           build $(DIST_OPT) install FINAL=$(FINAL)
+        $(PYTHON) setup.py \
+                UNICODE=0 BUILD_OGL=0 BUILD_GLCANVAS=0 \
+                USE_SWIG=$(SWIG_OPTION) \
+                SWIG=$(SWIG) \
+                INSTALL_MULTIVERSION=0 \
+                BUILD_BASE=$(BUILD) \
+                WX_CONFIG=$(PREFIX)/bin/wx-config \
+                WXPORT=gtk2 \
+                build $(DIST_OPT) install FINAL=$(FINAL)
 
 MANIFEST=$(SNAP)/$(SITE)/wx \
          $(SNAP)/$(SITE)/wxPython \