windows crosscompile expat option for static expat library.

git-svn-id: file:///svn/unbound/trunk@2283 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/makedist.sh b/makedist.sh
index c00475efc74bffaf3bf1a2b5672342a7b7b462dd..ca196e0e2f052dfedca8fc97e81b42fc5024d156 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -55,6 +55,7 @@ Generate a distribution tar file for unbound.
                  Detected from svn working copy if not specified.
     -l ldnsdir   Directory where ldns resides. Detected from Makefile.
     -wssl openssl.xx.tar.gz Also build openssl from tarball for windows dist.
+    -wxp expat.xx.tar.gz Also build expat from tarball for windows dist.
     -w ...       Build windows binary dist. last args passed to configure.
 EOF
     exit 1
@@ -135,6 +136,7 @@ RC="no"
 LDNSDIR=""
 DOWIN="no"
 WINSSL=""
+WINEXPAT=""
 
 # Parse the command line arguments.
 while [ "$1" ]; do
@@ -153,6 +155,10 @@ while [ "$1" ]; do
            WINSSL="$2"
            shift
            ;;
+        "-wxp")
+           WINEXPAT="$2"
+           shift
+           ;;
         "-w")
             DOWIN="yes"
            shift
@@ -208,6 +214,22 @@ if [ "$DOWIN" = "yes" ]; then
                cd ..
        fi
 
+       if test -n "$WINEXPAT"; then
+               info "Cross compile $WINEXPAT"
+               info "wxp: tar unpack"
+               (cd ..; gzip -cd $WINEXPAT) | tar xf - || error_cleanup "tar unpack of $WINEXPAT failed"
+               wxpinstall="`pwd`/wxpinstall"
+               cd expat-* || error_cleanup "no expat-X dir in tarball"
+               info "wxp: configure"
+               mingw32-configure --prefix="$wxpinstall" --exec-prefix="$wxpinstall" --bindir="$wxpinstall/bin" --includedir="$wxpinstall/include" --mandir="$wxpinstall/man" --libdir="$wxpinstall/lib"  || error_cleanup "libexpat configure failed"
+               info "wxp: make"
+               make || error_cleanup "libexpat crosscompile failed"
+               info "wxp: make install"
+               make install || error_cleanup "libexpat install failed"
+               cross_flag="$cross_flag --with-libexpat=$wxpinstall"
+               cd ..
+       fi
+
        info "Exporting source from SVN."
        svn export "$SVNROOT" unbound || error_cleanup "SVN command failed"
        cd unbound || error_cleanup "Unbound not exported correctly from SVN"

diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index fce2c2c9ccd6a2febdb41d765f2c021e1777c8e6..cb0284db70f52b015dd79e696e964274f63230d0 100644 (file)
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -97,6 +97,7 @@ section "-hidden.postinstall"
        File "..\unbound-checkconf.exe"
        File "..\unbound-control.exe"
        File "..\unbound-host.exe"
+       File "..\unbound-anchor.exe"
        File "..\unbound-service-install.exe"
        File "..\unbound-service-remove.exe"
        File "..\anchor-update.exe"
@@ -180,6 +181,7 @@ section "un.Unbound"
        Delete "$INSTDIR\unbound-checkconf.exe"
        Delete "$INSTDIR\unbound-control.exe"
        Delete "$INSTDIR\unbound-host.exe"
+       Delete "$INSTDIR\unbound-anchor.exe"
        Delete "$INSTDIR\unbound-service-install.exe"
        Delete "$INSTDIR\unbound-service-remove.exe"
        Delete "$INSTDIR\anchor-update.exe"