From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 16 12:44:11 2020 Received: (at submit) by debbugs.gnu.org; 16 Jan 2020 17:44:11 +0000 Received: from localhost ([127.0.0.1]:38319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1is9Bf-0003Fk-O6 for submit@debbugs.gnu.org; Thu, 16 Jan 2020 12:44:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:38769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1is9Ba-0003FY-GG for submit@debbugs.gnu.org; Thu, 16 Jan 2020 12:44:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59629) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is9BW-0004nk-6M for guix-patches@gnu.org; Thu, 16 Jan 2020 12:44:01 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1is9BS-0006Pe-3e for guix-patches@gnu.org; Thu, 16 Jan 2020 12:43:57 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:12373) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1is9BR-0006MI-FZ for guix-patches@gnu.org; Thu, 16 Jan 2020 12:43:54 -0500 Received: from localhost.localdomain (193-80-82-122.hdsl.highway.telekom.at [193.80.82.122]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 47zBPr6qcFz1LgFS for ; Thu, 16 Jan 2020 18:43:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 47zBPr6qcFz1LgFS DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1579196625; bh=VgQzxZl+8D65STZv4f8qiF3rCri6py/rGoQYBml04bQ=; h=From:To:Subject:Date:From; b=IgOpwZFADA7/0jpK94m81/sL8rQNr+z+9aPBB9WD/w9sU2qDpO6MRYsky6xAJAjO+ RVKTEUOzkyCx1FWzRsd136RdnkX6oBFuvsed6tsPBMJhk7aqUDRLP0VnlzAtFLHDCv GhwR8LZRkx+5KDuKJNz/pO6uBCS0ED2rRPoLcwog= From: Leo Prikler To: guix-patches@gnu.org Subject: [PATCH] gnu: Refactor renpy build. Date: Thu, 16 Jan 2020 18:43:10 +0100 Message-Id: <20200116174309.3058-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 129.27.2.202 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/game-development.scm (python2-renpy): Use directory excurs= ions instead of invoking `chdir' directly. --- gnu/packages/game-development.scm | 54 +++++++++++++------------------ 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-develo= pment.scm index 7aef6b09d2..697ede89e1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1086,39 +1086,31 @@ developed mainly for Ren'py.") (setenv "RENPY_DEPS_INSTALL" (string-join (map cdr inputs) = ":")) #t)) (replace 'build - (lambda args - (apply - (lambda* (build-root #:key inputs outputs #:allow-other-ke= ys) - ;; The "module" subdirectory contains a python (really c= ython) - ;; project, which is built using a script, that is thank= fully - ;; named "setup.py". - (chdir "module") - (apply (assoc-ref %standard-phases 'build) args) - ;; the above causes renpy.__init__ to be compiled but do= es not - ;; compile anything else, hence we do that here - (chdir build-root) - (delete-file "renpy/__init__.pyc") - (invoke "python" "-m" "compileall" "renpy")) - (getcwd) args) + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args= ) + ;; The "module" subdirectory contains a python (really cyth= on) + ;; project, which is built using a script, that is thankful= ly + ;; named "setup.py". + (with-directory-excursion "module" + (apply (assoc-ref %standard-phases 'build) args)) + ;; the above causes renpy.__init__ to be compiled but does = not + ;; compile anything else, hence we do that here + (delete-file "renpy/__init__.pyc") + (invoke "python" "-m" "compileall" "renpy") #t)) (replace 'install - (lambda args - (apply - (lambda* (build-root #:key inputs outputs #:allow-other-ke= ys) - ;; Again, we have to wrap the module installation. - ;; Additionally, we want to install the python code - ;; (both source and compiled) in the same directory. - (let* ((out (assoc-ref outputs "out")) - (site (string-append "/lib/python" - ,(version-major+minor - (package-version python-2)= ) - "/site-packages"))) - (chdir "module") - (apply (assoc-ref %standard-phases 'install) args) - (chdir build-root) - (copy-recursively "renpy" - (string-append out site "/renpy")))) - (getcwd) args) + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args= ) + ;; Again, we have to wrap the module installation. + ;; Additionally, we want to install the python code + ;; (both source and compiled) in the same directory. + (let* ((out (assoc-ref outputs "out")) + (site (string-append "/lib/python" + ,(version-major+minor + (package-version python-2)) + "/site-packages"))) + (with-directory-excursion "module" + (apply (assoc-ref %standard-phases 'install) args)) + (copy-recursively "renpy" + (string-append out site "/renpy"))) #t))))) (inputs `(("ffmpeg" ,ffmpeg) --=20 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 16 17:41:13 2020 Received: (at 39153) by debbugs.gnu.org; 16 Jan 2020 22:41:13 +0000 Received: from localhost ([127.0.0.1]:38543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isDpA-00029S-Qp for submit@debbugs.gnu.org; Thu, 16 Jan 2020 17:41:13 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:48773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isDp6-00029F-SU for 39153@debbugs.gnu.org; Thu, 16 Jan 2020 17:41:10 -0500 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 7F92DE0004; Thu, 16 Jan 2020 22:41:06 +0000 (UTC) From: Nicolas Goaziou To: Leo Prikler Subject: Re: [bug#39153] [PATCH] gnu: Refactor renpy build. References: <20200116174309.3058-1-leo.prikler@student.tugraz.at> Date: Thu, 16 Jan 2020 23:41:03 +0100 In-Reply-To: <20200116174309.3058-1-leo.prikler@student.tugraz.at> (Leo Prikler's message of "Thu, 16 Jan 2020 18:43:10 +0100") Message-ID: <87sgkft474.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39153 Cc: 39153@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Leo Prikler writes: > * gnu/packages/game-development.scm (python2-renpy): Use directory excurs= ions > instead of invoking `chdir' directly. LGTM! I updated the copyright line for you and applied your patch (alas not in this order=E2=80=A6). Thank you! Regards, --=20 Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 16 17:42:10 2020 Received: (at 39153-done) by debbugs.gnu.org; 16 Jan 2020 22:42:10 +0000 Received: from localhost ([127.0.0.1]:38547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isDq6-0002B0-58 for submit@debbugs.gnu.org; Thu, 16 Jan 2020 17:42:10 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:40295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isDq4-0002As-Bn for 39153-done@debbugs.gnu.org; Thu, 16 Jan 2020 17:42:08 -0500 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 64B58E0009 for <39153-done@debbugs.gnu.org>; Thu, 16 Jan 2020 22:42:07 +0000 (UTC) From: Nicolas Goaziou To: 39153-done@debbugs.gnu.org Subject: Re: [bug#39153] [PATCH] gnu: Refactor renpy build. References: <20200116174309.3058-1-leo.prikler@student.tugraz.at> Date: Thu, 16 Jan 2020 23:42:05 +0100 In-Reply-To: <20200116174309.3058-1-leo.prikler@student.tugraz.at> (Leo Prikler's message of "Thu, 16 Jan 2020 18:43:10 +0100") Message-ID: <87lfq7t45e.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39153-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Applied as 37c52b5b15c6debed78dba41a74370a051ad7878. Closing. From unknown Sun Jun 15 08:49:18 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 14 Feb 2020 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator