You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2005/12/02 13:33:28 UTC
svn commit: r351702 - /httpd/httpd/branches/2.2.x/Makefile.win
Author: wrowe
Date: Fri Dec 2 04:33:27 2005
New Revision: 351702
URL: http://svn.apache.org/viewcvs?rev=351702&view=rev
Log:
Backport fix for mod_charset_lite 2.2.0 build breakage on Win32
Modified:
httpd/httpd/branches/2.2.x/Makefile.win
Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/Makefile.win?rev=351702&r1=351701&r2=351702&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Fri Dec 2 04:33:27 2005
@@ -246,9 +246,9 @@
$(MAKE) $(MAKEOPT) -f mod_dumpio.mak CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\experimental
- $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\filters
+ $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!IF EXIST("srclib\zlib")
$(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!ENDIF
@@ -400,7 +400,7 @@
copy modules\dav\main\$(LONG)\mod_dav.$(src_so) "$(inst_so)" <.y
copy modules\debug\$(LONG)\mod_bucketeer.$(src_so) "$(inst_so)" <.y
copy modules\debug\$(LONG)\mod_dumpio.$(src_so) "$(inst_so)" <.y
- copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
+ copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
!IF EXIST("srclib\zlib")
copy modules\filters\$(LONG)\mod_deflate.$(src_so) "$(inst_so)" <.y
!IF EXIST("srclib\zlib\zlib1.$(src_dll)")
Re: svn commit: r351702 - /httpd/httpd/branches/2.2.x/Makefile.win
Posted by "Roy T. Fielding" <fi...@gbiv.com>.
On Dec 2, 2005, at 5:24 AM, William A. Rowe, Jr. wrote:
> With this single change, there is now a source package available at;
>
> httpd.apache.org/dev/dist/httpd-2.2.0-win32-src.zip
>
> However, without this single change it was impossible for nmake -f
> to run
> to completion.
>
> Is it unreasonable to publish this .zip if we deposit this patch
> under the
> general /dist/httpd/patches/apply-to-2.2.0/ tree for those working
> from
> a tarball? If not, I'll scuttle (or leave in place for folks
> looking for
> an unreleased candidate to examine), and we'll start all over at
> 2.2.1 with
> the initial release.
Go ahead and publish this package under the 2.2.0-win32 name. The
changes fall within the scope of platform-specific ones that we allow
third-party package maintainers to make, so there's no reason we can't
do the same. Yes, please deposit the patch as well. Thanks,
....Roy
Re: svn commit: r351702 - /httpd/httpd/branches/2.2.x/Makefile.win
Posted by Astrid 'Kess' Keßler <ke...@kess-net.de>.
On Saturday 03 December 2005 09:21, André Malo wrote:
> * Joshua Slive wrote:
> > I highly doubt that many people use the bundled docs. They are not
> > browsable on a default configuration and certainly require the server to
> > be running before they are usable, which means they are of little help
> > to upgraders. We also build windows-help format docs, which would be
> > much more appropriate for win32 users, but I don't think we have those
> > for 2.2 yet.
>
> Ah yes. This is, because my box crashed some time ago and I don't have a
> working windows installation yet. Anyone around here with about an hour to
> spare for booting (!) into each language (de, en, es, ja, ko) and building
> the chm docs? I'm happy to help through the process. (The necessary
> settings and requirements are also described the `build` help).
>
> nd
been there, got nd's help, done that ;)
kess
---------------------------------------------------------------------
To unsubscribe, e-mail: docs-unsubscribe@httpd.apache.org
For additional commands, e-mail: docs-help@httpd.apache.org
Re: svn commit: r351702 - /httpd/httpd/branches/2.2.x/Makefile.win
Posted by André Malo <nd...@perlig.de>.
* Joshua Slive wrote:
> I highly doubt that many people use the bundled docs. They are not
> browsable on a default configuration and certainly require the server to
> be running before they are usable, which means they are of little help
> to upgraders. We also build windows-help format docs, which would be
> much more appropriate for win32 users, but I don't think we have those
> for 2.2 yet.
Ah yes. This is, because my box crashed some time ago and I don't have a
working windows installation yet. Anyone around here with about an hour to
spare for booting (!) into each language (de, en, es, ja, ko) and building
the chm docs? I'm happy to help through the process. (The necessary
settings and requirements are also described the `build` help).
nd
--
Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook.
Ook! Ook? Ook. Ook? Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook.
Ook. Ook. Ook. Ook. Ook? Ook. Ook! Ook! Ook? Ook! Ook. Ook? Ook. Ook.
Ook. Ook. Ook. Ook. Ook! Ook. Ook! Ook! Ook! Ook! Ook! Ook.
---------------------------------------------------------------------
To unsubscribe, e-mail: docs-unsubscribe@httpd.apache.org
For additional commands, e-mail: docs-help@httpd.apache.org
Re: svn commit: r351702 - /httpd/httpd/branches/2.2.x/Makefile.win
Posted by André Malo <nd...@perlig.de>.
* Joshua Slive wrote:
> I highly doubt that many people use the bundled docs. They are not
> browsable on a default configuration and certainly require the server to
> be running before they are usable, which means they are of little help
> to upgraders. We also build windows-help format docs, which would be
> much more appropriate for win32 users, but I don't think we have those
> for 2.2 yet.
Ah yes. This is, because my box crashed some time ago and I don't have a
working windows installation yet. Anyone around here with about an hour to
spare for booting (!) into each language (de, en, es, ja, ko) and building
the chm docs? I'm happy to help through the process. (The necessary
settings and requirements are also described the `build` help).
nd
--
Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook.
Ook! Ook? Ook. Ook? Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook. Ook.
Ook. Ook. Ook. Ook. Ook? Ook. Ook! Ook! Ook? Ook! Ook. Ook? Ook. Ook.
Ook. Ook. Ook. Ook. Ook! Ook. Ook! Ook! Ook! Ook! Ook! Ook.
Re: svn commit: r351702 - /httpd/httpd/branches/2.2.x/Makefile.win
Posted by Joshua Slive <jo...@slive.ca>.
William A. Rowe, Jr. wrote:
> With this single change, there is now a source package available at;
>
> httpd.apache.org/dev/dist/httpd-2.2.0-win32-src.zip
>
> However, without this single change it was impossible for nmake -f to run
> to completion.
>
> Is it unreasonable to publish this .zip if we deposit this patch under the
> general /dist/httpd/patches/apply-to-2.2.0/ tree for those working from
> a tarball? If not, I'll scuttle (or leave in place for folks looking for
> an unreleased candidate to examine), and we'll start all over at 2.2.1 with
> the initial release.
Just add -patch1 or something to the name to make it clear and then go
ahead and release it.
> There are some further changes necessary to building on win32 docs for 2.2
> which I'll commit this weekend. Are we doing anything in the 'bundled
> docs'
> to indicate to the user that our site is much more likely to contain the
> latest, up to date information? It seems we should, in the distribution,
> and in all the Announcements we publish for at least the first few months
> of 2.2's existance.
I highly doubt that many people use the bundled docs. They are not
browsable on a default configuration and certainly require the server to
be running before they are usable, which means they are of little help
to upgraders. We also build windows-help format docs, which would be
much more appropriate for win32 users, but I don't think we have those
for 2.2 yet.
Joshua.
Re: svn commit: r351702 - /httpd/httpd/branches/2.2.x/Makefile.win
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
With this single change, there is now a source package available at;
httpd.apache.org/dev/dist/httpd-2.2.0-win32-src.zip
However, without this single change it was impossible for nmake -f to run
to completion.
Is it unreasonable to publish this .zip if we deposit this patch under the
general /dist/httpd/patches/apply-to-2.2.0/ tree for those working from
a tarball? If not, I'll scuttle (or leave in place for folks looking for
an unreleased candidate to examine), and we'll start all over at 2.2.1 with
the initial release.
If so great, we can proceed (2nd set of eyeballs on the .zip file please)
and determine the exact binary build, VC6 or 2005. I've determined that
the intermediate Visual Studio 2000/2003 are simply not appropriate, and
if we ship 2005 we will need to distribute the c runtime installed locally.
(See http://support.microsoft.com/default.aspx?scid=kb;en-us;326922 for why
I'm again leaning twords VC6 till MS gets their act together w.r.t. clibs.
If they have determined we can't trust two supposedly identical runtimes
to be binary compatible, we can't trust that what the Perl builder, or
Python builder has used to assemble their tools. If MS has surrendered
to their inability to have standardized and consistent clibs - even within
their specific compiler lifespan, we will probably can't move on this.)
There are some further changes necessary to building on win32 docs for 2.2
which I'll commit this weekend. Are we doing anything in the 'bundled docs'
to indicate to the user that our site is much more likely to contain the
latest, up to date information? It seems we should, in the distribution,
and in all the Announcements we publish for at least the first few months
of 2.2's existance.
Bill
> URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/Makefile.win?rev=351702&r1=351701&r2=351702&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.2.x/Makefile.win (original)
> +++ httpd/httpd/branches/2.2.x/Makefile.win Fri Dec 2 04:33:27 2005
> @@ -246,9 +246,9 @@
> $(MAKE) $(MAKEOPT) -f mod_dumpio.mak CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
> cd ..\..
> cd modules\experimental
> - $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
> cd ..\..
> cd modules\filters
> + $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
> !IF EXIST("srclib\zlib")
> $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
> !ENDIF
> @@ -400,7 +400,7 @@
> copy modules\dav\main\$(LONG)\mod_dav.$(src_so) "$(inst_so)" <.y
> copy modules\debug\$(LONG)\mod_bucketeer.$(src_so) "$(inst_so)" <.y
> copy modules\debug\$(LONG)\mod_dumpio.$(src_so) "$(inst_so)" <.y
> - copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
> + copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
> !IF EXIST("srclib\zlib")
> copy modules\filters\$(LONG)\mod_deflate.$(src_so) "$(inst_so)" <.y
> !IF EXIST("srclib\zlib\zlib1.$(src_dll)")
Re: svn commit: r351702 - /httpd/httpd/branches/2.2.x/Makefile.win
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
With this single change, there is now a source package available at;
httpd.apache.org/dev/dist/httpd-2.2.0-win32-src.zip
However, without this single change it was impossible for nmake -f to run
to completion.
Is it unreasonable to publish this .zip if we deposit this patch under the
general /dist/httpd/patches/apply-to-2.2.0/ tree for those working from
a tarball? If not, I'll scuttle (or leave in place for folks looking for
an unreleased candidate to examine), and we'll start all over at 2.2.1 with
the initial release.
If so great, we can proceed (2nd set of eyeballs on the .zip file please)
and determine the exact binary build, VC6 or 2005. I've determined that
the intermediate Visual Studio 2000/2003 are simply not appropriate, and
if we ship 2005 we will need to distribute the c runtime installed locally.
(See http://support.microsoft.com/default.aspx?scid=kb;en-us;326922 for why
I'm again leaning twords VC6 till MS gets their act together w.r.t. clibs.
If they have determined we can't trust two supposedly identical runtimes
to be binary compatible, we can't trust that what the Perl builder, or
Python builder has used to assemble their tools. If MS has surrendered
to their inability to have standardized and consistent clibs - even within
their specific compiler lifespan, we will probably can't move on this.)
There are some further changes necessary to building on win32 docs for 2.2
which I'll commit this weekend. Are we doing anything in the 'bundled docs'
to indicate to the user that our site is much more likely to contain the
latest, up to date information? It seems we should, in the distribution,
and in all the Announcements we publish for at least the first few months
of 2.2's existance.
Bill
> URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/Makefile.win?rev=351702&r1=351701&r2=351702&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.2.x/Makefile.win (original)
> +++ httpd/httpd/branches/2.2.x/Makefile.win Fri Dec 2 04:33:27 2005
> @@ -246,9 +246,9 @@
> $(MAKE) $(MAKEOPT) -f mod_dumpio.mak CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
> cd ..\..
> cd modules\experimental
> - $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
> cd ..\..
> cd modules\filters
> + $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
> !IF EXIST("srclib\zlib")
> $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
> !ENDIF
> @@ -400,7 +400,7 @@
> copy modules\dav\main\$(LONG)\mod_dav.$(src_so) "$(inst_so)" <.y
> copy modules\debug\$(LONG)\mod_bucketeer.$(src_so) "$(inst_so)" <.y
> copy modules\debug\$(LONG)\mod_dumpio.$(src_so) "$(inst_so)" <.y
> - copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
> + copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
> !IF EXIST("srclib\zlib")
> copy modules\filters\$(LONG)\mod_deflate.$(src_so) "$(inst_so)" <.y
> !IF EXIST("srclib\zlib\zlib1.$(src_dll)")