- Karl M brought the patch that creates vc9 Makefiles, and I made 'maketgz'

  now use the actual makefile targets to do the VC8 and VC9 makefiles.

diff --git a/CHANGES b/CHANGES
index 46335ee6ff4b3da780c7c95af86bd164ac8ab375..af61732bc797c02b3b2cc4dde4872ed79267c240 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
                                   Changelog
 
 
+Daniel Stenberg (11 Jan 2009)
+- Karl M brought the patch that creates vc9 Makefiles, and I made 'maketgz'
+  now use the actual makefile targets to do the VC8 and VC9 makefiles.
+
 Daniel Stenberg (10 Jan 2009)
 - Emil Romanus fixed:
 

diff --git a/Makefile.dist b/Makefile.dist
index a39e0edf5994e83f74a78ad1ee146c9b8eb49480..68bef1fa8df5fd1230313926394dd2c5257d5175 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -256,11 +256,18 @@ linux: all
 
 linux-ssl: ssl
 
+
 vc8:
        @echo "generate VC8 makefiles"
        @sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/wsock32.lib/wsock32.lib bufferoverflowu.lib/g" -e "s/VC6/VC8/g" lib/Makefile.vc6 > lib/Makefile.vc8
        @sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/wsock32.lib/wsock32.lib bufferoverflowu.lib/g" -e "s/VC6/VC8/g" src/Makefile.vc6 > src/Makefile.vc8
 
+# VC9 makefiles are for use with VS2008
+vc9:
+       @echo "generate VC9 makefiles"
+       @sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/wsock32.lib/wsock32.lib ws2_32.lib/g" -e "s/vc6/vc9/g" -e "s/VC6/VC9/g" lib/Makefile.vc6 > lib/Makefile.vc9
+       @sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/wsock32.lib/wsock32.lib ws2_32.lib/g" -e "s/vc6/vc9/g" -e "s/VC6/VC9/g" src/Makefile.vc6 > src/Makefile.vc9
+
 ca-bundle: lib/mk-ca-bundle.pl
        @echo "generate a fresh ca-bundle.crt"
        @perl $< -b -l -u lib/ca-bundle.crt

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 88daf1753a9d90603d0d6f7612666645c395a60b..aff8821aad5cf32ed7bf843317a95cae0b584f0c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -10,6 +10,7 @@ Curl and libcurl 7.19.3
 This release includes the following changes:
 
  o CURLAUTH_DIGEST_IE bit added for CURLOPT_HTTPAUTH and CURLOPT_PROXYAUTH
+ o VC9 Makefiles were added to the release package
 
 This release includes the following bugfixes:
 

diff --git a/maketgz b/maketgz
index a378826a7009c7a2b8d32ed04c8308c0f33acd47..d3c57ac9575794e08078b76b37a6a5b3a66fa705 100755 (executable)
--- a/maketgz
+++ b/maketgz
@@ -1,6 +1,28 @@
 #! /bin/sh
 # Script to build release-archives with
 #
+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+# $Id$
+###########################################################################
 
 version=$1
 
@@ -40,8 +62,11 @@ sed 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER
 
 echo "generate VC8 makefiles"
 # Generate VC8 versions from the VC6 Makefile versions 
-perl -pe 's%/GX /DWIN32 /YX%/EHsc /DWIN32%;' -e 's%/GZ%/RTC1%;' -e 's%wsock32.lib%wsock32.lib bufferoverflowu.lib%g;' -e 's%(VC)6%${1}8%gi;' lib/Makefile.vc6 > lib/Makefile.vc8.dist
-perl -pe "s%/GX /DWIN32 /YX%/EHsc /DWIN32%;" -e 's%/GZ%/RTC1%;' -e 's%wsock32.lib%wsock32.lib bufferoverflowu.lib%g;' -e 's%(VC)6%${1}8%gi;' -e 's/^#MANIFESTTOOL/MANIFESTTOOL/' src/Makefile.vc6 > src/Makefile.vc8.dist
+make -f Makefile.dist vc8
+
+echo "generate VC9 makefiles"
+# Generate VC9 versions from the VC6 Makefile versions 
+make -f Makefile.dist vc9
 
 # Replace version number in plist file:
 PLIST=lib/libcurl.plist