moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

- Robert A. Monat and Shmulik Regev helped out to fix the new */Makefile.vc8

Browse Source 
makefiles that are included in the source release archives, generated from
  the Makefile.vc6 files by the maketgz script. I also modified the root
  Makefile to have a VC variable that defaults to vc6 but can be overridden to
  allow it to be used for vc8 as well. Like this:

    nmake VC=vc8 vc
This commit is contained in:
Daniel Stenberg 2007-03-02 22:42:43 +00:00
parent aeddea2b71
commit d3b89e114a
4 changed files with 66 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES
View File

@ -6,6 +6,15 @@
Changelog Changelog
Daniel (2 March 2007)
- Robert A. Monat and Shmulik Regev helped out to fix the new */Makefile.vc8
makefiles that are included in the source release archives, generated from
the Makefile.vc6 files by the maketgz script. I also modified the root
Makefile to have a VC variable that defaults to vc6 but can be overridden to
allow it to be used for vc8 as well. Like this:
nmake VC=vc8 vc
Daniel (27 February 2007) Daniel (27 February 2007)
- Hang Kin Lau found and fixed: When I use libcurl to connect to an https - Hang Kin Lau found and fixed: When I use libcurl to connect to an https
server through a proxy and have the remote https server port set using the server through a proxy and have the remote https server port set using the

98
Makefile.dist
View File

@ -21,6 +21,8 @@
# $Id$ # $Id$
########################################################################### ###########################################################################
VC=vc6
all: all:
./configure ./configure
make make
@ -87,106 +89,106 @@ mingw32-clean:
vc-clean: vc-clean:
cd lib cd lib
nmake -f Makefile.vc6 clean nmake -f Makefile.$(VC) clean
cd ..\src cd ..\src
nmake -f Makefile.vc6 clean nmake -f Makefile.$(VC) clean
vc-all: vc-all:
cd lib cd lib
nmake -f Makefile.vc6 cfg=release nmake -f Makefile.$(VC) cfg=release
nmake -f Makefile.vc6 cfg=release-ssl nmake -f Makefile.$(VC) cfg=release-ssl
nmake -f Makefile.vc6 cfg=release-zlib nmake -f Makefile.$(VC) cfg=release-zlib
nmake -f Makefile.vc6 cfg=release-ssl-zlib nmake -f Makefile.$(VC) cfg=release-ssl-zlib
nmake -f Makefile.vc6 cfg=release-ssl-dll nmake -f Makefile.$(VC) cfg=release-ssl-dll
nmake -f Makefile.vc6 cfg=release-zlib-dll nmake -f Makefile.$(VC) cfg=release-zlib-dll
nmake -f Makefile.vc6 cfg=release-ssl-dll-zlib-dll nmake -f Makefile.$(VC) cfg=release-ssl-dll-zlib-dll
nmake -f Makefile.vc6 cfg=release-dll nmake -f Makefile.$(VC) cfg=release-dll
nmake -f Makefile.vc6 cfg=release-dll-ssl-dll nmake -f Makefile.$(VC) cfg=release-dll-ssl-dll
nmake -f Makefile.vc6 cfg=release-dll-zlib-dll nmake -f Makefile.$(VC) cfg=release-dll-zlib-dll
nmake -f Makefile.vc6 cfg=release-dll-ssl-dll-zlib-dll nmake -f Makefile.$(VC) cfg=release-dll-ssl-dll-zlib-dll
nmake -f Makefile.vc6 cfg=debug nmake -f Makefile.$(VC) cfg=debug
nmake -f Makefile.vc6 cfg=debug-ssl nmake -f Makefile.$(VC) cfg=debug-ssl
nmake -f Makefile.vc6 cfg=debug-zlib nmake -f Makefile.$(VC) cfg=debug-zlib
nmake -f Makefile.vc6 cfg=debug-ssl-zlib nmake -f Makefile.$(VC) cfg=debug-ssl-zlib
nmake -f Makefile.vc6 cfg=debug-ssl-dll nmake -f Makefile.$(VC) cfg=debug-ssl-dll
nmake -f Makefile.vc6 cfg=debug-zlib-dll nmake -f Makefile.$(VC) cfg=debug-zlib-dll
nmake -f Makefile.vc6 cfg=debug-ssl-dll-zlib-dll nmake -f Makefile.$(VC) cfg=debug-ssl-dll-zlib-dll
nmake -f Makefile.vc6 cfg=debug-dll nmake -f Makefile.$(VC) cfg=debug-dll
nmake -f Makefile.vc6 cfg=debug-dll-ssl-dll nmake -f Makefile.$(VC) cfg=debug-dll-ssl-dll
nmake -f Makefile.vc6 cfg=debug-dll-zlib-dll nmake -f Makefile.$(VC) cfg=debug-dll-zlib-dll
nmake -f Makefile.vc6 cfg=debug-dll-ssl-dll-zlib-dll nmake -f Makefile.$(VC) cfg=debug-dll-ssl-dll-zlib-dll
vc: vc:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release nmake /f Makefile.$(VC) cfg=release
cd ..\src cd ..\src
nmake /f Makefile.vc6 nmake /f Makefile.$(VC)
vc-zlib: vc-zlib:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-zlib nmake /f Makefile.$(VC) cfg=release-zlib
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-zlib nmake /f Makefile.$(VC) cfg=release-zlib
vc-ssl: vc-ssl:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-ssl nmake /f Makefile.$(VC) cfg=release-ssl
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-ssl nmake /f Makefile.$(VC) cfg=release-ssl
vc-ssl-zlib: vc-ssl-zlib:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-ssl-zlib nmake /f Makefile.$(VC) cfg=release-ssl-zlib
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-ssl-zlib nmake /f Makefile.$(VC) cfg=release-ssl-zlib
vc-ssl-dll: vc-ssl-dll:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-ssl-dll nmake /f Makefile.$(VC) cfg=release-ssl-dll
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-ssl-dll nmake /f Makefile.$(VC) cfg=release-ssl-dll
vc-dll-ssl-dll: vc-dll-ssl-dll:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-dll-ssl-dll nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-dll-ssl-dll nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll
vc-dll: vc-dll:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-dll nmake /f Makefile.$(VC) cfg=release-dll
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-dll nmake /f Makefile.$(VC) cfg=release-dll
vc-dll-zlib-dll: vc-dll-zlib-dll:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-dll-zlib-dll nmake /f Makefile.$(VC) cfg=release-dll-zlib-dll
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-dll-zlib-dll nmake /f Makefile.$(VC) cfg=release-dll-zlib-dll
vc-dll-ssl-dll-zlib-dll: vc-dll-ssl-dll-zlib-dll:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-dll-ssl-dll-zlib-dll nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll-zlib-dll
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-dll-ssl-dll-zlib-dll nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll-zlib-dll
vc-ssl-dll-zlib-dll: vc-ssl-dll-zlib-dll:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-ssl-dll-zlib-dll nmake /f Makefile.$(VC) cfg=release-ssl-dll-zlib-dll
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-ssl-dll-zlib-dll nmake /f Makefile.$(VC) cfg=release-ssl-dll-zlib-dll
vc-zlib-dll: vc-zlib-dll:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release-zlib-dll nmake /f Makefile.$(VC) cfg=release-zlib-dll
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release-zlib-dll nmake /f Makefile.$(VC) cfg=release-zlib-dll
vc-sspi: vc-sspi:
cd lib cd lib
nmake /f Makefile.vc6 cfg=release WINDOWS_SSPI=1 nmake /f Makefile.$(VC) cfg=release WINDOWS_SSPI=1
cd ..\src cd ..\src
nmake /f Makefile.vc6 cfg=release WINDOWS_SSPI=1 nmake /f Makefile.$(VC) cfg=release WINDOWS_SSPI=1
djgpp: djgpp:
$(MAKE) -C lib -f Makefile.dj $(MAKE) -C lib -f Makefile.dj

3
RELEASE-NOTES
View File

@ -18,7 +18,8 @@ This release includes the following changes:
o changed default anonymous FTP password o changed default anonymous FTP password
o changed the CURLOPT_FTP_SSL_CCC option to handle active and passive o changed the CURLOPT_FTP_SSL_CCC option to handle active and passive
CCC shutdown CCC shutdown
o Added the --ftp-ssl-ccc-mode command line option o added the --ftp-ssl-ccc-mode command line option
o includes VC8 Makefiles in the release archive
This release includes the following bugfixes: This release includes the following bugfixes:

5
maketgz
View File

@ -38,6 +38,11 @@ sed -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION "'$libversion'"/g'
# Replace version number in header file: # Replace version number in header file:
sed 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER >$CHEADER.dist sed 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER >$CHEADER.dist
echo "generate VC8 makefiles"
# Generate VC8 versions from the VC6 Makefile versions
sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e 's#/GZ#/RTC1#' -e 's/VC6/VC8/g' lib/Makefile.vc6 > lib/Makefile.vc8.dist
sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e 's#/GZ#/RTC1#' -e 's/VC6/VC8/g' src/Makefile.vc6 > src/Makefile.vc8.dist
# Replace version number in plist file: # Replace version number in plist file:
PLIST=lib/libcurl.plist PLIST=lib/libcurl.plist
sed "s/7\.12\.3/$libversion/g" $PLIST > $PLIST.dist sed "s/7\.12\.3/$libversion/g" $PLIST > $PLIST.dist