[Commits] (vajda) libxslt now part of new build on windows

[commits at osafoundation.org]

Commit by: vajda
Modified files:
external/persistence/libxml2/Makefile 1.5 1.6
external/persistence/libxslt/Makefile 1.6 1.7
external/persistence/libxslt/patches 1.1 1.2
external/persistence/libxslt/win32/winSetup.py.in None 1.1

Log message:
libxslt now part of new build on windows


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/persistence/libxml2/Makefile.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/external/persistence/libxslt/Makefile.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/external/persistence/libxslt/patches.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/external/persistence/libxslt/win32/winSetup.py.in?rev=1.1&content-type=text/vnd.viewcvs-markup

Index: external/persistence/libxslt/Makefile
diff -u external/persistence/libxslt/Makefile:1.6 external/persistence/libxslt/Makefile:1.7
--- external/persistence/libxslt/Makefile:1.6	Thu Mar 18 10:03:01 2004
+++ external/persistence/libxslt/Makefile	Thu Mar 18 17:52:31 2004
@@ -5,23 +5,65 @@
 
 include $(BUILD_ROOT)/Makefile.inc
 
+ifeq ($(OS),Darwin)
+WP=$(PREFIX)/$(FRAMEWORK)
+else
+WP=$(PREFIX)
+endif
+
+ifeq ($(OS),Cygwin)
+
 ifeq ($(DEBUG),1)
-CONF_DBG=--enable-debug
+CONF_DBG=debug=yes
 else
 CONF_DBG=
 endif
 
-ifeq ($(OS),Darwin)
-WP=$(PREFIX)/$(FRAMEWORK)
+BUILD=win32/$(SNAP)
+
+$(SRC)/$(BUILD)/config.msvc: apply
+	mkdir -p $(SRC)/$(BUILD)
+	cp -p win32/winSetup.py.in $(SRC)/python
+	cd $(SRC)/win32; \
+	cscript //E:JScript configure.js prefix=$(SNAP) $(CONF_DBG) \
+                            python=yes iconv=no static=yes 
+
+compile: $(SRC)/$(BUILD)/config.msvc
+	cd $(SRC)/win32; MAKEFLAGS=; \
+	nmake -nologo -f Makefile.msvc BUILD_VERSION=$(SNAP) all install
+
+install:
+	install $(SRC)/$(BUILD)/bin/xsltproc.exe $(PREFIX)/bin
+
+py:
+	cd $(SRC)/python; \
+	$(PYTHON) winSetup.py build --build-base=build_$(SNAP) $(DIST_DBG) \
+                              install --force
+
+build: compile install py
+
+clean:
+	cd $(SRC)/win32; MAKEFLAGS=; \
+	nmake -nologo -f Makefile.msvc BUILD_VERSION=$(SNAP) clean
+	cd $(SRC)/python; rm -rf build_$(SNAP)
+
+snap: 
+	cd $(BUILD_ROOT); \
+        tar -cvzf $(LIBXSLT)/$(SNAP).tar.gz \
+                  $(SNAP)/$(SITE)/libxslt* $(SNAP)/bin/xsltproc.exe
+
 else
-WP=$(PREFIX)
+
+ifeq ($(DEBUG),1)
+CONF_DBG=--enable-debug
+else
+CONF_DBG=
 endif
 
 BUILD=build_$(SNAP)
 
 
-$(SRC)/$(BUILD)/Makefile: patches
-	patch -Nup0 < patches; echo ok; \
+$(SRC)/$(BUILD)/Makefile: apply
 	cd $(SRC); mkdir -p $(BUILD); cd $(BUILD); \
 	../configure --prefix=$(PREFIX) \
                      --srcdir=$(SRC) \
@@ -34,9 +76,6 @@
 build: $(SRC)/$(BUILD)/Makefile
 	cd $(SRC)/$(BUILD); $(MAKE); $(MAKE) install
 
-expand: libxslt-$(VERSION).tar.gz
-	tar xvzf libxslt-$(VERSION).tar.gz
-
 snap: 
 	cd $(BUILD_ROOT); \
         tar -cvzf $(LIBXSLT)/$(SNAP).tar.gz \
@@ -45,3 +84,11 @@
 
 clean:
 	cd $(SRC); rm -rf $(BUILD)
+
+endif
+
+expand: libxslt-$(VERSION).tar.gz
+	tar xvzf libxslt-$(VERSION).tar.gz
+
+apply: patches
+	patch -Nup0 < patches; echo ok;

Index: external/persistence/libxslt/patches
diff -u external/persistence/libxslt/patches:1.1 external/persistence/libxslt/patches:1.2
--- external/persistence/libxslt/patches:1.1	Mon Mar 15 12:35:33 2004
+++ external/persistence/libxslt/patches	Thu Mar 18 17:52:31 2004
@@ -11,24 +11,6 @@
      else
  	if test -x "$with_python"
  	then
---- libxslt-1.1.2/win32/Makefile.msvc	Sun Dec 21 03:01:27 2003
-+++ libxslt-1.1.2-patched/win32/Makefile.msvc	Wed Jan 28 17:09:52 2004
-@@ -66,11 +66,11 @@
- 
- # Optimisation and debug symbols.
- !if "$(DEBUG)" == "1"
--CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
--LDFLAGS = $(LDFLAGS) /DEBUG
-+CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 /I..\..\libxml2\win32\debug\include
-+LDFLAGS = $(LDFLAGS) /DEBUG /LIBPATH:..\..\libxml2\win32\debug\lib
- !else
--CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
--LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
-+CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 /I..\..\libxml2\win32\release\include
-+LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 /LIBPATH:..\..\libxml2\win32\release\lib
- !endif
- 
- # Libxslt object files.
 --- libxslt-1.1.2/win32/configure.js	Sun Dec 21 03:01:27 2003
 +++ libxslt-1.1.2-patched/win32/configure.js	Mon Jan 26 17:29:20 2004
 @@ -9,6 +9,7 @@
@@ -132,3 +114,21 @@
  
  
  DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
+--- libxslt-1.1.2/win32/Makefile.msvc	2003-12-21 03:01:27.000000000 -0800
++++ libxslt-1.1.2-patched/win32/Makefile.msvc	2004-03-18 17:39:19.194859200 -0800
+@@ -66,11 +66,11 @@
+ 
+ # Optimisation and debug symbols.
+ !if "$(DEBUG)" == "1"
+-CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
+-LDFLAGS = $(LDFLAGS) /DEBUG
++CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 /I..\..\..\libxml2\libxml2-2.6.3\win32\debug\include
++LDFLAGS = $(LDFLAGS) /DEBUG /LIBPATH:..\..\..\libxml2\libxml2-2.6.3\win32\debug\lib
+ !else
+-CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
+-LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
++CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 /I..\..\..\libxml2\libxml2-2.6.3\win32\release\include
++LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 /LIBPATH:..\..\..\libxml2\libxml2-2.6.3\win32\release\lib
+ !endif
+ 
+ # Libxslt object files.

Index: external/persistence/libxml2/Makefile
diff -u external/persistence/libxml2/Makefile:1.5 external/persistence/libxml2/Makefile:1.6
--- external/persistence/libxml2/Makefile:1.5	Thu Mar 18 17:15:42 2004
+++ external/persistence/libxml2/Makefile	Thu Mar 18 17:52:30 2004
@@ -30,7 +30,7 @@
 
 compile: $(SRC)/$(BUILD)/config.msvc
 	cd $(SRC)/win32; MAKEFLAGS=; \
-	nmake -nologo -f Makefile.msvc BUILD_VERSION=$(SNAP) install
+	nmake -nologo -f Makefile.msvc BUILD_VERSION=$(SNAP) all install
 
 py:
 	cd $(SRC)/python; \