# New Ticket Created by g...@zimt.uni-siegen.de
# Please include the string: [perl #125474]
# in the subject line of all future correspondence about this issue.
# <URL: https://rt.perl.org/Ticket/Display.html?id=125474 >
Hello
for the repository http://github.com/rakudo/star I created a little
patch.
It changes the target from 'languages' to 'share' for the modules.
Also a little fix for the perl6 script tools/build/panda-state.p6 is
added.
Gerd
>From f30500334b9f808fec405b62cfc7343308499106 Mon Sep 17 00:00:00 2001
From: gerd <g...@zimt.uni-siegen.de>
Date: Wed, 24 Jun 2015 15:45:54 +0200
Subject: [PATCH] languages -> share
---
tools/build/Makefile.in | 12 ++++++------
tools/build/panda-state.p6 | 16 ++++++++--------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 0dd1735..5f74c39 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -23,11 +23,11 @@ MKPATH = $(PERL) -MExtUtils::Command -e mkpath
CHMOD = $(PERL) -MExtUtils::Command -e chmod
PERL6_J_EXE = perl6-j$(BAT)
-PERL6_J_LANG_DIR = $(PREFIX_DIR)/languages/perl6
+PERL6_J_LANG_DIR = $(PREFIX_DIR)/share/perl6
PERL6_J_INSTALL = $(JVM_BIN_DIR)/$(PERL6_J_EXE)
PERL6_M_EXE = perl6-m$(BAT)
-PERL6_M_LANG_DIR = $(PREFIX_DIR)/languages/perl6
+PERL6_M_LANG_DIR = $(PREFIX_DIR)/share/perl6
PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE)
PERL6_EXE = perl6$(EXE)
@@ -62,8 +62,8 @@ modules-install-j:
$(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL)
$(DESTDIR)$(JVM_BIN_DIR) j modules/ufo/bin/ufo modules/panda/bin/panda
modules/doc/bin/p6doc
$(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL)
$(DESTDIR)$(JVM_BIN_DIR) j modules/ufo/bin/ufo modules/panda/bin/panda
modules/doc/bin/p6doc-index
$(MKPATH) $(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/
- $(CP) install/languages/perl6/site/panda/projects.json
$(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/
- $(CP) install/languages/perl6/site/panda/state
$(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/
+ $(CP) install/share/perl6/site/panda/projects.json
$(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/
+ $(CP) install/share/perl6/site/panda/state
$(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/
modules-install-m:
@echo "== Installing modules for MoarVM"
@@ -72,8 +72,8 @@ modules-install-m:
$(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL)
$(DESTDIR)$(MOAR_BIN_DIR) m modules/ufo/bin/ufo modules/panda/bin/panda
modules/doc/bin/p6doc
$(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL)
$(DESTDIR)$(MOAR_BIN_DIR) m modules/ufo/bin/ufo modules/panda/bin/panda
modules/doc/bin/p6doc-index
$(MKPATH) $(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/
- $(CP) install/languages/perl6/site/panda/projects.json
$(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/
- $(CP) install/languages/perl6/site/panda/state
$(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/
+ $(CP) install/share/perl6/site/panda/projects.json
$(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/
+ $(CP) install/share/perl6/site/panda/state
$(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/
modules-test: @backend_modules_test@
verbose-modules-test: @backend_modules_test@
diff --git a/tools/build/panda-state.p6 b/tools/build/panda-state.p6
index 63f0316..e5f809b 100644
--- a/tools/build/panda-state.p6
+++ b/tools/build/panda-state.p6
@@ -1,12 +1,12 @@
try mkdir 'install';
-try mkdir 'install/languages';
-try mkdir 'install/languages/perl6';
-try mkdir 'install/languages/perl6/site';
-try mkdir 'install/languages/perl6/site/panda';
+try mkdir 'install/share';
+try mkdir 'install/share/perl6';
+try mkdir 'install/share/perl6/site';
+try mkdir 'install/share/perl6/site/panda';
-my $state-file = 'install/languages/perl6/site/panda/state';
-my $projects-file = 'install/languages/perl6/site/panda/projects.json';
+my $state-file = 'install/share/perl6/site/panda/state';
+my $projects-file = 'install/share/perl6/site/panda/projects.json';
fetch-projects-json($projects-file);
@@ -14,9 +14,9 @@ my $projects = from-json $projects-file.IO.slurp;
# In case we ship a project that is just a fork of a project listed in the
ecosystem, add
# the mapping here.
-my %ex =
+my %ex;
# 'git://github.com/FROGGS/perl6-digest-md5' =>
'git://github.com/cosimo/perl6-digest-md5',
-Nil;
+#Nil;
# Walk the submodules and put its project information in panda's state file.
my $fh = $state-file.IO.open(:w);
--
2.4.3
