Update Makefile

Remove all idris2sh so that travis and the bootstrap scripts look in the
right place
This commit is contained in:
Edwin Brady 2020-05-20 14:17:06 +01:00
parent 32263883ee
commit 451ed0f213
3 changed files with 11 additions and 11 deletions

4
.gitignore vendored
View File

@ -25,7 +25,7 @@
/bootstrap/bin/
/bootstrap/lib/
/bootstrap/idris2-0*/
/bootstrap/idris2sh_app/idris2-boot.*
/bootstrap/idris2sh_app/libidris2_support.*
/bootstrap/idris2_app/idris2-boot.*
/bootstrap/idris2_app/libidris2_support.*
/bootstrap/idris2boot
/bootstrap/idris2boot.rkt

View File

@ -21,7 +21,7 @@ Racket. This will be addressed soon!]
-----------------
* Change the `PREFIX` in `config.mk`. The default is to install in
`$HOME/.idris2sh`
`$HOME/.idris2`
If you have an existing Idris 2, go to step 1b. Otherwise, read on...
@ -73,7 +73,7 @@ If you have an earlier version of this Idris 2 installer
-------------------------------
As a final step, you can rebuild from the newly installed Idris 2 to verify
that everything has worked correctly. Assuming that `idris2sh` is in your
that everything has worked correctly. Assuming that `idris2` is in your
`PATH`.
* `make clean` -- to make sure you're building everything with the new version

View File

@ -115,18 +115,18 @@ install-libs: libs
.PHONY: bootstrap bootstrap-racket bootstrap-clean
bootstrap: support
cp support/c/${IDRIS2_SUPPORT} bootstrap/idris2sh_app
sed s/libidris2_support.so/${IDRIS2_SUPPORT}/g bootstrap/idris2sh_app/idris2sh.ss > bootstrap/idris2sh_app/idris2-boot.ss
cp support/c/${IDRIS2_SUPPORT} bootstrap/idris2_app
sed s/libidris2_support.so/${IDRIS2_SUPPORT}/g bootstrap/idris2_app/idris2.ss > bootstrap/idris2_app/idris2-boot.ss
ifeq ($(OS), darwin)
sed -i '' 's|__PREFIX__|${CURDIR}/bootstrap|g' bootstrap/idris2sh_app/idris2-boot.ss
sed -i '' 's|__PREFIX__|${CURDIR}/bootstrap|g' bootstrap/idris2_app/idris2-boot.ss
else
sed -i 's|__PREFIX__|${CURDIR}/bootstrap|g' bootstrap/idris2sh_app/idris2-boot.ss
sed -i 's|__PREFIX__|${CURDIR}/bootstrap|g' bootstrap/idris2_app/idris2-boot.ss
endif
sh ./bootstrap.sh
bootstrap-racket: support
cp support/c/${IDRIS2_SUPPORT} bootstrap/idris2sh_app
cp bootstrap/idris2sh.rkt bootstrap/idris2boot.rkt
cp support/c/${IDRIS2_SUPPORT} bootstrap/idris2_app
cp bootstrap/idris2.rkt bootstrap/idris2boot.rkt
ifeq ($(OS), darwin)
sed -i '' 's|__PREFIX__|${CURDIR}/bootstrap|g' bootstrap/idris2boot.rkt
else
@ -136,7 +136,7 @@ endif
bootstrap-clean:
$(RM) -r bootstrap/bin bootstrap/lib bootstrap/idris2-${IDRIS2_VERSION}
$(RM) bootstrap/idris2boot* bootstrap/idris2sh_app/idris2-boot.* bootstrap/idris2sh_app/${IDRIS2_SUPPORT}
$(RM) bootstrap/idris2boot* bootstrap/idris2_app/idris2-boot.* bootstrap/idris2_app/${IDRIS2_SUPPORT}
.PHONY: distclean