Integrate with appveyor for Windows CI

appveyor.com is a hosted continuous integration service for Windows.
Add an appveyor.yml file containing build instructions.  The appveyor
virtual machines do not include the MFC libraries, so change
util/wshelper/resource.rc to avoid including <afxres.h> (which it does
not need) and add a build conditional for leash.

Right now we do not build the installers; the appveyor VMs do not
appear to have the version of the WiX toolkit we need, and we would
also have problems with the missing leash executable.

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644 (file)
index 0000000..7b8e7f1
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,16 @@
+build_script:
+  - call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86
+  - mkdir C:\kfw
+  - set KRB_INSTALL_DIR=C:\kfw
+  - set CPU=i386
+  - set NO_LEASH=1
+  - set
+  - cd C:\Projects\krb5\src
+  - nmake -f Makefile.in prep-windows
+  - nmake
+  - nmake install
+  - set CPU=AMD64
+  - setenv /x64
+  - nmake clean
+  - nmake
+  - nmake install

diff --git a/src/Makefile.in b/src/Makefile.in
index 8b9e790f0182932ca2bf74458919297e7198125f..5e4445a621c5b6405886049ef474979b7107edd4 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -504,9 +504,12 @@ install-windows::
        copy windows\leashdll\$(OUTPRE)*.lib "$(KRB_INSTALL_DIR)\lib\."
        copy windows\leashdll\$(OUTPRE)*.dll "$(KRB_INSTALL_DIR)\bin\."
        $(INSTALLDBGSYMS) windows\leashdll\$(OUTPRE)*.pdb "$(KRB_INSTALL_DIR)\bin\."
+##DOS##!ifndef NO_LEASH
        copy windows\leash\$(OUTPRE)*.exe "$(KRB_INSTALL_DIR)\bin\."
        $(INSTALLDBGSYMS) windows\leash\$(OUTPRE)*.pdb "$(KRB_INSTALL_DIR)\bin\."
        copy windows\leash\$(OUTPRE)*.chm "$(KRB_INSTALL_DIR)\bin\."
+       copy windows\leash\htmlhelp\*.chm "$(KRB_INSTALL_DIR)\bin\."
+##DOS##!endif
        copy windows\kfwlogon\$(OUTPRE)*.lib "$(KRB_INSTALL_DIR)\lib\."
        copy windows\kfwlogon\$(OUTPRE)*.exe "$(KRB_INSTALL_DIR)\bin\."
        copy windows\kfwlogon\$(OUTPRE)*.dll "$(KRB_INSTALL_DIR)\bin\."
@@ -535,7 +538,6 @@ install-windows::
        $(INSTALLDBGSYMS) clients\kdeltkt\$(OUTPRE)kdeltkt.pdb "$(KRB_INSTALL_DIR)\bin\."
        $(INSTALLDBGSYMS) clients\kpasswd\$(OUTPRE)kpasswd.pdb "$(KRB_INSTALL_DIR)\bin\."
        $(INSTALLDBGSYMS) clients\kswitch\$(OUTPRE)kswitch.pdb "$(KRB_INSTALL_DIR)\bin\."
-       copy windows\leash\htmlhelp\*.chm "$(KRB_INSTALL_DIR)\bin\."
 
 check-prerecurse: runenv.py
        $(RM) $(SKIPTESTS)

diff --git a/src/util/wshelper/resource.rc b/src/util/wshelper/resource.rc
index 3fb14771e76130465e3b082c7bdc41a492ede3fb..f9086f4db9343834fe8dc6857da27528568291c7 100644 (file)
--- a/src/util/wshelper/resource.rc
+++ b/src/util/wshelper/resource.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include <afxres.h>
+#include <windows.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index fb9c2d77c7acb10887937a568e42cfe04a2c15b4..b3011f6af0a57905c50f257ed59689c72f2d2ae0 100644 (file)
--- a/src/windows/Makefile.in
+++ b/src/windows/Makefile.in
@@ -1,3 +1,6 @@
 BUILDTOP=..
 NO_OUTPRE=1
-SUBDIRS= lib leashdll leash cns ms2mit kfwlogon
+!ifndef NO_LEASH
+LEASH=leash
+!endif
+SUBDIRS= lib leashdll $(LEASH) cns ms2mit kfwlogon