[Commits] (vajda) added xerces-c to new windows build

[commits at osafoundation.org]

Commit by: vajda
Modified files:
external/persistence/xerces-c/Makefile 1.4 1.5
external/wx/Makefile 1.6 1.7

Log message:
added xerces-c to new windows build


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/persistence/xerces-c/Makefile.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/external/wx/Makefile.diff?r1=text&tr1=1.6&r2=text&tr2=1.7

Index: external/persistence/xerces-c/Makefile
diff -u external/persistence/xerces-c/Makefile:1.4 external/persistence/xerces-c/Makefile:1.5
--- external/persistence/xerces-c/Makefile:1.4	Thu Mar 18 10:03:04 2004
+++ external/persistence/xerces-c/Makefile	Thu Mar 18 13:32:14 2004
@@ -11,6 +11,39 @@
 CONF_DBG=
 endif
 
+ifeq ($(OS),Cygwin)
+
+compile:
+	cd $(SRC); \
+        export XERCESCROOT=$(SRC); \
+	devenv.com Projects/Win32/VC7/xerces-all/xerces-all.sln \
+                   /project XercesLib /build $(Snap)
+
+install:
+	mkdir -p $(PREFIX)/include
+	(cd $(SRC)/src; \
+         tar -cf - `find . \( -name '*.hpp' -o -name '*.c' \) -print`) | \
+        (cd $(PREFIX)/include; tar xvf - )
+	(cd $(SRC)/Build/Win32/VC7/$(Snap); tar -cf - *.dll) | \
+        (cd $(PREFIX)/bin; tar xvf - )
+	(cd $(SRC)/Build/Win32/VC7/$(Snap); tar -cf - *.lib *.exp) | \
+        (cd $(PREFIX)/lib; tar xvf - )
+        
+
+build: compile install
+
+clean:
+	cd $(SRC); \
+        export XERCESCROOT=$(SRC); \
+	devenv.com Projects/Win32/VC7/xerces-all/xerces-all.sln \
+                   /project XercesLib /clean $(Snap)
+
+snap: 
+	cd $(BUILD_ROOT); \
+        tar -cvzf $(XERCESC)/$(SNAP).tar.gz $(SNAP)/bin/xerces*.dll
+
+else
+
 ifeq ($(OS),Darwin)
 CONF_OS=-pmacosx
 else
@@ -34,12 +67,14 @@
 	rm -f $(PREFIX)/lib/libxerces*; \
 	XERCESCROOT=$(SRC)/$(BUILD) $(MAKE) install
 
-expand: xerces-c-src$(VERSION).tar.gz
-	tar xvzf xerces-c-src$(VERSION).tar.gz
-
 snap: 
 	cd $(BUILD_ROOT); \
         tar -cvzf $(XERCESC)/$(SNAP).tar.gz $(SNAP)/lib/libxerces*
 
 clean:
 	cd $(SRC); rm -rf $(BUILD)
+
+endif
+
+expand: xerces-c-src$(VERSION).tar.gz
+	tar xvzf xerces-c-src$(VERSION).tar.gz

Index: external/wx/Makefile
diff -u external/wx/Makefile:1.6 external/wx/Makefile:1.7
--- external/wx/Makefile:1.6	Thu Mar 18 13:01:43 2004
+++ external/wx/Makefile	Thu Mar 18 13:32:14 2004
@@ -53,6 +53,12 @@
                   $(SNAP)/$(SITE)/wxPython \
 	          $(SNAP)/bin/wxmsw24$(SUFFIX).dll
 
+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)
+
 else
 
 ifeq ($(OS),Darwin)
@@ -115,12 +121,12 @@
 wxWindows: $(SRC)/$(BUILD)/Makefile
 	cd $(SRC)/$(BUILD); $(MAKE); $(MAKE) install
 
-endif
-
-expand: wxpython.tar.gz
-	tar xvzf wxpython.tar.gz
-
 clean:
 	cd $(SRC)/wxPython/wxSWIG; $(MAKE) nuke; \
 	cd $(SRC); rm -rf $(BUILD); \
 	cd $(SRC)/wxPython; rm -rf $(BUILD)
+
+endif
+
+expand: wxpython.tar.gz
+	tar xvzf wxpython.tar.gz