Overview
Comment: | Merged in change from v1.64 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.65 |
Files: | files | file ages | folders |
SHA1: |
8e8dd3185e704f0b699e8712e1d4e1b4 |
User & Date: | matt on 2018-04-09 03:01:36 |
Other Links: | branch diff | manifest | tags |
Context
2018-04-11
| ||
22:53 | Merged v1.65 7a74 into v1.66 check-in: 0251c2384e user: matt tags: v1.65 | |
2018-04-09
| ||
03:01 | Merged in change from v1.64 check-in: 8e8dd3185e user: matt tags: v1.65 | |
03:00 | Recreating branch v1.65 with cleaned up license notices etc. check-in: 087b1eac2a user: matt tags: v1.65, VERIFIED-PASS | |
2018-03-29
| ||
16:43 | error check MTESTHASH check-in: cb3bbc9d2e user: bjbarcla tags: v1.64 | |
Changes
Modified Makefile from [786bb282c9] to [a6afa6c20b].
︙ | ︙ | |||
49 50 51 52 53 54 55 56 57 58 59 60 61 62 | mkdir -p mofiles csc $(CSCOPTS) -J -c $< -o mofiles/$*.o ADTLSCR=mt_laststep mt_runstep mt_ezstep HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR)) DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}') CSIPATH=$(shell which csi) CKPATH=$(shell dirname $(shell dirname $(CSIPATH))) # ARCHSTR=$(shell uname -m)_$(shell uname -r) # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE") # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr) ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi) | > > > > > > > | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | mkdir -p mofiles csc $(CSCOPTS) -J -c $< -o mofiles/$*.o ADTLSCR=mt_laststep mt_runstep mt_ezstep HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR)) DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}') ifeq ($(MTESTHASH),) $(error MTESTHASH is broken!) endif showmtesthash: @echo $(MTESTHASH) CSIPATH=$(shell which csi) CKPATH=$(shell dirname $(shell dirname $(CSIPATH))) # ARCHSTR=$(shell uname -m)_$(shell uname -r) # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE") # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr) ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi) |
︙ | ︙ |