Overview
Comment: | Improved built-in build but still not fully operational on Ubuntu |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.66-ubuntu |
Files: | files | file ages | folders |
SHA1: |
73dfd99fe60a44fc519d78117e3bfb07 |
User & Date: | matt on 2020-05-21 23:49:59 |
Other Links: | branch diff | manifest | tags |
Context
2020-05-22
| ||
11:11 | Added couple touches to fix timestamps check-in: 6118471b33 user: mrwellan tags: v1.66-ubuntu | |
2020-05-21
| ||
23:49 | Improved built-in build but still not fully operational on Ubuntu check-in: 73dfd99fe6 user: matt tags: v1.66-ubuntu | |
23:02 | blah check-in: 2f7d94848b user: matt tags: v1.66-ubuntu | |
Changes
Modified Makefile from [b65d870ff9] to [045c2a18ac].
︙ | ︙ | |||
59 60 61 62 63 64 65 | DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}') ifeq ($(MTESTHASH),) $(error MTESTHASH is broken!) endif | > | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}') ifeq ($(MTESTHASH),) $(error MTESTHASH is broken!) endif # Get ARCHSTR from the configure step # ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi) PNGFILES = $(shell cd docs/manual;ls *png) all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest |
︙ | ︙ |
Modified chicken.makefile from [f807f746f2] to [029813cd5a].
︙ | ︙ | |||
71 72 73 74 75 76 77 | tgz-$(USER)/opensrc.fossil : cd tgz-$(USER); fossil clone http://www.kiatoa.com/fossils/opensrc opensrc.fossil mkdir tgz-$(USER)/opensrc cd tgz-$(USER)/opensrc; fossil open --nested ../opensrc.fossil; fossil up; fossil uv sync $(CHICKEN_PREFIX)/lib/libiupweb.so : tgz-$(USER)/opensrc.fossil | | | | | | | | > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | tgz-$(USER)/opensrc.fossil : cd tgz-$(USER); fossil clone http://www.kiatoa.com/fossils/opensrc opensrc.fossil mkdir tgz-$(USER)/opensrc cd tgz-$(USER)/opensrc; fossil open --nested ../opensrc.fossil; fossil up; fossil uv sync $(CHICKEN_PREFIX)/lib/libiupweb.so : tgz-$(USER)/opensrc.fossil cd tgz-$(USER)/opensrc; fossil unversioned cat libs/cd/cd-$(CDVER)_Linux$(IUPARCH)_64_lib.tar.gz > ../cd.tgz cd tgz-$(USER)/opensrc; fossil unversioned cat libs/im/im-$(IMVER)_Linux$(IUPARCH)_64_lib.tar.gz > ../im.tgz cd tgz-$(USER)/opensrc; fossil unversioned cat libs/iup/iup-$(IUPVER)_Linux$(IUPARCH)_64_lib.tar.gz > ../iup.tgz cd tgz-$(USER); tar -xzf cd.tgz; cd tgz-$(USER); tar -xzf im.tgz; cd tgz-$(USER); tar -xzf iup.tgz; rsync -av tgz-$(USER)/include/ $(CHICKEN_PREFIX)/include/ rsync -av tgz-$(USER)/*.so $(CHICKEN_PREFIX)/lib/ rsync -av tgz-$(USER)/*.a $(CHICKEN_PREFIX)/lib/ rsync -av tgz-$(USER)/ftgl/lib/*/* $(CHICKEN_PREFIX)/lib/ if [[ -e $(CHICKEN_PREFIX)/lib/libiupweb.so ]];then touch $(CHICKEN_PREFIX)/lib/libiupweb.so;fi EGGS=srfi-69 srfi-42 sqlite3 iup canvas-draw typed-records md5 regex-case base64 \ format dot-locking csv-xml z3 udp hostinfo directory-utils stack dbi crypt sha1 \ posix-extras pathname-expand csv call-with-environment-variables s11n spiffy \ uri-common intarweb http-client spiffy-request-vars spiffy-directory-listing \ ansi-escape-sequences test slice rfc3339 uuid-lib filepath srfi-19 sparse-vectors \ sql-de-lite fmt readline apropos json simple-exceptions rpc trace logpro refdb postgresql nanomsg |
︙ | ︙ | |||
139 140 141 142 143 144 145 | postgresql.done : $(POSTGRES_DEPS) CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install postgresql > postgresql.done nanomsg.done : $(CHICKEN_PREFIX)/lib/libnanomsg.so CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install nanomsg > nanomsg.done iup.done : $(CHICKEN_PREFIX)/lib/libcallback.a $(CHICKEN_PREFIX)/lib/libiupweb.so | | > | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | postgresql.done : $(POSTGRES_DEPS) CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install postgresql > postgresql.done nanomsg.done : $(CHICKEN_PREFIX)/lib/libnanomsg.so CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install nanomsg > nanomsg.done iup.done : $(CHICKEN_PREFIX)/lib/libcallback.a $(CHICKEN_PREFIX)/lib/libiupweb.so CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install -D no-library-checks -feature disable-iup-web -feature disable-iup-pplot -feature disable-iup-matrixex iup$(IUPEGGVER) > iup.done canvas-draw.done : CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install -D no-library-checks canvas-draw > canvas-draw.done sqlite3.done : $(SQLITE3_DEPS) CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install sqlite3 > sqlite3.done sql-de-lite.done : CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install sql-de-lite > sql-de-lite.done dbi.done : postgresql.done sqlite3.done sql-de-lite.done CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install dbi > dbi.done logpro.done : typed-records.done %.done : $(CHICKEN_PREFIX)/bin/chicken-install $* > $*.done build-$(USER)/eggs-installed/%.done : $(CHICKEN_PREFIX)/bin/csi $(EGGS) $(CHICKEN_PREFIX)/bin/chicken-install $* > build-$(USER)/eggs-installed/$*.done build-clean : rm -rf build-$(USER) bin |
Modified configure from [cebf8d25b4] to [092502597b].
︙ | ︙ | |||
20 21 22 23 24 25 26 27 28 29 30 31 32 33 | # Configure the build if [[ "$1"x == "x" ]];then PREFIX=$PWD else PREFIX=$1 fi #====================================================================== # Required software checks #====================================================================== if [[ ! $(type fossil) ]];then echo "Please install fossil from http://fossil-scm.org" | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | # Configure the build if [[ "$1"x == "x" ]];then PREFIX=$PWD else PREFIX=$1 fi if [[ -e /usr/bin/sw_vers ]]; then ARCHSTR=$(/usr/bin/sw_vers -productVersion) else ARCHSTR=$(lsb_release -sr) fi #====================================================================== # Arch dependent stuff #====================================================================== # IUP Arch key case $ARCHSTR in 18.04) IUPARCH=415 CDVER=5.12 IMVER=3.13 IUPVER=3.28 IUPEGGVER=":1.9.0" ;; dunno) IUPARCH=44 CDVER=5.12 IMVER=3.13 IUPVER=3.28 ;; *) IUPARCH=26g4 CDVER=5.10 IMVER=3.11 IUPVER=3.19.1 IUPEGGVER= ;; esac #====================================================================== # Required software checks #====================================================================== if [[ ! $(type fossil) ]];then echo "Please install fossil from http://fossil-scm.org" |
︙ | ︙ | |||
71 72 73 74 75 76 77 | echo "" > makefile.inc #====================================================================== # Do we need Chicken? #====================================================================== | < < < < < < > > > > > > | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | echo "" > makefile.inc #====================================================================== # Do we need Chicken? #====================================================================== CHICKEN_PREFIX=$PREFIX/bin/.$ARCHSTR echo "CHICKEN_PREFIX=$CHICKEN_PREFIX" >> makefile.inc echo "ARCHSTR=$ARCHSTR" >> makefile.inc echo "IUPARCH=$IUPARCH" >> makefile.inc echo "CDVER=$CDVER" >> makefile.inc echo "IMVER=$IMVER" >> makefile.inc echo "IUPVER=$IUPVER" >> makefile.inc echo "IUPEGGVER=$IUPEGGVER" >> makefile.inc if [[ ! $(type csi) ]];then echo "Chicken build needed." echo "BUILD_CHICKEN=yes" >> makefile.inc configure_dependencies echo "include chicken.makefile" >> makefile.inc else |
︙ | ︙ |