Skip to content

Commit

Permalink
Ready for KfW 4.0.1 beta 1
Browse files Browse the repository at this point in the history
Bump versions where appropriate, and drop buildlevel back to zero
for the new version.

While here, remove KRB5_RELTAG and KRB5_RELDATE from
src/windows/kerberos.ver as they are unused and merely serve
to cause confusion with the values in src/patchlevel.h.

[tlyu@mit.edu: update patchlevel.h too]
  • Loading branch information
kaduk authored and tlyu committed Dec 5, 2012
1 parent 725786e commit b81826a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/patchlevel.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@
#define KRB5_MAJOR_RELEASE 1
#define KRB5_MINOR_RELEASE 10
#define KRB5_PATCHLEVEL 3
#define KRB5_RELTAIL "postrelease"
#define KRB5_RELTAIL "kfw-4.0.1-beta1"
/* #undef KRB5_RELDATE */
#define KRB5_RELTAG "krb5-1.10"
#define KRB5_RELTAG "kfw-4.0.1-beta1"
7 changes: 3 additions & 4 deletions src/windows/installer/wix/site-local.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,10 @@

<!-- At most one of the following could be defined and must correspond
to the type of build performed. -->
<?define Release?>
<!-- <?define Release?> -->

<!-- Optional defines -->
<!-- Numeric Beta identifier -->
<!--<?define Beta="1"?> -->
<?define Beta="1"?> <!-- Numeric Beta identifier -->
<!-- <?define OldHelp?> --> <!-- Specifies the use of the old leash32.hlp file
instead of the new leash32.chm file -->

Expand All @@ -70,7 +69,7 @@
<?ifndef VersionMajor?>
<?define VersionMajor="4"?>
<?define VersionMinor="0"?>
<?define VersionPatch="0"?>
<?define VersionPatch="1"?>
<?else?>
<?if Not ($(var.VersionMinor) And $(var.VersionPatch))?>
<?error VersionMajor, VersionMinor and VersionPatch should be specified together?>
Expand Down
10 changes: 2 additions & 8 deletions src/windows/kerberos.ver
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
*
* Immediately following a final release, the release version numbers
* will be incremented, and KRB5_RELTAIL will revert to "prerelease".
*
* KRB5_RELTAG contains the CVS tag name corresponding to the release.
* KRB5_RELDATE identifies the date of the release. They should
* normally be undefined for checked-in code.
*/

/*
Expand All @@ -51,9 +47,7 @@
*/
#define KRB5_MAJOR_RELEASE 4
#define KRB5_MINOR_RELEASE 0
#define KRB5_PATCHLEVEL 0
#define KRB5_RELTAIL "postrelease"
/* #undef KRB5_RELDATE */
#define KRB5_RELTAG "krb5-1.10"
#define KRB5_PATCHLEVEL 1
#define KRB5_RELTAIL "beta1"

#define KRB5_PRODUCTNAME_STR "MIT Kerberos for Windows"
2 changes: 1 addition & 1 deletion src/windows/winlevel.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
* updated for each alpha, beta, final release. This will ensure
* that file identifiers are unique
*/
#define KRB5_BUILDLEVEL 7
#define KRB5_BUILDLEVEL 0

0 comments on commit b81826a

Please sign in to comment.