pcs 98/02/24 07:04:27
Modified: . how-to-release.html how-to-release-win32.html
Removed: . apache.iwz
Log:
Remove the apache.iwz IS2 file (now in the source tree). Update the
how-to-release documents a bit for this, and with some information
about licence key version information.
Revision Changes Path
1.28 +10 -5 apache-devsite/how-to-release.html
Index: how-to-release.html
===================================================================
RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- how-to-release.html 1998/02/23 08:33:31 1.27
+++ how-to-release.html 1998/02/24 15:04:24 1.28
@@ -128,6 +128,10 @@
betaseq)</CODE>.<BR>
<CODE><STRONG>$ vi src/main/httpd.h</STRONG></CODE><BR>
<CODE><STRONG>$ cvs commit src/main/httpd.h</STRONG></CODE>
+ <P>
+ If the release is going from beta to non-beta, or non-beta to a
+ beta, also update the Windows registry key release. See
+ <SAMP>os/win32/registry.c</SAMP> for more details.
<P>
<LI> Tag the sources for this release:<BR>
(<EM>note: be sure to tag the whole thing, not just
<CODE>src</CODE></EM>!)<BR>
@@ -265,11 +269,12 @@
<BR>
<H2>How to build an Apache Windows release</H2>
-<FONT COLOR="red">Note:</FONT> These instructions are temporary, until we
have a
-working installation of InstallShield, which will eventually be used to
-distribute Apache for Windows. At that time, these instructions will be
-replaced. For building an installation with InstallShield 2, see
-<A HREF="how-to-release-win32">How to Release Apache for Windows</A>.
+<FONT COLOR="red">Note:</FONT> These instructions are temporary, until
+we have a working installation of InstallShield, which will eventually
+be used to distribute Apache for Windows. At that time, these
+instructions will be replaced. For building an installation with
+InstallShield 2, see <A HREF="how-to-release-win32">how to build a
+release of Apache for Windows</A>.
<OL>
1.2 +57 -14 apache-devsite/how-to-release-win32.html
Index: how-to-release-win32.html
===================================================================
RCS file: /export/home/cvs/apache-devsite/how-to-release-win32.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- how-to-release-win32.html 1998/02/22 18:30:14 1.1
+++ how-to-release-win32.html 1998/02/24 15:04:25 1.2
@@ -25,8 +25,8 @@
<BLOCKQUOTE>
<BLOCKQUOTE>
This document describes how to release Apache for Windows (95 and
-NT). It is an appendix to the main
-<A HREF="how-to-release">How to Release Apache</A> document.
+NT). It is an appendix to the main <A HREF="how-to-release">how to
+build a release of Apache</A> document.
</BLOCKQUOTE>
</BLOCKQUOTE>
</BLOCKQUOTE>
@@ -41,7 +41,7 @@
<LI>Create an install directory to hold the files used when
building the installer
<LI>Configure the InstallShield configuration file
- <LI>Build the installer DLL
+ <LI>Build the installer DLL and copy it to the install directory
<LI>Build Apache and install it to the install directory
<LI>Use InstallShield to build the files from the install directory
into the single .EXE installer
@@ -94,23 +94,66 @@
<LI><B>Configure the InstallShield Configuration File</B><P>
Apache for Windows is packaged using InstallShield 2. This requires an
-InstallShield configuration file <SAMP><A
-HREF="apache.iwz">apache.iwz</A></SAMP>. Unfortunately InstallShield's
-configuration file contains hard-coded absolute paths to the
-individual files. If your install directory (step 1) is
-<SAMP>C:\Apache</SAMP> then you do not need to update the apache.iwz
-file. If you use another directory, search and replace
-<SAMP>C:\Apache</SAMP> with your directory in <SAMP>apache.iwz</SAMP>.
+InstallShield configuration file
+<SAMP>os/win32/installer/apache.iwz</SAMP>. Unfortunately
+InstallShield's configuration file contains hard-coded absolute paths
+to the individual files. If your install directory (step 1) is
+<SAMP>C:\Apache</SAMP> then you do not need to update the
+<SAMP>apache.iwz</SAMP> file. If you use another directory, search and
+replace <SAMP>C:\Apache</SAMP> with your directory in
+<SAMP>apache.iwz</SAMP>.
+
+<P>
+
+<B>Note</B>: This is probably a good time to check that the version
+information in the <SAMP>apache.iwz</SAMP> file is up-to-date. The
+version is stored in these locations:
+
+<P>
+
+<UL>
+
+ <LI>Set the Visual Design, Application Information, Version. This
+ should contain the full version number, eg. 1.3 or 1.3b5.
+
+ <LI>Set the Visual Design, Main Window, Main Title. As above.
+
+ <LI>Make Registry Changes, Registry Keys. The key
+ HKLM\SOFTWARE\Apache Group\Apache should contain a subkey
+ containing the version number which does not change across beta
+ release. For example, "1.3" (for a full release) or "1.3 beta"
+ (on all 1.3 betas). The name of this key must match the
+ definition of <SAMP>VERSION</SAMP> in
+ <SAMP>os/win32/registry.c</SAMP> of the version of Apache being
+ packaged.
+
+ <LI>Make Registry Changes, Registry Values. Under the key created in
+ the previous step, add a REG_SZ (String) value with name
+ "ServerRoot" and value "<INSTALLDIR>" (IS2 will replace this with
+ the real install directory).
+
+</UL>
+
+<P>
+
+If any of these are wrong the <SAMP>apache.iwz</SAMP> file will need
+updating. Do not forget to replace references to your install
+directory with <SAMP>C:\Apache</SAMP> in the file before committing
+it.
<P>
<LI><B>Building the Installer DLL</B><P>
The installer DLL is called by the installation process to configure
-the sample configuration files. It is built by running
-<SAMP>nmake</SAMP> in the installer directory. After it is build you
-should have a <SAMP>Release\install.dll</SAMP> file. Copy this file to
-the install directory.
+the sample configuration files. It is built by running <SAMP>nmake -f
+Makefile.nt install.mak</SAMP> in the <SAMP>src</SAMP> directory (is
+it not built by the normal <SAMP>_apacheX</SAMP> or
+<SAMP>installX</SAMP> targets). The code for the installer is in
+<SAMP>os/win32/installer/installdll</SAMP>, and after doing the build
+above the DLL file will be in
+<SAMP>os/win32/installer/installdll/Release/install.dll</SAMP>. Copy
+it into your install directory.
<P>
