[Commits] (heikki) Part of bug 1454, swig can be installed from external and found in build environment on Windows. Need to unpack the whole archive because swig needs its own include files and configuration files. Not part of normal build yet.

[commits at osafoundation.org]

Commit by: heikki
Modified files:
external/Makefile.inc 1.14 1.15
external/swig/Makefile 1.5 1.6

Log message:
Part of bug 1454, swig can be installed from external and found in build environment on Windows. Need to unpack the whole archive because swig needs its own include files and configuration files. Not part of normal build yet.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/Makefile.inc.diff?r1=text&tr1=1.14&r2=text&tr2=1.15
http://cvs.osafoundation.org/index.cgi/external/swig/Makefile.diff?r1=text&tr1=1.5&r2=text&tr2=1.6

Index: external/swig/Makefile
diff -u external/swig/Makefile:1.5 external/swig/Makefile:1.6
--- external/swig/Makefile:1.5	Thu May 27 14:05:24 2004
+++ external/swig/Makefile	Thu May 27 15:01:19 2004
@@ -38,7 +38,9 @@
 	fi
 
 expand:    swigwin-1.3.21.zip
-	unzip -o -j swigwin-1.3.21.zip SWIG-1.3.21/swig.exe -d $(BUILD_ROOT)/$(SNAP)/bin/
+	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
 
 else
 

Index: external/Makefile.inc
diff -u external/Makefile.inc:1.14 external/Makefile.inc:1.15
--- external/Makefile.inc:1.14	Tue May  4 14:56:06 2004
+++ external/Makefile.inc	Thu May 27 15:01:19 2004
@@ -59,7 +59,7 @@
 MSVC_ROOT:=$(shell cygpath -u $$VS71COMNTOOLS\\..\\..)
 MSVC_DIR:=$(MSVC_ROOT)/Vc7
 
-export PATH:=$(MSVC_ROOT)/Common7/IDE:$(MSVC_DIR)/BIN:$(MSVC_ROOT)/Common7/Tools:$(MSVC_ROOT)/Common7/Tools/bin/prerelease:$(MSVC_ROOT)/Common7/Tools/bin:$(PATH)
+export PATH:=$(BUILD_ROOT)/$(SNAP)/bin/swig:$(MSVC_ROOT)/Common7/IDE:$(MSVC_DIR)/BIN:$(MSVC_ROOT)/Common7/Tools:$(MSVC_ROOT)/Common7/Tools/bin/prerelease:$(MSVC_ROOT)/Common7/Tools/bin:$(PATH)
 
 export INCLUDE:=$(shell cygpath -awp $(MSVC_DIR)/atlmfc/include:$(MSVC_DIR)/PlatformSDK/include/prerelease:$(MSVC_DIR)/PlatformSDK/include:$(MSVC_DIR)/include)