[Commits] (vajda) swig build on Windows now uses the same compiler as PyLucene, that way cygwin's gcc is no longer required

[commits at osafoundation.org]

Commit by: vajda
Modified files:
external/swig/Makefile 1.12 1.13
external/swig/patches-20Feb04 1.4 1.5

Log message:
swig build on Windows now uses the same compiler as PyLucene, that way cygwin's gcc is no longer required

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/swig/Makefile.diff?r1=text&tr1=1.12&r2=text&tr2=1.13
http://cvs.osafoundation.org/index.cgi/external/swig/patches-20Feb04.diff?r1=text&tr1=1.4&r2=text&tr2=1.5

Index: external/swig/Makefile
diff -u external/swig/Makefile:1.12 external/swig/Makefile:1.13
--- external/swig/Makefile:1.12	Thu Aug 19 16:56:08 2004
+++ external/swig/Makefile	Fri Aug 20 15:58:36 2004
@@ -11,7 +11,7 @@
 FINAL=0
 SUFFIX=d
 else
-CONF_OPT=--enable-optimized
+CONF_OPT=
 DIST_OPT=
 FINAL=1
 SUFFIX=
@@ -22,61 +22,39 @@
 
 .PHONY: swig
 
-
 ifeq ($(OS),Cygwin)
 
-EXECUTABLE=.exe
-
-swig:  $(SRC)/$(BUILD)/Makefile
+$(SRC)/$(BUILD)/Makefile:
+	mkdir -p $(SRC)/$(BUILD); \
 	cd $(SRC)/$(BUILD); \
-	$(MAKE) ; \
-	$(MAKE) install
-
-$(SRC)/$(BUILD)/Makefile: apply
-	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
+	PATH=$(GCJ_HOME)/bin:$(PATH); \
+	../configure --prefix=`cygpath -am $(PREFIX)` $(CONF_OPT) \
+                     --with-python=`cygpath -am $(PYTHON)`
+
+swig: $(SRC)/$(BUILD)/Makefile
+	PATH=$(GCJ_HOME)/bin:$(PATH); $(MAKE) -C $(SRC)/$(BUILD)
+	$(MAKE) -C $(SRC)/$(BUILD) install
 
 else
 
-EXECUTABLE=
-
-$(SRC)/$(BUILD)/Makefile: apply
-	cd $(SRC); \
-	mkdir -p $(BUILD); \
-	cd $(BUILD); \
+$(SRC)/$(BUILD)/Makefile:
+	mkdir -p $(SRC)/$(BUILD); \
+	cd $(SRC)/$(BUILD); \
 	../configure --prefix=$(PREFIX) $(CONF_OPT) \
-                 --enable-shared \
-                 --with-python=$(PYTHON) \
-                 --without-ruby \
-                 --without-php4 \
-                 --without-chicken \
-                 --without-pike \
-                 --without-guile \
-                 --without-ocaml
+                     --with-python=$(PYTHON)
 
-swig:   $(SRC)/$(BUILD)/Makefile
-	cd $(SRC)/$(BUILD); \
-        $(MAKE) ; \
-        $(MAKE) install 
+swig: $(SRC)/$(BUILD)/Makefile
+	$(MAKE) -C $(SRC)/$(BUILD)
+	$(MAKE) -C $(SRC)/$(BUILD) install
 
 endif
 
+
 apply: patches-$(VERSION)
 	patch -Nup0 < patches-$(VERSION); echo ok
 
-# snap target can be empty since we don't actually need swig when
-# running Chandler
-snap: 
+snap:
+	tar -cvzf $(SNAP).tar.gz . --no-recursion
 
 clean:
 	cd $(SRC); rm -rf $(BUILD)
@@ -84,5 +62,5 @@
 expand: SWIG-$(VERSION).tar.gz 
 	tar xvzf SWIG-$(VERSION).tar.gz
 
-build: swig
+build: apply swig
 

Index: external/swig/patches-20Feb04
diff -u external/swig/patches-20Feb04:1.4 external/swig/patches-20Feb04:1.5
--- external/swig/patches-20Feb04:1.4	Mon Aug 16 17:16:18 2004
+++ external/swig/patches-20Feb04	Fri Aug 20 15:58:36 2004
@@ -701,3 +701,14 @@
  
  typedef struct {
 
+--- SWIG-20Feb04/Source/Modules/main.cxx	Fri Aug 20 15:45:52 2004
++++ SWIG-20Feb04-patched/Source/Modules/main.cxx	Fri Aug 20 15:44:39 2004
+@@ -288,7 +288,7 @@
+   // Check for SWIG_LIB environment variable
+ 
+   if ((c = getenv("SWIG_LIB")) == (char *) 0) {
+-#if defined(_WIN32)
++#if defined(_WIN32) && !defined(__GNUC__)
+       char buf[MAX_PATH];
+       char *p;
+       if (GetModuleFileName(0, buf, MAX_PATH) == 0