Commit 83877d5e authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Kevin Roth updates

parent 3f248dd1
Loading
Loading
Loading
Loading
+4 −7
Original line number Original line Diff line number Diff line
@@ -12,21 +12,18 @@ EXTRA_DIST = README
#
#


# Cygwin build number (default to "1")
# Cygwin build number (default to "1")
# NOTE: I tried using this to default CYGBUILD to 1, but couldn't make it work)
CYGBUILD ?= 1
#ifndef CYGBUILD
#  CYGBUILD = 1
#endif


# temp dir for use while building the tarball (fully-qualified)
# Cygwin tarball build dir (fully-qualified name, gets deleted when done)
cygwintmp := $(CURDIR)/cygwinbin-builddir
cygwintmp := $(CURDIR)/cygwinbin-builddir


cygwinbin:
cygwinbin:
	rm -rf $(cygwintmp)
	rm -rf $(cygwintmp)
	@(echo Installing to the temporary build dir...)
	$(MAKE) -C $(top_builddir) install prefix=$(cygwintmp)/usr
	$(MAKE) -C $(top_builddir) install prefix=$(cygwintmp)/usr
	$(mkinstalldirs) $(cygwintmp)/usr/doc/Cygwin \
	$(mkinstalldirs) $(cygwintmp)/usr/doc/Cygwin \
	                 $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)
	                 $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)
	cp $(top_srcdir)/packages/Win32/cygwin/README \
	cd $(top_srcdir); \
	  cp packages/Win32/cygwin/README \
	  $(cygwintmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README
	  $(cygwintmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README
	cd $(top_srcdir) ; \
	cd $(top_srcdir) ; \
	  cp CHANGES LEGAL MPL-1.1.txt README docs/FAQ docs/FEATURES docs/TODO \
	  cp CHANGES LEGAL MPL-1.1.txt README docs/FAQ docs/FEATURES docs/TODO \
+14 −13
Original line number Original line Diff line number Diff line
Curl is a tool for transferring files with URL syntax, supporting
Curl is a tool for transferring files with URL syntax, supporting FTP, FTPS,
 FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. 
 HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. Curl supports HTTPS 
 Curl supports HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos,
 certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP form based
 HTTP form based upload, proxies, cookies, user+password authentication, 
 upload, proxies, cookies, user+password authentication, file transfer resume,
 file transfer resume, http proxy tunneling and a busload of other useful tricks.
 http proxy tunneling and a busload of other useful tricks.
 See /usr/doc/curl-<version>/FEATURES for more info.
 See /usr/doc/curl-<version>/FEATURES for more info.


cURL (as of 7.9.1) builds 100% cleanly OOTB.
cURL (as of 7.9.1) builds 100% cleanly OOTB.
@@ -13,7 +13,8 @@ The Cygwin specific source files (README and a Makefile for




Direct Dependencies:
Direct Dependencies:
  OpenSSL 0.9.6b (cURL can be built without SSL support: configure --without-ssl)
  OpenSSL 0.9.6b 
  (*) cURL can be built without SSL support:  ./configure --without-ssl




Canonical Homepage:
Canonical Homepage:
@@ -41,15 +42,15 @@ Build Instructions:




Packaging Instructions:
Packaging Instructions:
  To create a new binary tarball for cygwin's setup.exe, you must first do a clean
  To create a new binary tarball for cygwin's setup.exe, the first step is to
  build (see above). The 'make install' step is optional of course. Then do:
  do a clean build (./configure and make). The 'make install' step is optional.
  Then do:


  $ cd curl-<ver>-X
  $ cd curl-<ver>-X
  $ CYGBUILD=X make cygwinbin
  $ make cygwinbin CYGBUILD=X 


  where "X" is the cygwin release number (e.g. the "-1" in curl-7.9.3-1).
  where "X" is the cygwin release number (e.g. the "-1" in curl-7.9.3-1).
  I had some difficulty figuring out how to default CYGBUILD to "1", this may
  If you leave off "CYGBUILD=X", X defaults to 1.
  get fixed in a future release.
  
  
  Assuming everything worked properly, you'll find your cygwin
  Assuming everything worked properly, you'll find your cygwin
  binary tarball in the curl-<ver>-X/packages/Win32/cygwin/ directory.
  binary tarball in the curl-<ver>-X/packages/Win32/cygwin/ directory.