win makedist -w feature.

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

diff --git a/doc/Changelog b/doc/Changelog
index 8ed0378143baa7feb6ab2ccec969eea18bfa86f2..df655721320c5308d3472a6a7b8a7922e4843cae 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 24 February 2009: Wouter
        - isc moved their dlv key download location.
        - fixup warning on vista/mingw.
+       - makedist -w for window zip distribution first version.
 
 20 February 2009: Wouter
        - Fixup contrib/update-itar.sh, the exit codes 1 and 0 were swapped.

diff --git a/makedist.sh b/makedist.sh
index d72748718f1060ef6a2ebac5a2f82cf880e72292..67085fbe441725866d4b9044dc801b1c8b489ec6 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -42,10 +42,11 @@ cwd=`pwd`
 # Utility functions.
 usage () {
     cat >&2 <<EOF
-Usage $0: [-h] [-s] [-d SVN_root] [-l ldns_path]
+Usage $0: [-w] [-h] [-s] [-d SVN_root] [-l ldns_path]
 Generate a distribution tar file for NSD.
 
     -h           This usage information.
+    -w           Build windows snapshot binary zip.
     -s           Build a snapshot distribution file.  The current date is
                  automatically appended to the current NSD version number.
     -rc <nr>     Build a release candidate, the given string will be added
@@ -110,6 +111,7 @@ replace_all () {
 SNAPSHOT="no"
 RC="no"
 LDNSDIR=""
+DOWIN="no"
 
 # Parse the command line arguments.
 while [ "$1" ]; do
@@ -124,6 +126,9 @@ while [ "$1" ]; do
         "-s")
             SNAPSHOT="yes"
             ;;
+        "-w")
+            DOWIN="yes"
+            ;;
         "-l")
             LDNSDIR="$2"
             shift
@@ -139,6 +144,32 @@ while [ "$1" ]; do
     shift
 done
 
+if [ "$DOWIN" = "yes" ]; then
+    version=`./configure --version | head -1 | awk '{ print $3 }'` || \
+        error_cleanup "Cannot determine version number."
+    info "Unbound version: $version"
+    file="unbound-$version.zip"
+    rm -f $file
+    info "Creating $file"
+    mkdir tmp.$$
+    cd tmp.$$
+    cp ../doc/example.conf example.conf
+    cp ../unbound.exe unbound.exe
+    cp ../unbound-host.exe unbound-host.exe
+    cp ../unbound-control.exe unbound-control.exe
+    cp ../unbound-checkconf.exe unbound-checkconf.exe
+    cp ../LICENSE LICENSE
+    cp ../winrc/unbound-website.url unbound-website.url
+    zip ../$file LICENSE unbound.exe unbound-host.exe unbound-control.exe unbound-checkconf.exe example.conf unbound-website.url
+    rm -f example.conf
+    info "Testing $file"
+    cd ..
+    rm -rf tmp.$$
+    zip -T $file
+    info "Done"
+    exit 0
+fi
+
 # Check if SVNROOT is specified.
 if [ -z "$SVNROOT" ]; then
     if test -f .svn/entries; then

diff --git a/winrc/unbound-website.url b/winrc/unbound-website.url
new file mode 100644 (file)
index 0000000..ef4685a
--- /dev/null
+++ b/winrc/unbound-website.url
@@ -0,0 +1,3 @@
+[InternetShortcut]\r
+URL=http://unbound.net/\r
+\r