[Commits] (vajda) wx now compiles too on windows

[commits at osafoundation.org]

Commit by: vajda
Modified files:
external/epydoc/Makefile 1.5 1.6
external/python/win32/.cvsignore None 1.1
external/python/win32/pcbuild.sln 1.1 1.2
external/wx/Makefile 1.5 1.6

Log message:
wx now compiles too on windows


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/epydoc/Makefile.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/external/python/win32/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/python/win32/pcbuild.sln.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/external/wx/Makefile.diff?r1=text&tr1=1.5&r2=text&tr2=1.6

Index: external/epydoc/Makefile
diff -u external/epydoc/Makefile:1.5 external/epydoc/Makefile:1.6
--- external/epydoc/Makefile:1.5	Thu Mar 18 10:02:52 2004
+++ external/epydoc/Makefile	Thu Mar 18 13:01:41 2004
@@ -8,8 +8,6 @@
 BUILD=build_$(SNAP)
 
 
-default: all
-
 build:
 	cd $(SRC); \
 	$(PYTHON) setup.py build --build-base=$(BUILD) $(DIST_OPT) \
@@ -25,5 +23,3 @@
 
 clean:
 	cd $(SRC); rm -rf $(BUILD)
-
-all: build

Index: external/python/win32/pcbuild.sln
diff -u external/python/win32/pcbuild.sln:1.1 external/python/win32/pcbuild.sln:1.2
--- external/python/win32/pcbuild.sln:1.1	Wed Mar 17 22:47:29 2004
+++ external/python/win32/pcbuild.sln	Thu Mar 18 13:01:42 2004
@@ -55,10 +55,10 @@
 		{32FBAE88-9362-4DFE-AFAC-D19AF5A4E594}.0 = {7DD61745-4E23-487E-A5DB-44C4E36436FE}
 		{CD85EA20-96E4-497E-A6A0-C9DCF11096BE}.0 = {7DD61745-4E23-487E-A5DB-44C4E36436FE}
 		{EAF0DDDC-0818-4947-85D5-90E7AA86B092}.0 = {7DD61745-4E23-487E-A5DB-44C4E36436FE}
-		{9A5CAFD0-3C68-4649-9506-A93BFD66782C}.0 = {F68B7A15-6D80-4DB8-A514-94D5683A164A}
-		{9A5CAFD0-3C68-4649-9506-A93BFD66782C}.1 = {8DE90467-E2F7-43BB-8CBB-108479C86DF2}
-		{9A5CAFD0-3C68-4649-9506-A93BFD66782C}.2 = {EAF0DDDC-0818-4947-85D5-90E7AA86B092}
-		{9A5CAFD0-3C68-4649-9506-A93BFD66782C}.3 = {7DD61745-4E23-487E-A5DB-44C4E36436FE}
+		{9A5CAFD0-3C68-4649-9506-A93BFD66782C}.0 = {7DD61745-4E23-487E-A5DB-44C4E36436FE}
+		{9A5CAFD0-3C68-4649-9506-A93BFD66782C}.1 = {EAF0DDDC-0818-4947-85D5-90E7AA86B092}
+		{9A5CAFD0-3C68-4649-9506-A93BFD66782C}.2 = {8DE90467-E2F7-43BB-8CBB-108479C86DF2}
+		{9A5CAFD0-3C68-4649-9506-A93BFD66782C}.3 = {F68B7A15-6D80-4DB8-A514-94D5683A164A}
 		{CBEDDFA9-F59E-4179-989A-D664E6F979A7}.0 = {7DD61745-4E23-487E-A5DB-44C4E36436FE}
 		{797B3716-B557-49DA-AC4A-235C8435693D}.0 = {7DD61745-4E23-487E-A5DB-44C4E36436FE}
 		{A8AFB636-6DF1-48F1-81B9-CFFB05EAB529}.0 = {7DD61745-4E23-487E-A5DB-44C4E36436FE}
@@ -149,7 +149,9 @@
 		{F68B7A15-6D80-4DB8-A514-94D5683A164A}.Debug.ActiveCfg = Debug|Win32
 		{F68B7A15-6D80-4DB8-A514-94D5683A164A}.Release.ActiveCfg = Release|Win32
 		{5F2E7DFC-4454-4DC9-A1BC-3705A86FBF07}.Debug.ActiveCfg = Debug|Win32
+		{5F2E7DFC-4454-4DC9-A1BC-3705A86FBF07}.Debug.Build.0 = Debug|Win32
 		{5F2E7DFC-4454-4DC9-A1BC-3705A86FBF07}.Release.ActiveCfg = Release|Win32
+		{5F2E7DFC-4454-4DC9-A1BC-3705A86FBF07}.Release.Build.0 = Release|Win32
 		{31830A23-5BB5-4FE9-84F5-08ABEBBDBD42}.Debug.ActiveCfg = Debug|Win32
 		{31830A23-5BB5-4FE9-84F5-08ABEBBDBD42}.Release.ActiveCfg = Release|Win32
 		{5CC9868A-5329-4EE6-BF26-FF4A33310876}.Debug.ActiveCfg = Debug|Win32

Index: external/wx/Makefile
diff -u external/wx/Makefile:1.5 external/wx/Makefile:1.6
--- external/wx/Makefile:1.5	Thu Mar 18 10:03:07 2004
+++ external/wx/Makefile	Thu Mar 18 13:01:43 2004
@@ -7,17 +7,53 @@
 ifeq ($(DEBUG),1)
 CONF_OPT=--enable-debug
 DIST_OPT=--debug
+FINAL=0
+SUFFIX=d
 else
 CONF_OPT=
 DIST_OPT=
+FINAL=1
+SUFFIX=
 endif
 
 
 BUILD=build_$(SNAP)
 
 
-$(SRC)/wxPython/wxSWIG/Makefile:
-	cd $(SRC)/wxPython/wxSWIG; ./configure
+ifeq ($(OS),Cygwin)
+
+wxSWIG:	
+	cd $(SRC)/wxPython/wxSWIG; \
+        export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \
+        nmake -f makefile.vc
+
+wxWindows:
+	cd $(SRC)/src/msw; \
+        export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \
+        nmake -f makefile.vc dll FINAL=$(FINAL)
+
+build: wxSWIG wxWindows install
+	cd $(SRC)/wxPython; \
+        export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \
+	$(PYTHON) setup.py IN_CVS_TREE=1 BUILD_BASE=$(BUILD) \
+                           FINAL=$(FINAL) USE_SWIG=1 \
+                           build $(DIST_OPT) \
+                           install
+
+install:
+	mkdir -p $(PREFIX)/bin $(PREFIX)/lib
+	install $(SRC)/lib/wxmsw24$(SUFFIX).dll $(PREFIX)/bin
+	install $(SRC)/lib/wxmsw24$(SUFFIX).lib $(PREFIX)/lib
+	install $(SRC)/lib/wxmsw24$(SUFFIX).exp $(PREFIX)/lib
+
+snap: 
+	cd $(BUILD_ROOT); \
+        tar -cvzf $(WX)/$(SNAP).tar.gz \
+                  $(SNAP)/$(SITE)/wx \
+                  $(SNAP)/$(SITE)/wxPython \
+	          $(SNAP)/bin/wxmsw24$(SUFFIX).dll
+
+else
 
 ifeq ($(OS),Darwin)
 
@@ -70,11 +106,16 @@
 
 endif
 
+$(SRC)/wxPython/wxSWIG/Makefile:
+	cd $(SRC)/wxPython/wxSWIG; ./configure
+
 wxSWIG:	$(SRC)/wxPython/wxSWIG/Makefile
 	cd $(SRC)/wxPython/wxSWIG; $(MAKE)
 
 wxWindows: $(SRC)/$(BUILD)/Makefile
 	cd $(SRC)/$(BUILD); $(MAKE); $(MAKE) install
+
+endif
 
 expand: wxpython.tar.gz
 	tar xvzf wxpython.tar.gz