[Commits] (vajda) internal wxWidgets and wxPython build on Windows

[commits at osafoundation.org]

Commit by: vajda
Modified files:
internal/wx/.cvsignore None 1.1
internal/wx/Makefile 1.1 1.2
internal/wx/wxPython-2.5/build/msw/.cvsignore None 1.1
internal/wx/wxPython-2.5/contrib/build/gizmos/.cvsignore None 1.1
internal/wx/wxPython-2.5/contrib/build/gizmos/wxPythonGizmos/.cvsignore None 1.1
internal/wx/wxPython-2.5/contrib/build/ogl/.cvsignore None 1.1
internal/wx/wxPython-2.5/contrib/build/ogl/wxPythonOgl/.cvsignore None 1.1
internal/wx/wxPython-2.5/contrib/build/stc/.cvsignore None 1.1
internal/wx/wxPython-2.5/contrib/build/stc/wxPythonStc/.cvsignore None 1.1
internal/wx/wxPython-2.5/contrib/build/xrc/.cvsignore None 1.1
internal/wx/wxPython-2.5/contrib/build/xrc/wxPythonXrc/.cvsignore None 1.1
internal/wx/wxPython-2.5/lib/.cvsignore None 1.1
internal/wx/wxPython-2.5/wxPython/wx/.cvsignore 1.1 1.2

Log message:
internal wxWidgets and wxPython build on Windows


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wx/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/Makefile.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/build/msw/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/contrib/build/gizmos/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/contrib/build/gizmos/wxPythonGizmos/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/contrib/build/ogl/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/contrib/build/ogl/wxPythonOgl/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/contrib/build/stc/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/contrib/build/stc/wxPythonStc/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/contrib/build/xrc/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/contrib/build/xrc/wxPythonXrc/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/lib/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wx/wxPython-2.5/wxPython/wx/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=1.2

Index: internal/wx/Makefile
diff -u internal/wx/Makefile:1.1 internal/wx/Makefile:1.2
--- internal/wx/Makefile:1.1	Wed Apr 14 16:59:34 2004
+++ internal/wx/Makefile	Wed Apr 14 21:40:27 2004
@@ -23,42 +23,29 @@
 
 ifeq ($(OS),Cygwin)
 
-wxSWIG:	
-	cd $(SRC)/wxPython/wxSWIG; \
+wxWidgets:
+	cd $(SRC); \
         export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \
-        nmake -f makefile.vc
+	devenv.com build/msw/msw.sln /build $(Snap)
+	mkdir -p $(PREFIX)/$(SITE)/wx
+	install $(SRC)/lib/vc_dll/*251*_vc$(SUFFIX).dll $(PREFIX)/$(SITE)/wx
 
-wxWindows:
-	cd $(SRC)/src/msw; \
-        export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \
-        nmake -f makefile.vc dll FINAL=$(FINAL)
-
-build: wxSWIG wxWindows install
+wxPython:
 	cd $(SRC)/wxPython; \
         export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \
-	$(PYTHON) setup.py IN_CVS_TREE=1 BUILD_BASE=$(BUILD) \
-                           FINAL=$(FINAL) USE_SWIG=1 \
+	$(PYTHON) setup.py BUILD_BASE=$(BUILD) \
                            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
+                           install \
+                           FINAL=$(FINAL) HYBRID=0
 
 snap: 
 	cd $(BUILD_ROOT); \
-        tar -cvzf $(WX)/$(SNAP).tar.gz \
-                  $(SNAP)/$(SITE)/wx \
-                  $(SNAP)/$(SITE)/wxPython \
-	          $(SNAP)/bin/wxmsw24$(SUFFIX).dll
+        tar -cvzf $(WX)/wxPython-$(SNAP).tar.gz \
+                  $(SNAP)/$(SITE)/wx
 
 clean:
-	cd $(SRC)/src/msw; \
-        export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \
-        nmake -f makefile.vc cleandll cleanall FINAL=$(FINAL)
-	cd $(SRC)/wxPython; rm -rf $(BUILD)
+	cd $(SRC); devenv.com build/msw/msw.sln /clean $(Snap)
+	cd $(SRC)/wxPython; rm -rf $(SRC)/wxPython/$(BUILD)
 
 else
 
@@ -137,10 +124,10 @@
 	$(MAKE) -C $(SRC)/$(BUILD)/contrib/src/stc install
 	$(MAKE) -C $(SRC)/$(BUILD)/contrib/src/xrc install
 
-build: wxWidgets wxPython
-
 clean:
 	cd $(SRC); rm -rf $(BUILD); \
 	cd $(SRC)/wxPython; rm -rf $(BUILD)
 
 endif
+
+build: wxWidgets wxPython

Index: internal/wx/wxPython-2.5/wxPython/wx/.cvsignore
diff -u internal/wx/wxPython-2.5/wxPython/wx/.cvsignore:1.1 internal/wx/wxPython-2.5/wxPython/wx/.cvsignore:1.2
--- internal/wx/wxPython-2.5/wxPython/wx/.cvsignore:1.1	Wed Apr 14 16:59:38 2004
+++ internal/wx/wxPython-2.5/wxPython/wx/.cvsignore	Wed Apr 14 21:40:37 2004
@@ -1 +1,2 @@
 *.py
+locale