From 9e2d45b301bdf7ee11246a3f99bcd53b75071cf2 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 9 Feb 2019 00:02:41 +0100 Subject: [PATCH 1/9] Rename all files called 'aux.*' to something else; Windows can't handle them. --- modules/src/em_opt/{aux.c => utils.c} | 0 util/ego/bo/bo.c | 2 +- util/ego/cf/cf_loop.c | 2 +- util/ego/cj/cj.c | 2 +- util/ego/cs/cs_aux.c | 2 +- util/ego/cs/cs_avail.c | 2 +- util/ego/cs/cs_elim.c | 2 +- util/ego/cs/cs_getent.c | 2 +- util/ego/cs/cs_kill.c | 2 +- util/ego/cs/cs_partit.c | 2 +- util/ego/cs/cs_profit.c | 2 +- util/ego/cs/cs_stack.c | 2 +- util/ego/cs/cs_vnm.c | 2 +- util/ego/ic/ic.c | 2 +- util/ego/ic/ic_aux.c | 2 +- util/ego/il/il1_anal.c | 2 +- util/ego/il/il2_aux.c | 2 +- util/ego/il/il3_change.c | 2 +- util/ego/lv/lv.c | 2 +- util/ego/ra/ra_allocl.c | 2 +- util/ego/ra/ra_items.c | 2 +- util/ego/ra/ra_lifet.c | 2 +- util/ego/ra/ra_pack.c | 2 +- util/ego/ra/ra_xform.c | 2 +- util/ego/share/build.lua | 2 +- util/ego/share/get.c | 2 +- util/ego/share/locals.c | 2 +- util/ego/share/parser.c | 2 +- util/ego/share/{aux.c => utils.c} | 2 +- util/ego/share/{aux.h => utils.h} | 0 util/ego/sp/sp.c | 2 +- util/ego/sr/sr.c | 2 +- util/ego/sr/sr_aux.c | 2 +- util/ego/sr/sr_cand.c | 2 +- util/ego/sr/sr_expr.c | 2 +- util/ego/sr/sr_iv.c | 2 +- util/ego/sr/sr_reduce.c | 2 +- util/ego/sr/sr_xform.c | 2 +- util/ego/ud/ud.c | 2 +- util/ego/ud/ud_aux.c | 2 +- util/ego/ud/ud_const.c | 2 +- util/ego/ud/ud_copy.c | 2 +- util/ego/ud/ud_defs.c | 2 +- 43 files changed, 41 insertions(+), 41 deletions(-) rename modules/src/em_opt/{aux.c => utils.c} (100%) rename util/ego/share/{aux.c => utils.c} (99%) rename util/ego/share/{aux.h => utils.h} (100%) diff --git a/modules/src/em_opt/aux.c b/modules/src/em_opt/utils.c similarity index 100% rename from modules/src/em_opt/aux.c rename to modules/src/em_opt/utils.c diff --git a/util/ego/bo/bo.c b/util/ego/bo/bo.c index 0c317a80a..5845477c8 100644 --- a/util/ego/bo/bo.c +++ b/util/ego/bo/bo.c @@ -24,7 +24,7 @@ #include "../share/lset.h" #include "../share/map.h" #include "../share/alloc.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/def.h" #include "../share/go.h" diff --git a/util/ego/cf/cf_loop.c b/util/ego/cf/cf_loop.c index 61184eddc..23e6ce430 100644 --- a/util/ego/cf/cf_loop.c +++ b/util/ego/cf/cf_loop.c @@ -14,7 +14,7 @@ #include "../share/debug.h" #include "../share/lset.h" #include "../share/alloc.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "cf.h" #define MARK_STRONG(b) b->b_flags |= BF_STRONG diff --git a/util/ego/cj/cj.c b/util/ego/cj/cj.c index 015d554c5..946436281 100644 --- a/util/ego/cj/cj.c +++ b/util/ego/cj/cj.c @@ -22,7 +22,7 @@ #include "../share/lset.h" #include "../share/map.h" #include "../share/alloc.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/def.h" #include "../share/stack_chg.h" #include "../share/go.h" diff --git a/util/ego/cs/cs_aux.c b/util/ego/cs/cs_aux.c index aeb582c9b..2e5a882cc 100644 --- a/util/ego/cs/cs_aux.c +++ b/util/ego/cs/cs_aux.c @@ -5,7 +5,7 @@ */ #include "../share/types.h" #include "../share/debug.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/global.h" #include "../share/lset.h" #include "cs.h" diff --git a/util/ego/cs/cs_avail.c b/util/ego/cs/cs_avail.c index b28cc496a..1947051e0 100644 --- a/util/ego/cs/cs_avail.c +++ b/util/ego/cs/cs_avail.c @@ -11,7 +11,7 @@ #include #include "../share/types.h" #include "../share/debug.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/lset.h" #include "../share/global.h" #include "cs.h" diff --git a/util/ego/cs/cs_elim.c b/util/ego/cs/cs_elim.c index b83371416..892a1e777 100644 --- a/util/ego/cs/cs_elim.c +++ b/util/ego/cs/cs_elim.c @@ -8,7 +8,7 @@ #include "../share/types.h" #include "../share/alloc.h" #include "../share/lset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/global.h" #include "../share/debug.h" #include "cs.h" diff --git a/util/ego/cs/cs_getent.c b/util/ego/cs/cs_getent.c index 144750802..91973ee64 100644 --- a/util/ego/cs/cs_getent.c +++ b/util/ego/cs/cs_getent.c @@ -5,7 +5,7 @@ */ #include #include "../share/types.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/debug.h" #include "../share/global.h" #include "cs.h" diff --git a/util/ego/cs/cs_kill.c b/util/ego/cs/cs_kill.c index fc3144397..606cd0dd4 100644 --- a/util/ego/cs/cs_kill.c +++ b/util/ego/cs/cs_kill.c @@ -9,7 +9,7 @@ #include "../share/global.h" #include "../share/lset.h" #include "../share/cset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/map.h" #include "cs.h" #include "cs_aux.h" diff --git a/util/ego/cs/cs_partit.c b/util/ego/cs/cs_partit.c index b020ebcfa..deb5ff8be 100644 --- a/util/ego/cs/cs_partit.c +++ b/util/ego/cs/cs_partit.c @@ -10,7 +10,7 @@ #include #include #include "../share/types.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/debug.h" #include "../share/global.h" #include "cs.h" diff --git a/util/ego/cs/cs_profit.c b/util/ego/cs/cs_profit.c index 801e34319..a3095e56a 100644 --- a/util/ego/cs/cs_profit.c +++ b/util/ego/cs/cs_profit.c @@ -10,7 +10,7 @@ #include "../share/types.h" #include "../share/debug.h" #include "../share/global.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/cset.h" #include "../share/lset.h" #include "cs.h" diff --git a/util/ego/cs/cs_stack.c b/util/ego/cs/cs_stack.c index 670955d1e..bbc4a3335 100644 --- a/util/ego/cs/cs_stack.c +++ b/util/ego/cs/cs_stack.c @@ -9,7 +9,7 @@ #include "../share/types.h" #include "../share/global.h" #include "../share/debug.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "cs.h" #include "cs_aux.h" diff --git a/util/ego/cs/cs_vnm.c b/util/ego/cs/cs_vnm.c index 435dd4658..64c4d35b9 100644 --- a/util/ego/cs/cs_vnm.c +++ b/util/ego/cs/cs_vnm.c @@ -10,7 +10,7 @@ #include "../share/types.h" #include "../share/global.h" #include "../share/debug.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "cs.h" #include "cs_alloc.h" #include "cs_aux.h" diff --git a/util/ego/ic/ic.c b/util/ego/ic/ic.c index b1d356303..e59ad1d96 100644 --- a/util/ego/ic/ic.c +++ b/util/ego/ic/ic.c @@ -27,7 +27,7 @@ #include "../share/global.h" #include "../share/files.h" #include "../share/put.h" -#include "../share/aux.h" +#include "../share/utils.h" /* Global variables */ diff --git a/util/ego/ic/ic_aux.c b/util/ego/ic/ic_aux.c index 957d18323..5cf7e0675 100644 --- a/util/ego/ic/ic_aux.c +++ b/util/ego/ic/ic_aux.c @@ -17,7 +17,7 @@ #include "../share/global.h" #include "../share/debug.h" #include "../share/def.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "ic.h" #include "ic_io.h" #include "ic_lookup.h" diff --git a/util/ego/il/il1_anal.c b/util/ego/il/il1_anal.c index 8f4f41b80..b0ff4a79a 100644 --- a/util/ego/il/il1_anal.c +++ b/util/ego/il/il1_anal.c @@ -17,7 +17,7 @@ #include "../share/alloc.h" #include "../share/global.h" #include "../share/lset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "il1_aux.h" #include "il1_formal.h" #include "il1_cal.h" diff --git a/util/ego/il/il2_aux.c b/util/ego/il/il2_aux.c index 14bf6d80d..33a98ec42 100644 --- a/util/ego/il/il2_aux.c +++ b/util/ego/il/il2_aux.c @@ -21,7 +21,7 @@ #include "il_aux.h" #include "il2_aux.h" #include "../share/get.h" -#include "../share/aux.h" +#include "../share/utils.h" #define USE_INDIR(p) (p->p_use->u_flags & UF_INDIR) diff --git a/util/ego/il/il3_change.c b/util/ego/il/il3_change.c index 4528e8502..b783375c1 100644 --- a/util/ego/il/il3_change.c +++ b/util/ego/il/il3_change.c @@ -22,7 +22,7 @@ #include "../share/global.h" #include "../share/def.h" #include "../share/lset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/get.h" #include "../share/put.h" #include "il_aux.h" diff --git a/util/ego/lv/lv.c b/util/ego/lv/lv.c index 116df01c4..375fd8f55 100644 --- a/util/ego/lv/lv.c +++ b/util/ego/lv/lv.c @@ -25,7 +25,7 @@ #include "../share/map.h" #include "../share/get.h" #include "../share/put.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/init_glob.h" #include "../share/locals.h" #include "../share/go.h" diff --git a/util/ego/ra/ra_allocl.c b/util/ego/ra/ra_allocl.c index 7f25e7262..e2ca7d657 100644 --- a/util/ego/ra/ra_allocl.c +++ b/util/ego/ra/ra_allocl.c @@ -18,7 +18,7 @@ #include "../share/global.h" #include "../share/lset.h" #include "../share/cset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/alloc.h" #include "../share/map.h" #include "ra.h" diff --git a/util/ego/ra/ra_items.c b/util/ego/ra/ra_items.c index a7411befb..49d1d847b 100644 --- a/util/ego/ra/ra_items.c +++ b/util/ego/ra/ra_items.c @@ -17,7 +17,7 @@ #include "../share/def.h" #include "../share/global.h" #include "../share/lset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/alloc.h" #include "ra.h" #include "ra_aux.h" diff --git a/util/ego/ra/ra_lifet.c b/util/ego/ra/ra_lifet.c index 7162962ef..5ea15826f 100644 --- a/util/ego/ra/ra_lifet.c +++ b/util/ego/ra/ra_lifet.c @@ -19,7 +19,7 @@ #include "../share/def.h" #include "../share/global.h" #include "../share/lset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/alloc.h" #include "ra.h" #include "ra_aux.h" diff --git a/util/ego/ra/ra_pack.c b/util/ego/ra/ra_pack.c index 373191b90..92d005297 100644 --- a/util/ego/ra/ra_pack.c +++ b/util/ego/ra/ra_pack.c @@ -17,7 +17,7 @@ #include "../share/lset.h" #include "../share/cset.h" #include "../share/alloc.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "ra.h" #include "ra_aux.h" #include "ra_interv.h" diff --git a/util/ego/ra/ra_xform.c b/util/ego/ra/ra_xform.c index fea3e0757..119803706 100644 --- a/util/ego/ra/ra_xform.c +++ b/util/ego/ra/ra_xform.c @@ -19,7 +19,7 @@ #include "../share/def.h" #include "../share/global.h" #include "../share/lset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/alloc.h" #include "ra.h" #include "ra_interv.h" diff --git a/util/ego/share/build.lua b/util/ego/share/build.lua index 5ca714897..586cce928 100644 --- a/util/ego/share/build.lua +++ b/util/ego/share/build.lua @@ -36,7 +36,7 @@ clibrary { "./files.c", "./go.c", "./map.c", - "./aux.c", + "./utils.c", "./get.c", "./put.c", "./alloc.c", diff --git a/util/ego/share/get.c b/util/ego/share/get.c index a433b0946..d804d63c6 100644 --- a/util/ego/share/get.c +++ b/util/ego/share/get.c @@ -22,7 +22,7 @@ #include "get.h" #include "alloc.h" #include "map.h" -#include "aux.h" +#include "utils.h" FILE *curinp; block_id lastbid; /* block identifying number */ diff --git a/util/ego/share/locals.c b/util/ego/share/locals.c index 7cca77660..1b94406a5 100644 --- a/util/ego/share/locals.c +++ b/util/ego/share/locals.c @@ -20,7 +20,7 @@ #include "cset.h" #include "def.h" #include "get.h" -#include "aux.h" +#include "utils.h" #include "alloc.h" #include "locals.h" diff --git a/util/ego/share/parser.c b/util/ego/share/parser.c index 19ede3d1b..5488e3670 100644 --- a/util/ego/share/parser.c +++ b/util/ego/share/parser.c @@ -12,7 +12,7 @@ #include "alloc.h" #include "global.h" #include "lset.h" -#include "aux.h" +#include "utils.h" struct class { byte src_class; diff --git a/util/ego/share/aux.c b/util/ego/share/utils.c similarity index 99% rename from util/ego/share/aux.c rename to util/ego/share/utils.c index 589a72288..9799de32e 100644 --- a/util/ego/share/aux.c +++ b/util/ego/share/utils.c @@ -15,7 +15,7 @@ #include "debug.h" #include "global.h" #include "alloc.h" -#include "aux.h" +#include "utils.h" #include "map.h" #include "lset.h" diff --git a/util/ego/share/aux.h b/util/ego/share/utils.h similarity index 100% rename from util/ego/share/aux.h rename to util/ego/share/utils.h diff --git a/util/ego/sp/sp.c b/util/ego/sp/sp.c index 0ba323a10..e4a47f45c 100644 --- a/util/ego/sp/sp.c +++ b/util/ego/sp/sp.c @@ -23,7 +23,7 @@ #include "../share/lset.h" #include "../share/map.h" #include "../share/alloc.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/go.h" #include "../share/stack_chg.h" diff --git a/util/ego/sr/sr.c b/util/ego/sr/sr.c index bdfedef01..9bbed7bd7 100644 --- a/util/ego/sr/sr.c +++ b/util/ego/sr/sr.c @@ -20,7 +20,7 @@ #include "../share/map.h" #include "../share/alloc.h" #include "../share/go.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "sr_aux.h" #include "sr_iv.h" diff --git a/util/ego/sr/sr_aux.c b/util/ego/sr/sr_aux.c index 2235d824e..2e6d9c7f4 100644 --- a/util/ego/sr/sr_aux.c +++ b/util/ego/sr/sr_aux.c @@ -17,7 +17,7 @@ #include "../share/debug.h" #include "../share/global.h" #include "../share/lset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "sr_aux.h" #include "sr_xform.h" diff --git a/util/ego/sr/sr_cand.c b/util/ego/sr/sr_cand.c index 45babca7e..6c286d8ed 100644 --- a/util/ego/sr/sr_cand.c +++ b/util/ego/sr/sr_cand.c @@ -17,7 +17,7 @@ #include "../share/debug.h" #include "../share/global.h" #include "../share/map.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "sr.h" #include "sr_aux.h" #include "sr_cand.h" diff --git a/util/ego/sr/sr_expr.c b/util/ego/sr/sr_expr.c index 8c6b955ec..110d934d9 100644 --- a/util/ego/sr/sr_expr.c +++ b/util/ego/sr/sr_expr.c @@ -16,7 +16,7 @@ #include "sr.h" #include "../share/debug.h" #include "../share/global.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "sr_aux.h" #include "../share/lset.h" #include "sr_iv.h" diff --git a/util/ego/sr/sr_iv.c b/util/ego/sr/sr_iv.c index 43e4b89c1..aa96e23c5 100644 --- a/util/ego/sr/sr_iv.c +++ b/util/ego/sr/sr_iv.c @@ -19,7 +19,7 @@ #include "../share/debug.h" #include "../share/global.h" #include "../share/alloc.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "sr_aux.h" #include "sr_cand.h" #include "sr_iv.h" diff --git a/util/ego/sr/sr_reduce.c b/util/ego/sr/sr_reduce.c index d5ae81bb0..e8b347f96 100644 --- a/util/ego/sr/sr_reduce.c +++ b/util/ego/sr/sr_reduce.c @@ -22,7 +22,7 @@ #include "../share/alloc.h" #include "../share/def.h" #include "../share/global.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "sr_aux.h" #include "../share/lset.h" #include "sr_xform.h" diff --git a/util/ego/sr/sr_xform.c b/util/ego/sr/sr_xform.c index 7adc32121..aa30b2cfa 100644 --- a/util/ego/sr/sr_xform.c +++ b/util/ego/sr/sr_xform.c @@ -24,7 +24,7 @@ #include "../share/get.h" #include "sr_aux.h" #include "../share/lset.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "sr_xform.h" /* Transformations on EM texts */ diff --git a/util/ego/ud/ud.c b/util/ego/ud/ud.c index 6afcd5c2b..3a5e3d7a8 100644 --- a/util/ego/ud/ud.c +++ b/util/ego/ud/ud.c @@ -21,7 +21,7 @@ #include "../share/get.h" #include "../share/put.h" #include "../share/alloc.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/init_glob.h" #include "../share/locals.h" #include "../share/go.h" diff --git a/util/ego/ud/ud_aux.c b/util/ego/ud/ud_aux.c index 32c75068a..e027f4e10 100644 --- a/util/ego/ud/ud_aux.c +++ b/util/ego/ud/ud_aux.c @@ -21,7 +21,7 @@ #include "../share/cset.h" #include "../share/def.h" #include "../share/locals.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "ud_defs.h" repl_line(old,new,b) diff --git a/util/ego/ud/ud_const.c b/util/ego/ud/ud_const.c index d1a2a438f..cc5b33159 100644 --- a/util/ego/ud/ud_const.c +++ b/util/ego/ud/ud_const.c @@ -16,7 +16,7 @@ #include "../share/lset.h" #include "../share/cset.h" #include "../share/def.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/locals.h" #include "ud_defs.h" #include "ud_const.h" diff --git a/util/ego/ud/ud_copy.c b/util/ego/ud/ud_copy.c index 213f7252a..096b228ab 100644 --- a/util/ego/ud/ud_copy.c +++ b/util/ego/ud/ud_copy.c @@ -16,7 +16,7 @@ #include "../share/lset.h" #include "../share/cset.h" #include "../share/def.h" -#include "../share/aux.h" +#include "../share/utils.h" #include "../share/locals.h" #include "../ud/ud_defs.h" #include "ud_copy.h" diff --git a/util/ego/ud/ud_defs.c b/util/ego/ud/ud_defs.c index 875d01425..04839476d 100644 --- a/util/ego/ud/ud_defs.c +++ b/util/ego/ud/ud_defs.c @@ -20,7 +20,7 @@ #include "../share/locals.h" #include "ud_defs.h" #include "../share/alloc.h" -#include "../share/aux.h" +#include "../share/utils.h" short nrdefs; /* total number of definitions */ short nrexpldefs; /* number of explicit definitions */ From 27b831259871aad982577139da542fd13b29fade Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 9 Feb 2019 00:07:33 +0100 Subject: [PATCH 2/9] Add experimental appveyor file. --- .appveyor.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 000000000..b638e9e02 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,8 @@ +environment: + matrix: + - TARGET: cygwin-gcc + BUILD_ENVIRONMENT: cygwin + +build_script: + - sh: make + From 369e3300ac3f0df1ad0acdd9ccb847dfb9c9d7db Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 9 Feb 2019 12:04:42 +0100 Subject: [PATCH 3/9] Another try at an AppVeyor build script. --- .appveyor.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b638e9e02..e43772fd1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,17 @@ environment: matrix: - - TARGET: cygwin-gcc - BUILD_ENVIRONMENT: cygwin + - CYG_BASH: C:\cygwin64\bin\bash + CC: gcc + +clone_depth: 1 + +init: + - git config --global core.autocrlf input + +install: + - '%CYG_BASH% -lc "cygcheck -dc cygwin"' build_script: - - sh: make + - 'echo building...' + - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sat, 9 Feb 2019 12:17:57 +0100 Subject: [PATCH 4/9] Try to install cygwin packages. --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index e43772fd1..2f406830e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,6 @@ environment: matrix: - - CYG_BASH: C:\cygwin64\bin\bash - CC: gcc + - CYGWIN: C:\cygwin64 clone_depth: 1 @@ -9,9 +8,10 @@ init: - git config --global core.autocrlf input install: - - '%CYG_BASH% -lc "cygcheck -dc cygwin"' + - '%CYGWIN%\bin\bash -lc "cygcheck -dc cygwin"' + - '%CYGWIN%\bin\setup-x86_64 -q -P bison,flex,ninja' build_script: - 'echo building...' - - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sat, 9 Feb 2019 12:23:42 +0100 Subject: [PATCH 5/9] Maybe the setup script is somewhere else? --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2f406830e..6ab97754d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,7 +9,7 @@ init: install: - '%CYGWIN%\bin\bash -lc "cygcheck -dc cygwin"' - - '%CYGWIN%\bin\setup-x86_64 -q -P bison,flex,ninja' + - '%CYGWIN%\setup-x86_64 -q -P bison,flex,ninja' build_script: - 'echo building...' From f9a3baeaf764a9832a6e9569e8c9e44b2b8071de Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 9 Feb 2019 12:25:27 +0100 Subject: [PATCH 6/9] Ugh, typo fix. --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6ab97754d..6965cf0da 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,5 +13,5 @@ install: build_script: - 'echo building...' - - '%CYG_BASH%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sat, 9 Feb 2019 13:30:29 +0100 Subject: [PATCH 7/9] Remove stray z80ex reference. --- plat/cpm/emu/globals.h | 1 - 1 file changed, 1 deletion(-) diff --git a/plat/cpm/emu/globals.h b/plat/cpm/emu/globals.h index b07a4d07d..613b49061 100644 --- a/plat/cpm/emu/globals.h +++ b/plat/cpm/emu/globals.h @@ -2,7 +2,6 @@ #define GLOBALS_H #include -#include extern Z80EX_CONTEXT* z80; extern uint8_t ram[0x10000]; From bcc9c16bf75ffc4723306813c499f10d5684ec6f Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 9 Feb 2019 13:42:09 +0100 Subject: [PATCH 8/9] More z80ex removal. --- plat/cpm/emu/emulator.c | 2 +- plat/cpm/emu/globals.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/plat/cpm/emu/emulator.c b/plat/cpm/emu/emulator.c index eb192dbf8..09d58e18b 100644 --- a/plat/cpm/emu/emulator.c +++ b/plat/cpm/emu/emulator.c @@ -77,7 +77,7 @@ static void cmd_register(void) if (w1 && w2) { - Z80_REG_T reg = -1; + int reg = -1; if (strcmp(w1, "sp") == 0) reg = SP; else if (strcmp(w1, "pc") == 0) diff --git a/plat/cpm/emu/globals.h b/plat/cpm/emu/globals.h index 613b49061..6979f31aa 100644 --- a/plat/cpm/emu/globals.h +++ b/plat/cpm/emu/globals.h @@ -3,7 +3,6 @@ #include -extern Z80EX_CONTEXT* z80; extern uint8_t ram[0x10000]; extern void emulator_init(void); From 39eb8a85f5ae8931152ed0a16feef6f0347e2dbd Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 9 Feb 2019 13:59:37 +0100 Subject: [PATCH 9/9] Don't run the tests in Appveyor. --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6965cf0da..8431da37d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,5 +13,5 @@ install: build_script: - 'echo building...' - - '%CYGWIN%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0