Skip to content

Commit

Permalink
Rename PERL6_LANG_DIR -> PERL6_HOME.
Browse files Browse the repository at this point in the history
  • Loading branch information
@patrickbkr @PatZim
patrickbkr authored and PatZim committed Mar 20, 2019
1 parent d76fe0a commit 2633aad
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions Configure.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,9 @@
unless ($win) {
$config{'m_cleanups'} = " \$(M_GDB_RUNNER) \\\n \$(M_LLDB_RUNNER) \\\n \$(M_VALGRIND_RUNNER)";
$config{'m_all'} = '$(M_GDB_RUNNER) $(M_LLDB_RUNNER) $(M_VALGRIND_RUNNER)';
$config{'m_install'} = "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-gdb-m "$(PERL6_LANG_DIR)/runtime" "gdb" "" relocatable "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"' . "\n"
. "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-lldb-m "$(PERL6_LANG_DIR)/runtime" "lldb" "" relocatable "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"' . "\n"
. "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-valgrind-m "$(PERL6_LANG_DIR)/runtime" "valgrind" "" relocatable "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"';
$config{'m_install'} = "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-gdb-m "$(PERL6_HOME)/runtime" "gdb" "" relocatable "$(M_LIBPATH)" "$(PERL6_HOME)/lib" "$(PERL6_HOME)/runtime"' . "\n"
. "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-lldb-m "$(PERL6_HOME)/runtime" "lldb" "" relocatable "$(M_LIBPATH)" "$(PERL6_HOME)/lib" "$(PERL6_HOME)/runtime"' . "\n"
. "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-valgrind-m "$(PERL6_HOME)/runtime" "valgrind" "" relocatable "$(M_LIBPATH)" "$(PERL6_HOME)/lib" "$(PERL6_HOME)/runtime"';
}

unless (@errors) {
Expand Down
22 changes: 11 additions & 11 deletions tools/build/Makefile-JVM.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,18 @@ sometests: j-all
j-install: j-all tools/build/create-jvm-runner.pl tools/build/install-core-dist.p6
$(MKPATH) $(DESTDIR)$(PREFIX)/bin
$(MKPATH) $(DESTDIR)$(J_LIBPATH)/Perl6
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(MKPATH) $(DESTDIR)$(PERL6_HOME)/runtime
$(CP) $(PERL6_LANG_JARS) $(DESTDIR)$(J_LIBPATH)/Perl6
$(CP) $(SETTING_JAR) $(SETTING_D_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(CP) $(PERL6_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(CP) $(PERL6_DEBUG_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(CP) $(RUNTIME_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
.@slash@$(J_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/vendor
.@slash@$(J_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/vendor
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(J_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(J_RUNNER) tools/build/install-core-dist.p6 $(DESTDIR)$(PERL6_LANG_DIR)
$(CP) $(SETTING_JAR) $(SETTING_D_JAR) $(DESTDIR)$(PERL6_HOME)/runtime
$(CP) $(PERL6_JAR) $(DESTDIR)$(PERL6_HOME)/runtime
$(CP) $(PERL6_DEBUG_JAR) $(DESTDIR)$(PERL6_HOME)/runtime
$(CP) $(RUNTIME_JAR) $(DESTDIR)$(PERL6_HOME)/runtime
.@slash@$(J_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_HOME)
$(MKPATH) $(DESTDIR)$(PERL6_HOME)/vendor
.@slash@$(J_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_HOME)/vendor
$(MKPATH) $(DESTDIR)$(PERL6_HOME)/site
.@slash@$(J_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_HOME)/site
.@slash@$(J_RUNNER) tools/build/install-core-dist.p6 $(DESTDIR)$(PERL6_HOME)
$(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
$(PERL5) tools/build/create-jvm-runner.pl install-debug "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)

Expand Down
26 changes: 13 additions & 13 deletions tools/build/Makefile-Moar.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,20 +303,20 @@ m-install: m-all tools/build/create-moar-runner.p6 tools/build/install-core-dist
$(MKPATH) $(DESTDIR)$(M_LIBPATH)/Perl6
$(M_RUN_CLEAN_TARGET_FILES) $(M_PERL6_LANG_OUTPUT) $(DESTDIR)/$(M_LIBPATH)/Perl6
$(CP) $(M_PERL6_LANG_OUTPUT) $(DESTDIR)$(M_LIBPATH)/Perl6
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/lib
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(M_RUN_CLEAN_TARGET_FILES) $(SETTING_MOAR) $(SETTING_D_MOAR) $(R_SETTING_MOAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(M_RUN_CLEAN_TARGET_FILES) $(PERL6_MOAR) $(PERL6_DEBUG_MOAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(CP) $(SETTING_MOAR) $(SETTING_D_MOAR) $(R_SETTING_MOAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(CP) $(PERL6_MOAR) $(PERL6_DEBUG_MOAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/runtime/dynext
$(CP) $(M_PERL6_OPS_DLL) $(DESTDIR)$(PERL6_LANG_DIR)/runtime/dynext
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/vendor
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(M_RUNNER) tools/build/install-core-dist.p6 $(DESTDIR)$(PERL6_LANG_DIR)
$(MKPATH) $(DESTDIR)$(PERL6_HOME)/lib
$(MKPATH) $(DESTDIR)$(PERL6_HOME)/runtime
$(M_RUN_CLEAN_TARGET_FILES) $(SETTING_MOAR) $(SETTING_D_MOAR) $(R_SETTING_MOAR) $(DESTDIR)$(PERL6_HOME)/runtime
$(M_RUN_CLEAN_TARGET_FILES) $(PERL6_MOAR) $(PERL6_DEBUG_MOAR) $(DESTDIR)$(PERL6_HOME)/runtime
$(CP) $(SETTING_MOAR) $(SETTING_D_MOAR) $(R_SETTING_MOAR) $(DESTDIR)$(PERL6_HOME)/runtime
$(CP) $(PERL6_MOAR) $(PERL6_DEBUG_MOAR) $(DESTDIR)$(PERL6_HOME)/runtime
$(MKPATH) $(DESTDIR)$(PERL6_HOME)/runtime/dynext
$(CP) $(M_PERL6_OPS_DLL) $(DESTDIR)$(PERL6_HOME)/runtime/dynext
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_HOME)
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_HOME)/vendor
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_HOME)/site
.@slash@$(M_RUNNER) tools/build/install-core-dist.p6 $(DESTDIR)$(PERL6_HOME)
$(CP) $(M_C_RUNNER) $(DESTDIR)$(PREFIX)/bin/perl6-m@exe@
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_LANG_DIR)/runtime" "" "" relocatable "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_HOME)/runtime" "" "" relocatable "$(M_LIBPATH)" "$(PERL6_HOME)/lib" "$(PERL6_HOME)/runtime"
@m_install@

m-runner-default-install: m-install
Expand Down
2 changes: 1 addition & 1 deletion tools/build/Makefile-common-macros.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SYSROOT= @sysroot@
SDKROOT= @sdkroot@
PREFIX = @prefix@
LIBDIR = @libdir@
PERL6_LANG_DIR = $(LIBDIR)/perl6
PERL6_HOME = $(LIBDIR)/perl6

BOOTSTRAP_SOURCES = \
src/Perl6/Metamodel/BOOTSTRAP.nqp \
Expand Down

0 comments on commit 2633aad

Please sign in to comment.