diff options
author | Kevin Koch <kpkoch@mit.edu> | 2007-03-28 18:43:11 +0000 |
---|---|---|
committer | Kevin Koch <kpkoch@mit.edu> | 2007-03-28 18:43:11 +0000 |
commit | 2233e813d5d50c1662e0479ae5f4267eb3b69be6 (patch) | |
tree | e570aa75fc3b5465f0f7542a3846f9b548d8ea4e /src/windows/build/BKWconfig.xml | |
parent | de996228a2daaf43216c823032255cd4652cf7fe (diff) | |
download | krb5-2233e813d5d50c1662e0479ae5f4267eb3b69be6.tar.gz krb5-2233e813d5d50c1662e0479ae5f4267eb3b69be6.tar.xz krb5-2233e813d5d50c1662e0479ae5f4267eb3b69be6.zip |
Pull product version information from kerberos.ver
Change site-local.wxi/.nsi to site-local-tagged.wxi/.nsi. Add tags such as %VERSION-MAJOR% which are substituted by the build script. NB: to build the installers directly, the build script must be run at least once to generate site-local.wxi/.nsi.
Write DEBUG, RELEASE, BETA defines to site-local.nsi, based on build setting & values from kerberos.ver.
Add more tag substitutions to file copy and the config file, to provide a way to generate names like kfw-3-2-0-DEBUG.exe programatically.
Target_Version: 1.6.1
Ticket: 5490
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19297 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/build/BKWconfig.xml')
-rw-r--r-- | src/windows/build/BKWconfig.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml index 7c536da024..28939444d8 100644 --- a/src/windows/build/BKWconfig.xml +++ b/src/windows/build/BKWconfig.xml @@ -29,10 +29,8 @@ <FetchSources>
<Config>
<CVSROOT name=":kserver:cvs.mit.edu:/cvs/pismere" />
- <SVNURL name="svn.mit.edu" /> <!-- NB: No protocol or slashes!! -->
- <KERBEROS_ID name="kpkoch" />
- <KRB_PLINK name="plink.exe" /> <!-- Path to a kerberized plink, needed for svn. -->
- <!-- NB: Path separators must be doubled backslashes. EG: C:\\WINDOWS\\PLINK.EXE -->
+ <SVNURL name="svn.mit.edu" /> <!-- NB: No protocol or slashes!! -->
+ <USERNAME name="" /> <!-- Needed for svn/plink. Override from command line -->
</Config>
</FetchSources>
<Make>
@@ -73,13 +71,18 @@ </CopyList>
</PrePackage>
<Package>
+ <Config>
+ <Paths>
+ <Versions path="pismere/athena/include/kerberos.ver" /> <!-- Relative to <src>. -->
+ </Paths>
+ </Config>
<MSI></MSI>
<NSIS></NSIS> <!-- NB: Most config is done in site-local.nsi. -->
<!-- Theoretically, writing site-local.nsi from xml settings could be done, but isn't. -->
</Package>
<PostPackage>
<Config> <!-- This config info will be copied into each CopyList in PostPackage. -->
- <FileStem name="kfw-3-2-0" /> <!-- <FileStem> will be substituted for %filestem%. -->
+ <FileStem name="kfw-%VERSION_MAJOR%-%VERSION_MINOR%-%VERSION_PATCH%" /> <!-- <FileStem> will be substituted for %filestem%. -->
</Config>
<Zips>
<Zip dummy="foo" /> <!-- To force desired XML::Simple behavior -->
@@ -142,7 +145,7 @@ <File name="msi-deployment-guide.txt" from="staging\install\wix\" to="" />
<File name="netidmgr_userdoc.pdf" from="staging\doc" to="." />
<File name="kfw.msi" from="staging\install\wix\" to="" newname="%filestem%.msi" />
- <File name="MITKerberosForWindows.exe" from="staging\install\nsis" to="" newname="%filestem%.exe" />
+ <File name="MITKerberosForWindows%-DEBUG%.exe" from="staging\install\nsis" to="" newname="%filestem%%-DEBUG%.exe" />
</Files>
</CopyList>
</PostPackage>
|