From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 4B7581F670 for ; Tue, 19 Oct 2021 11:13:59 +0000 (UTC) Received: by mail-wm1-x336.google.com with SMTP id p21so11508130wmq.1 for ; Tue, 19 Oct 2021 04:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dN2NDoa0rr1VsHThAEyPsdZm6rTgXU4iuZYKaRGS0po=; b=JiuVyd1NCQaMncypFBzt9wk1oWhewkAfiLEbXo/YBRQ8lRUBVzq+rDs5osys/xor6e G7HvxAafPJUHIaV1Dd8UmmBK/FAXHHIXL7cFkYdGH7dBLY3qNLbTeAUTw4IkljLmtgJv NeCc4vnNwZoz84cMuvF1HPwsGhC2lzgFRp3Qhtvhv0RtvBtVeMJM7KElmGGZ/NNurv9j H8WP8jJPEHAPt2dOG7N0DRv66hviPhut5cdjG+TU7jrudANDEF4XTAQT+/Az8eVAEJDH eV+5F23TdFP1d/reD7mu9soWnaPyMvKCv2R71F7YE24XaIHMZMVd3vzS4RfKTeiVZBOC AGZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dN2NDoa0rr1VsHThAEyPsdZm6rTgXU4iuZYKaRGS0po=; b=dQ1kKuqzRWDLU5c3s0WnoBoHW/GlMDdp0seqObFDfXFKJ7Dd6MqowgUDUQ/of/ln2e I5ezwm9y4Ud5PYEK8titdq92QPGbl8L3wSTU3Mu1DEfVfr18rJ5ooDoayim+nz304z/X WtyalbFsLBPuksWg1CnW7ebH3SIC1g6/tS7d9vctCZay/D0qHFEA/ewnB1LYijz+VjsT vxdgoySz5Zr0UqshZm3lWMy/5J0QyPm9CdWacsD4EQCbI1KseoCJ4a2UgZJZeZS/yvgh MGNHhLVtkJMzJuhKsmZuZQWv359VVrIQwWpIs84H9bFz3L9wtWi3qeGRnz1u4JGSCHdb Aa9g== X-Gm-Message-State: AOAM530slvdoAA/1CYvIRb+Uill49VFeHnElqRn6z618RwhippZixj7n H8T1pCGdGuzMEl/5VA7A1UBhPW4lTY8ojw== X-Google-Smtp-Source: ABdhPJx8siuYKRVUv5G98P0wLYxcnVqNf+BFOjmwjjxxPVH6A0MtC5mVxPcnL6zCrp8GkOstrJ+vcA== X-Received: by 2002:a05:600c:2909:: with SMTP id i9mr5355127wmd.74.1634642037291; Tue, 19 Oct 2021 04:13:57 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id e9sm10341728wrn.2.2021.10.19.04.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 04:13:56 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: meta@public-inbox.org Cc: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH] Makefile.PL: drop generated lib/PublicInbox.pm in blib/ Date: Tue, 19 Oct 2021 13:13:52 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1338.g20da966911a MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Running "make test" on this project doesn't pass unless you've got an existing PublicInbox.pm in your @INC, presumably nobody's set this up on a fresh machine in a while. This Makefile.PL trickery seems to do it, I've validated this with this ad-hoc test of committing blib/ and Makefile to the repository: git clean -dxf; perl Makefile.PL && make -j8 all && git add -f blib Makefile.PL Makefile && git commit -m"now" Running that in interactive rebase before/after shows that only the PublicInbox.pm file was added to blib/lib/. We use $(INST_LIB) instead of a hardcoded 'blib/lib' now, but it's what ExtUtils::MakeMaker recommends, so it's probably for the better. As far as I can tell this broke with 1fae720d (build: generate PublicInbox.pm with $VERSION, 2021-04-01), but I have not tested that. See also 1fae720d (build: generate PublicInbox.pm with $VERSION, 2021-04-01) which made the PublicInbox.pm a generated file. --- Makefile.PL | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile.PL b/Makefile.PL index 348a343d..b3ac59be 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -190,6 +190,16 @@ WriteMakefile( FILES => 't/home*/setup* t/home*/t* t/home*/.public-inbox '. 't/data-gen/*' }, + PM => { + map { + s[^lib/][]s; + +('lib/' . $_ => '$(INST_LIB)/' . $_); + } grep { + # Will include *.pod and an *.h file, but so + # would ExtUtils::MakeMaker. + m[^lib/]; + } @manifest + }, ); sub MY::postamble { -- 2.33.1.1338.g20da966911a