Overview
| Comment: | Switched to lsb_release -sr for os info |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.55 |
| Files: | files | file ages | folders |
| SHA1: |
20c0888a1536218bb85449a9e3481395 |
| User & Date: | mrwellan on 2014-03-24 15:56:11 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-03-24
| ||
| 20:58 | Partial but broken update to arch dep install check-in: db5773a8d7 user: mrwellan tags: v1.55 | |
| 15:56 | Switched to lsb_release -sr for os info check-in: 20c0888a15 user: mrwellan tags: v1.55 | |
|
2014-03-23
| ||
| 15:41 | Switched to loadrunner (merged Makefile changes from v1.60) check-in: d09be0b985 user: matt tags: v1.55 | |
Changes
Modified Makefile from [6c3f946b32] to [87983b3119].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 |
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)
| > > > | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
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 lsb_release -sr)
# ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
all : mtest dboard newdboard txtdb
refdb : txtdb/txtdb.scm
csc -I txtdb txtdb/txtdb.scm -o refdb
mtest: $(OFILES) megatest.o
|
| ︙ | ︙ |
Modified utils/mk_wrapper from [6105d8eb8f] to [b9f245986d].
1 2 3 4 5 6 7 8 9 10 11 12 13 | #!/bin/bash prefix=$1 cmd=$2 echo "#!/bin/bash" if [ "$LD_LIBRARY_PATH" != "" ];then echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2 echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" else echo "INFO: LD_LIBRARY_PATH not set" >&2 fi | < < | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | #!/bin/bash prefix=$1 cmd=$2 echo "#!/bin/bash" if [ "$LD_LIBRARY_PATH" != "" ];then echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2 echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" else echo "INFO: LD_LIBRARY_PATH not set" >&2 fi echo "exec $prefix/bin/.\$(lsb_release -sr)/$cmd \"\$@\"" |