andrius
/
mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: Use `guix shell' instead of `guix environment'. 

* HACKING (SETUP): Use `guix shell' instead of `guix environment'.
* INSTALL (Guix): Likewise.
* PORTING (Setup environment): Likewise.
* doc/mes.texi (Building from Git): Likewise.
* simple.sh: Likewise.
* guix.scm: Likewise.  Add time-machine with working commit.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2022-04-30 09:44:57 +02:00
parent f71e333d61
commit 796dc2dc39
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HACKING
View File

@ -2,7 +2,7 @@
#+TITLE: Hacking GNU Mes #+TITLE: Hacking GNU Mes
* SETUP * SETUP
guix environment -l guix.scm #64 bit + 32bit guix shell #64 bit + 32bit
CC=i686-unknown-linux-gnu-gcc ./configure CC=i686-unknown-linux-gnu-gcc ./configure
CC=arm-unknown-linux-gnu-gcc ./configure CC=arm-unknown-linux-gnu-gcc ./configure
@ -201,7 +201,7 @@ https://notabug.org/rain1/hex86/src/master/tests/hex0b3.hex86
** linux syscalls: https://fedora.juszkiewicz.com.pl/syscalls.html ** linux syscalls: https://fedora.juszkiewicz.com.pl/syscalls.html
* legalese * legalese
Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> Copyright © 2016,2017,2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
Copying and distribution of this file, with or without modification, Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright are permitted in any medium without royalty provided the copyright

8
INSTALL
View File

@ -1,7 +1,7 @@
-*- org -*- -*- org -*-
#+TITLE: Building and Installing GNU Mes #+TITLE: Building and Installing GNU Mes
Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> Copyright © 2016,2017,2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
Copying and distribution of this file, with or without modification, Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright are permitted in any medium without royalty provided the copyright
@ -20,9 +20,9 @@ similar way.
** Prerequisites ** Prerequisites
*** Guix *** Guix
#+BEGIN_SRC bash #+BEGIN_SRC bash
guix environment -l guix.scm #64 bit + 32bit guix shell #64 bit + 32bit
guix environment --system=i686-linux -l guix.scm #32 bit only guix shell --system=i686-linux #32 bit only
guix environment --system=armhf-linux -l guix.scm #32 bit only guix shell --system=armhf-linux #32 bit only
#+END_SRC #+END_SRC
*** Other GNU/Linux *** Other GNU/Linux

4
PORTING
View File

@ -22,7 +22,7 @@ to your config.scm and run guix system reconfigure.
For example (note: ARM is no longer a 'port', see HACKING) For example (note: ARM is no longer a 'port', see HACKING)
#+BEGIN_SRC bash #+BEGIN_SRC bash
guix environment --system=armhf-linux --pure --ad-hoc bash coreutils diffutils findutils gawk gcc-toolchain@7 grep git guile@2.2 gzip help2man make mescc-tools nyacc openssh-sans-x pkg-config sed tar texinfo guix shell --system=armhf-linux --pure bash coreutils diffutils findutils gawk gcc-toolchain@7 grep git guile@2.2 gzip help2man make mescc-tools nyacc openssh-sans-x pkg-config sed tar texinfo
#+END_SRC #+END_SRC
** Try it ** Try it
@ -75,7 +75,7 @@ a Reduced Binary seed, thus significantly reducing the Trusted Computing
Base (TCB), strategic decisions about the build process can start. Base (TCB), strategic decisions about the build process can start.
* Legalese * Legalese
Copyright © 2019 Jan (janneke) Nieuwenhuizen <[[mailto:janneke@gnu.org][janneke@gnu.org]]> Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <[[mailto:janneke@gnu.org][janneke@gnu.org]]>
Copying and distribution of this file, with or without modification, Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright are permitted in any medium without royalty provided the copyright

4
doc/mes.texi
View File

@ -13,7 +13,7 @@
@set OPENPGP-SIGNING-KEY-ID 1A858392E331EAFDB8C27FFBF3C1A0D9C1D65273 @set OPENPGP-SIGNING-KEY-ID 1A858392E331EAFDB8C27FFBF3C1A0D9C1D65273
@copying @copying
Copyright @copyright{} 2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen@* Copyright @copyright{} 2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen@*
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or under the terms of the GNU Free Documentation License, Version 1.3 or
@ -1034,7 +1034,7 @@ all the dependencies and appropriate environment variables are set up to
hack on Mes: hack on Mes:
@example @example
guix environment -l .guix.scm guix shell
@end example @end example
Finally, you have to invoke @code{make check} to run tests Finally, you have to invoke @code{make check} to run tests

4
guix.scm
View File

@ -1,7 +1,7 @@
;;; guix.scm -- Guix package definition ;;; guix.scm -- Guix package definition
;;; GNU Mes --- Maxwell Equations of Software ;;; GNU Mes --- Maxwell Equations of Software
;;; Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Mes. ;;; This file is part of GNU Mes.
;;; ;;;
@ -30,7 +30,7 @@
;; ;;
;; To use as the basis for a development environment, run: ;; To use as the basis for a development environment, run:
;; ;;
;; guix environment -l guix.scm ;; guix time-machine --commit=ffb616b69dced25b840f2e5178062072d89623eb -- shell
;; ;;
;;; Code: ;;; Code:

6
simple.sh
View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
# GNU Mes --- Maxwell Equations of Software # GNU Mes --- Maxwell Equations of Software
# Copyright © 2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> # Copyright © 2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
# #
# This file is part of GNU Mes. # This file is part of GNU Mes.
# #
@ -143,9 +143,9 @@ set -e
# Mes C lib build # Mes C lib build
# To get a i686-unknown-linux-gnu-gcc, you may do: # To get a i686-unknown-linux-gnu-gcc, you may do:
# guix environment -l guix.scm # guix shell
# or # or
# guix environment --ad-hoc -e '(begin (use-modules (gnu packages cross-base)) (list (cross-binutils "i686-unknown-linux-gnu") (cross-gcc "i686-unknown-linux-gnu")))' # guix shell -e '(begin (use-modules (gnu packages cross-base)) (list (cross-binutils "i686-unknown-linux-gnu") (cross-gcc "i686-unknown-linux-gnu")))'
## Clean ## ## Clean ##
rm -rf out-mes rm -rf out-mes