Restructured install layout to resemble parrot install layout.

Author: donaldh

tools/build/Makefile-JVM.in

@@ -6,6 +6,10 @@ PROVE  = prove
 ASM    = 3rdparty/asm/
 
 PREFIX = @prefix@
+BIN_DIR = $(PREFIX)/bin
+NQP_LANG_DIR= $(PREFIX)/languages/nqp
+NQP_JAR_DIR = $(NQP_LANG_DIR)/runtime
+NQP_LIB_DIR = $(NQP_LANG_DIR)/lib
 
 MKPATH = $(PERL) -MExtUtils::Command -e mkpath
 CP     = $(PERL) -MExtUtils::Command -e cp
@@ -151,23 +155,26 @@ RUNNER = @runner@
 all: $(ALL_OUTPUT) $(RUNNER) $(P5QREGEX_JAR)
 
 install: all
-	$(MKPATH) $(PREFIX)
-	$(CP) 3rdparty/asm/asm-4.1.jar $(PREFIX)
-	$(CP) 3rdparty/asm/asm-tree-4.1.jar $(PREFIX)
-	$(CP) 3rdparty/jline/jline-1.0.jar $(PREFIX)
-	$(CP) $(RUNTIME_JAR) $(PREFIX)
-	$(CP) $(NQP_MO_JAR) $(PREFIX)
-	$(CP) $(MODULE_LOADER_JAR) $(PREFIX)
-	$(CP) $(CORE_SETTING_JAR) $(PREFIX)
-	$(CP) $(QASTNODE_JAR) $(PREFIX)
-	$(CP) $(QREGEX_JAR) $(PREFIX)
-	$(CP) $(HLL_JAR) $(PREFIX)
-	$(CP) $(JASTNODES_JAR) $(PREFIX)
-	$(CP) $(QAST_JAR) $(PREFIX)
-	$(CP) $(P6QREGEX_JAR) $(PREFIX)
-	$(CP) $(NQP_JAR) $(PREFIX)
-	$(CP) $(P5QREGEX_JAR) $(PREFIX)
-	$(CP) $(EVAL_CLIENT) $(PREFIX)
+	$(MKPATH) $(BIN_DIR)
+	$(MKPATH) $(NQP_JAR_DIR)
+	$(MKPATH) $(NQP_LIB_DIR)
+	$(CP) 3rdparty/asm/asm-4.1.jar $(NQP_JAR_DIR)
+	$(CP) 3rdparty/asm/asm-tree-4.1.jar $(NQP_JAR_DIR)
+	$(CP) 3rdparty/jline/jline-1.0.jar $(NQP_JAR_DIR)
+	$(CP) $(RUNTIME_JAR) $(NQP_JAR_DIR)
+	$(CP) $(NQP_MO_JAR) $(NQP_LIB_DIR)
+	$(CP) $(MODULE_LOADER_JAR) $(NQP_LIB_DIR)
+	$(CP) $(CORE_SETTING_JAR) $(NQP_LIB_DIR)
+	$(CP) $(QASTNODE_JAR) $(NQP_LIB_DIR)
+	$(CP) $(QREGEX_JAR) $(NQP_LIB_DIR)
+	$(CP) $(HLL_JAR) $(NQP_LIB_DIR)
+	$(CP) $(JASTNODES_JAR) $(NQP_LIB_DIR)
+	$(CP) $(QAST_JAR) $(NQP_LIB_DIR)
+	$(CP) $(P6QREGEX_JAR) $(NQP_LIB_DIR)
+	$(CP) $(NQP_JAR) $(NQP_LIB_DIR)
+	$(CP) $(P5QREGEX_JAR) $(NQP_LIB_DIR)
+	$(CP) $(EVAL_CLIENT) $(BIN_DIR)
+	$(CHMOD) 0755 $(BIN_DIR)/eval-client.pl
 	$(PERL) tools/build/install-jvm-runner.pl $(PREFIX)
 
 $(RUNTIME_JAR): $(RUNTIME_JAVAS)

tools/build/install-jvm-runner.pl

@@ -12,22 +12,25 @@
     $prefix = File::Spec->rel2abs($prefix);
 }
 
+my $jar_dir = File::Spec->catfile($prefix, 'languages', 'nqp', 'runtime');
+my $lib_dir = File::Spec->catfile($prefix, 'languages', 'nqp', 'lib');
+
 if ($^O eq 'MSWin32') {
-    my $install_to = File::Spec->catfile($prefix, 'nqp.bat');
+    my $install_to = File::Spec->catfile($prefix, 'bin', 'nqp.bat');
     open my $fh, ">", $install_to
         or die "Could not open $install_to: $!";
-    print $fh '@java -Xbootclasspath/a:' . $prefix . ';' . $prefix . '\\nqp-runtime.jar;' .
-              $prefix . '\\asm-4.1.jar;' . $prefix . "\\jline-1.0.jar;$prefix\\nqp.jar -cp $prefix nqp %*\n";
+    print $fh '@java -Xbootclasspath/a:$jar_dir\\nqp-runtime.jar;' .
+              "$jar_dir\\asm-4.1.jar;$jar_dir\\jline-1.0.jar;$lib_dir\\nqp.jar -cp $lib_dir nqp %*\n";
     close $fh
         or die "Could not close $install_to: $!";
 }
 else {
-    my $install_to = File::Spec->catfile($prefix, 'nqp');
+    my $install_to = File::Spec->catfile($prefix, 'bin', 'nqp');
     open my $fh, ">", $install_to
         or die "Could not open $install_to: $!";
     print $fh "#!/bin/sh\n";
-    print $fh "exec java -Xbootclasspath/a:$prefix:$prefix/nqp-runtime.jar:" .
-              "$prefix/asm-4.1.jar:$prefix/jline-1.0.jar:$prefix/nqp.jar -cp $prefix nqp \"\$\@\"\n";
+    print $fh "exec java -Xbootclasspath/a:$jar_dir/nqp-runtime.jar:" .
+              "$jar_dir/asm-4.1.jar:$jar_dir/jline-1.0.jar:$lib_dir/nqp.jar -cp $lib_dir nqp \"\$\@\"\n";
     close $fh
         or die "Could not close $install_to: $!";
     chmod 0755, $install_to;