diff options
| author | Greg Hudson <ghudson@mit.edu> | 2016-03-29 18:32:56 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2016-04-05 14:38:47 -0400 |
| commit | ace9a964cf7f7a19080fdd1dd8590bec9f3bc760 (patch) | |
| tree | 41c7c0c13174c6710cae5769e5e231f0a5b4339c | |
| parent | 8f9ade8ec50cde1176411085294f85ecfb2820a4 (diff) | |
| download | krb5-ace9a964cf7f7a19080fdd1dd8590bec9f3bc760.zip krb5-ace9a964cf7f7a19080fdd1dd8590bec9f3bc760.tar.gz krb5-ace9a964cf7f7a19080fdd1dd8590bec9f3bc760.tar.bz2 | |
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.
| -rw-r--r-- | appveyor.yml | 16 | ||||
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | src/util/wshelper/resource.rc | 2 | ||||
| -rw-r--r-- | src/windows/Makefile.in | 5 |
4 files changed, 24 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 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 8b9e790..5e4445a 100644 --- 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 3fb1477..f9086f4 100644 --- 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 fb9c2d7..b3011f6 100644 --- 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 |