[Commits] (markie) Fixes for bug 1476; Build swig on Windows; r=heikki

[commits at osafoundation.org]

Commit by: markie
Modified files:
external/Makefile 1.31 1.32
external/swig/Makefile 1.6 1.7

Log message:
Fixes for bug 1476; Build swig on Windows;r=heikki

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/Makefile.diff?r1=text&tr1=1.31&r2=text&tr2=1.32
http://cvs.osafoundation.org/index.cgi/external/swig/Makefile.diff?r1=text&tr1=1.6&r2=text&tr2=1.7

Index: external/Makefile
diff -u external/Makefile:1.31 external/Makefile:1.32
--- external/Makefile:1.31	Mon Jun 21 14:38:35 2004
+++ external/Makefile	Thu Jun 24 17:43:13 2004
@@ -1,5 +1,5 @@
 
-VERSION=0.3-8
+VERSION=0.3-9
 
 include Makefile.inc
 
@@ -25,7 +25,6 @@
         python/bzip2-1.0.2.tar.gz \
         python/zlib-1.2.1.tar.gz \
         swig/swig-1.3.21.tar.gz \
-        swig/swigwin-1.3.21.zip \
         epydoc/epydoc-2.1.tar.gz \
         persistence/xerces-c/xerces-c-src2_4_0.tar.gz \
         persistence/pathan/libpathan-1.2-2-src.tar.gz \

Index: external/swig/Makefile
diff -u external/swig/Makefile:1.6 external/swig/Makefile:1.7
--- external/swig/Makefile:1.6	Thu May 27 15:01:19 2004
+++ external/swig/Makefile	Thu Jun 24 17:43:14 2004
@@ -25,27 +25,35 @@
 
 ifeq ($(OS),Cygwin)
 
-swig: expand
+EXECUTABLE=.exe
 
-snap: 
-	cd $(BUILD_ROOT); \
-	tar -cvzf $(SWIG)/$(SNAP).tar.gz \
-		$(SNAP)/bin/swig.exe
+swig:  $(SRC)/$(BUILD)/Makefile
+	cd $(SRC)/$(BUILD); \
+	$(MAKE) ; \
+	$(MAKE) install
 
-clean:
-	if [ -f $(BUILD_ROOT)/$(SNAP)/bin/swig.exe ]; then \
-		rm -f $(BUILD_ROOT)/$(SNAP)/bin/swig.exe; \
-	fi
-
-expand:    swigwin-1.3.21.zip
-	unzip -o swigwin-$(VERSION).zip -d $(BUILD_ROOT)/$(SNAP)/bin/;\
-	mv $(BUILD_ROOT)/$(SNAP)/bin/SWIG-$(VERSION) $(BUILD_ROOT)/$(SNAP)/bin/swig;\
-	chmod a+x $(BUILD_ROOT)/$(SNAP)/bin/swig/swig.exe
+$(SRC)/$(BUILD)/Makefile:
+	cd $(SRC); \
+	mkdir -p $(BUILD); \
+	cd $(BUILD); \
+	../configure --prefix=$(PREFIX) $(CONF_OPT) \
+	--build=i386-pc-cygwin \
+	--with-python=$(PYTHON) \
+	--without-ruby \
+	--without-php4 \
+	--without-chicken \
+	--without-pike \
+	--without-guile \
+	--without-ocaml
 
 else
 
+EXECUTABLE=
+
 $(SRC)/$(BUILD)/Makefile:
-	cd $(SRC); mkdir -p $(BUILD); cd $(BUILD); \
+	cd $(SRC); \
+	mkdir -p $(BUILD); \
+	cd $(BUILD); \
 	../configure --prefix=$(PREFIX) $(CONF_OPT) \
                  --enable-shared \
                  --with-python=$(PYTHON) \
@@ -58,22 +66,23 @@
 
 swig:   $(SRC)/$(BUILD)/Makefile
 	cd $(SRC)/$(BUILD); \
-        $(MAKE) ; $(MAKE) install 
+        $(MAKE) ; \
+        $(MAKE) install 
+
+endif
 
 snap: 
 	cd $(BUILD_ROOT); \
 	tar -cvzf $(SWIG)/$(SNAP).tar.gz \
-                  $(SNAP)/bin/swig \
+                  $(SNAP)/bin/swig$(EXECUTABLE) \
                   $(SNAP)/share/aclocal/swig.m4 \
                   $(SNAP)/lib/swig1.3 
 
 clean:
 	cd $(SRC); rm -rf $(BUILD)
 
-expand: swig-$(VERSION).tar.gz
+expand: swig-$(VERSION).tar.gz 
 	tar xvzf swig-$(VERSION).tar.gz
 
-endif
-
 build: swig