From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001 From: Louis Gesbert Date: Thu, 2 Mar 2017 12:19:56 +0100 Subject: [PATCH] Install mli, cmx, etc. --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 09464ff..5044d7f 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%: @for i in _build/cudf/cudf.*; do \ if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.% if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.% if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.% if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.% if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.% if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.% if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ + rm -f $(DOSELIBS)/*.mlpack ; \ fi ; \ done @@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.% if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ; \ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \ + rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \ fi ; \ done @@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.% if [ -e $$i ]; then \ cp $$i $(DOSELIBS) ;\ rm $$i ;\ - rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\ + rm -f $(DOSELIBS)/*.mlpack ;\ fi ; \ done @@ -223,7 +223,7 @@ INSTALL_STUFF_ = META INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi) INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs) INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a) -#INSTALL_STUFF_ += $(wildcard _build/*/*.mli) +INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx) INSTALL_STUFF_ += $(wildcard _build/rpm/*.so) exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*) -- 2.11.0 -listbox-height): …this, and adjust caller. * gnu/installer/timezone.scm (locate-childrens): Rename to… (locate-children): …this. Adjust all callers. Tobias Geerinckx-Rice 2019-01-17gnu: Add graphical installer support....* configure.ac: Require that guile-newt is available. * gnu/installer.scm: New file. * gnu/installer/aux-files/logo.txt: New file. * gnu/installer/build-installer.scm: New file. * gnu/installer/connman.scm: New file. * gnu/installer/keymap.scm: New file. * gnu/installer/locale.scm: New file. * gnu/installer/newt.scm: New file. * gnu/installer/newt/ethernet.scm: New file. * gnu/installer/newt/hostname.scm: New file. * gnu/installer/newt/keymap.scm: New file. * gnu/installer/newt/locale.scm: New file. * gnu/installer/newt/menu.scm: New file. * gnu/installer/newt/network.scm: New file. * gnu/installer/newt/page.scm: New file. * gnu/installer/newt/timezone.scm: New file. * gnu/installer/newt/user.scm: New file. * gnu/installer/newt/utils.scm: New file. * gnu/installer/newt/welcome.scm: New file. * gnu/installer/newt/wifi.scm: New file. * gnu/installer/steps.scm: New file. * gnu/installer/timezone.scm: New file. * gnu/installer/utils.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add previous files. * gnu/system.scm: Export %root-account. * gnu/system/install.scm (%installation-services): Use kmscon instead of linux VT for all tty. (installation-os)[users]: Add the graphical installer as shell of the root account. [packages]: Add font related packages. * po/guix/POTFILES.in: Add installer files. Mathieu Othacehe