unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Prikler <leo.prikler@student.tugraz.at>
To: 49329@debbugs.gnu.org
Subject: [bug#49329] [PATCH v2 1/5] gnu: python2-renpy: Drop unused Ren'py sources.
Date: Sat,  3 Jul 2021 11:28:39 +0200	[thread overview]
Message-ID: <20210703092842.32189-1-leo.prikler@student.tugraz.at> (raw)
In-Reply-To: <e9943d256ded2136e82fbeb2f2cb917659ea62fc.camel@student.tugraz.at>

These sources are written in Ren'py (the language) and thus not particularly
useful before renpy itself is built.  In particular, they serve no purpose
when installed without prior compilation.

* gnu/packages/game-development.scm (python2-renpy)[#:phases]<install>:
Drop installed "common" folder.
(renpy)[#:phases]<install>: Adjust comment accordingly.
---
0001 up to 0004 are identical to v1.

 gnu/packages/game-development.scm | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 9069b88d0c..22c44a585c 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1230,7 +1230,8 @@ developed mainly for Ren'py.")
                (with-directory-excursion "module"
                  (apply (assoc-ref %standard-phases 'install) args))
                (copy-recursively "renpy"
-                                 (string-append out site "/renpy")))
+                                 (string-append out site "/renpy"))
+               (delete-file-recursively (string-append out site "/renpy/common")))
              #t)))))
     (inputs
      `(("ffmpeg" ,ffmpeg)
@@ -1304,11 +1305,14 @@ modules of Ren'py.")
              ;; After finishing this step, "out" will have the following:
              ;; |-- bin/renpy
              ;; `-- share/renpy ; i.e. path_to_renpy_base()
-             ;;     `-- common
+             ;;     |-- common
+             ;;     `-- gui
              ;;
-             ;; Note that common is also a de facto unused directory in
-             ;; python2-renpy. On other systems, renpy_base would point to
-             ;; site-packages or even somewhere in /opt.
+             ;; Note that common shares the source files that would be installed
+             ;; by python2-renpy (which are instead deleted from that package),
+             ;; but also contains their byte-compiled versions.
+             ;; On other systems, renpy_base would point to site-packages or
+             ;; even somewhere in /opt.
              ;; The former approach is not as straightforward as it seems
              ;; -- it causes renpy to load files twice for some weird reason --
              ;; and the latter is impossible on Guix. Hence the detour through
@@ -1319,9 +1323,11 @@ modules of Ren'py.")
              ;; well. This differs from the traditional layout, which is
              ;; roughly the following:
              ;; `-- Super Awesome Game
-             ;;     |-- game      ; <- the folder we actually want
-             ;;     |-- lib       ; compiled renpy module and dependencies
-             ;;     |-- renpy     ; Ren'py python code (source + compiled)
+             ;;     |-- game       ; <- the folder we actually want
+             ;;     |-- lib        ; compiled renpy module and dependencies
+             ;;     |-- renpy      ; yet another copy of Ren'py's code
+             ;;     |   |-- common ; the common folder from above
+             ;;     |   `-- ...    ; Python code (source + compiled)
              ;;     |-- Super Awesome Game.py
              ;;     `-- Super Awesome Game.sh
              (let* ((out (assoc-ref outputs "out"))
-- 
2.32.0





  parent reply	other threads:[~2021-07-03  9:31 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-02 12:39 [bug#49329] [PATCH 00/??] Improve Ren'py package Leo Prikler
2021-07-02 13:58 ` [bug#49329] [PATCH 1/4] gnu: python2-renpy: Drop unused Ren'py sources Leo Prikler
2021-07-02 13:58   ` [bug#49329] [PATCH 2/4] gnu: python2-renpy: Update description Leo Prikler
2021-07-02 13:58   ` [bug#49329] [PATCH 3/4] gnu: python2-renpy: Correct inputs Leo Prikler
2021-07-02 13:58   ` [bug#49329] [PATCH 4/4] gnu: renpy: " Leo Prikler
2021-07-03  7:50   ` [bug#49329] [PATCH 1/4] gnu: python2-renpy: Drop unused Ren'py sources zimoun
2021-07-03  8:35     ` Leo Prikler
2021-07-11  3:50       ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-11  8:28       ` [bug#49329] [PATCH 1/4] gnu: python2-renpy: Drop unused Ren'py sources zimoun
2021-07-11  9:53         ` Leo Prikler
2021-07-15  6:47           ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-03  9:28 ` Leo Prikler [this message]
2021-07-03  9:28   ` [bug#49329] [PATCH v2 2/5] gnu: python2-renpy: Update description Leo Prikler
2021-07-11  4:53     ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-11  7:09       ` Leo Prikler
2021-07-15  6:48         ` Chris Marusich
2021-07-03  9:28   ` [bug#49329] [PATCH v2 3/5] gnu: python2-renpy: Correct inputs Leo Prikler
2021-07-11  4:55     ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-03  9:28   ` [bug#49329] [PATCH v2 4/5] gnu: renpy: Correct inputs Leo Prikler
2021-07-11  4:37     ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-11  6:58       ` Leo Prikler
2021-07-03  9:28   ` [bug#49329] [PATCH v2 5/5] gnu: Add python-pygame-sdl2 Leo Prikler
2021-07-11  4:44     ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-11  7:00       ` Leo Prikler
2021-07-15  7:21         ` Chris Marusich
2021-07-15 11:46           ` bug#49329: " Leo Prikler
2021-07-11  4:52   ` [bug#49329] " Chris Marusich
2021-07-11  7:03     ` Leo Prikler
2021-07-15  7:22       ` Chris Marusich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210703092842.32189-1-leo.prikler@student.tugraz.at \
    --to=leo.prikler@student.tugraz.at \
    --cc=49329@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).