[JVM] remove useless gen/ dirs

that stuff is in gen/jvm/ anyway

Author: moritz

tools/build/Makefile-JVM.in

@@ -40,38 +40,38 @@ NQP_MO_COMBINED = nqpmo.nqp
 MODULE_LOADER_JAR   = ModuleLoader.jar
 
 CORE_SETTING_JAR      = NQPCORE.setting.jar
-CORE_SETTING_COMBINED = gen/NQPCORE.setting
+CORE_SETTING_COMBINED = NQPCORE.setting
 
 QASTNODE_JAR      = QASTNode.jar
-QASTNODE_COMBINED = gen/QASTNode.nqp
+QASTNODE_COMBINED = QASTNode.nqp
 
 QREGEX_JAR      = QRegex.jar
-QREGEX_COMBINED = gen/QRegex.nqp
+QREGEX_COMBINED = QRegex.nqp
 
 HLL_JAR      = NQPHLL.jar
-HLL_COMBINED = gen/NQPHLL.nqp
+HLL_COMBINED = NQPHLL.nqp
 HLL_SOURCES  = src/vm/jvm/HLL/Backend.nqp $(COMMON_HLL_SOURCES)
 
 JASTNODES_JAR      = JASTNodes.jar
-JASTNODES_COMBINED = gen/JASTNodes.nqp
+JASTNODES_COMBINED = JASTNodes.nqp
 JASTNODES_SOURCES  = \
   src/vm/jvm/QAST/JASTNodes.nqp \
 
 QAST_JAR      = QAST.jar
-QAST_COMBINED = gen/QAST.nqp
+QAST_COMBINED = QAST.nqp
 QAST_SOURCES  = \
   src/vm/jvm/QAST/Compiler.nqp \
 
 P6QREGEX_JAR      = NQPP6QRegex.jar
-P6QREGEX_COMBINED = gen/NQPP6QRegex.nqp
+P6QREGEX_COMBINED = NQPP6QRegex.nqp
 
 P5QREGEX_JAR      = NQPP5QRegex.jar
-P5QREGEX_COMBINED = gen/NQPP5QRegex.nqp
+P5QREGEX_COMBINED = NQPP5QRegex.nqp
 
 EVAL_CLIENT = tools/jvm/eval-client.pl
 
 NQP_JAR      = nqp.jar
-NQP_COMBINED = gen/NQP.nqp
+NQP_COMBINED = NQP.nqp
 NQP_SOURCES  = src/vm/jvm/NQP/Ops.nqp $(COMMON_NQP_SOURCES)
 
 STAGE1_OUTPUT = $(STAGE1)/$(NQP_MO_JAR) $(STAGE1)/$(MODULE_LOADER_JAR) \
@@ -135,7 +135,7 @@ $(STAGE0): $(RUNTIME_JAR)
 $(STAGE1): $(STAGE1_OUTPUT)
 
 $(STAGE1)/$(NQP_MO_JAR): $(STAGE0) $(NQP_MO_SOURCES)
-	$(MKPATH) $(STAGE1)/gen
+	$(MKPATH) $(STAGE1)
 	$(PERL) tools/build/gen-cat.pl jvm $(NQP_MO_SOURCES) > $(STAGE1)/$(NQP_MO_COMBINED)
 	$(STAGE0_NQP) --setting=NULL --no-regex-lib --target=jar \
 	    --output=$(STAGE1)/$(NQP_MO_JAR) $(STAGE1)/$(NQP_MO_COMBINED)
@@ -145,65 +145,65 @@ $(STAGE1)/$(MODULE_LOADER_JAR): $(STAGE0) src/vm/jvm/ModuleLoader.nqp
 	    --output=$(STAGE1)/$(MODULE_LOADER_JAR) src/vm/jvm/ModuleLoader.nqp
 
 $(STAGE1)/$(CORE_SETTING_JAR): $(STAGE0) $(CORE_SETTING_SOURCES) $(STAGE1)/$(NQP_MO_JAR) $(STAGE1)/$(MODULE_LOADER_JAR)
-	$(MKPATH) $(STAGE1)/gen
+	$(MKPATH) $(STAGE1)
 	$(PERL) tools/build/gen-cat.pl jvm $(CORE_SETTING_SOURCES) > $(STAGE1)/$(CORE_SETTING_COMBINED)
 	$(STAGE0_NQP) --module-path=$(STAGE1) --setting=NULL --no-regex-lib --target=jar \
 	    --output=$(STAGE1)/$(CORE_SETTING_JAR) $(STAGE1)/$(CORE_SETTING_COMBINED)
 
 $(STAGE1)/$(QASTNODE_JAR): $(STAGE0) $(QASTNODE_SOURCES) $(STAGE1)/$(CORE_SETTING_JAR)
-	$(MKPATH) $(STAGE1)/gen
+	$(MKPATH) $(STAGE1)
 	$(PERL) tools/build/gen-cat.pl jvm $(QASTNODE_SOURCES) > $(STAGE1)/$(QASTNODE_COMBINED)
 	$(STAGE0_NQP) --module-path=$(STAGE1) --setting-path=$(STAGE1) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE1)/$(QASTNODE_JAR) $(STAGE1)/$(QASTNODE_COMBINED)
 
 $(STAGE1)/$(QREGEX_JAR): $(STAGE0) $(QREGEX_SOURCES) $(STAGE1)/$(QASTNODE_JAR)
-	$(MKPATH) $(STAGE1)/gen
+	$(MKPATH) $(STAGE1)
 	$(PERL) tools/build/gen-cat.pl jvm $(QREGEX_SOURCES) > $(STAGE1)/$(QREGEX_COMBINED)
 	$(STAGE0_NQP) --module-path=$(STAGE1) --setting-path=$(STAGE1) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE1)/$(QREGEX_JAR) $(STAGE1)/$(QREGEX_COMBINED)
 
 $(STAGE1)/$(HLL_JAR): $(STAGE0) $(HLL_SOURCES) $(STAGE1)/$(QREGEX_JAR)
-	$(MKPATH) $(STAGE1)/gen
+	$(MKPATH) $(STAGE1)
 	$(PERL) tools/build/gen-cat.pl jvm $(HLL_SOURCES) > $(STAGE1)/$(HLL_COMBINED)
 	$(STAGE0_NQP) --module-path=$(STAGE1) --setting-path=$(STAGE1) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE1)/$(HLL_JAR) $(STAGE1)/$(HLL_COMBINED)
 
 $(STAGE1)/$(JASTNODES_JAR): $(STAGE0) $(JASTNODES_SOURCES) $(STAGE1)/$(CORE_SETTING_JAR)
-	$(MKPATH) $(STAGE1)/gen
+	$(MKPATH) $(STAGE1)
 	$(PERL) tools/build/gen-cat.pl jvm $(JASTNODES_SOURCES) > $(STAGE1)/$(JASTNODES_COMBINED)
 	$(STAGE0_NQP) --module-path=$(STAGE1) --setting-path=$(STAGE1) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE1)/$(JASTNODES_JAR) $(STAGE1)/$(JASTNODES_COMBINED)
 
 $(STAGE1)/$(QAST_JAR): $(STAGE0) $(QAST_SOURCES) $(STAGE1)/$(HLL_JAR) $(STAGE1)/$(JASTNODES_JAR)
-	$(MKPATH) $(STAGE1)/gen
+	$(MKPATH) $(STAGE1)
 	$(PERL) tools/build/gen-cat.pl jvm $(QAST_SOURCES) > $(STAGE1)/$(QAST_COMBINED)
 	$(STAGE0_NQP) --module-path=$(STAGE1) --setting-path=$(STAGE1) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE1)/$(QAST_JAR) $(STAGE1)/$(QAST_COMBINED)
 
 $(STAGE1)/$(P6QREGEX_JAR): $(STAGE0) $(P6QREGEX_SOURCES) $(STAGE1)/$(QAST_JAR)
-	$(MKPATH) $(STAGE1)/gen
+	$(MKPATH) $(STAGE1)
 	$(PERL) tools/build/gen-cat.pl jvm $(P6QREGEX_SOURCES) > $(STAGE1)/$(P6QREGEX_COMBINED)
 	$(STAGE0_NQP) --module-path=$(STAGE1) --setting-path=$(STAGE1) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE1)/$(P6QREGEX_JAR) $(STAGE1)/$(P6QREGEX_COMBINED)
 
 $(STAGE1)/$(NQP_JAR): $(STAGE0) $(NQP_SOURCES) $(STAGE1)/$(P6QREGEX_JAR)
-	$(MKPATH) $(STAGE1)/gen
-	$(PERL) tools/build/gen-version.pl > src/gen/nqp-config.nqp
-	$(PERL) tools/build/gen-cat.pl jvm $(NQP_SOURCES) src/gen/nqp-config.nqp > $(STAGE1)/$(NQP_COMBINED)
+	$(MKPATH) $(STAGE1)
+	$(PERL) tools/build/gen-version.pl > $(STAGE1)/nqp-config.nqp
+	$(PERL) tools/build/gen-cat.pl jvm $(NQP_SOURCES) $(STAGE1)/nqp-config.nqp > $(STAGE1)/$(NQP_COMBINED)
 	$(STAGE0_NQP) --module-path=$(STAGE1) --setting-path=$(STAGE1) \
          --setting=NQPCORE --target=jar --no-regex-lib --javaclass=nqp \
 	    --output=$(STAGE1)/$(NQP_JAR) $(STAGE1)/$(NQP_COMBINED)
 
 $(STAGE2): $(STAGE2_OUTPUT)
 
 $(STAGE2)/$(NQP_MO_JAR): $(STAGE1) $(NQP_MO_SOURCES)
-	$(MKPATH) $(STAGE2)/gen
+	$(MKPATH) $(STAGE2)
 	$(PERL) tools/build/gen-cat.pl jvm $(NQP_MO_SOURCES) > $(STAGE2)/$(NQP_MO_COMBINED)
 	$(STAGE1_NQP) --setting=NULL --no-regex-lib --target=jar \
 	    --output=$(STAGE2)/$(NQP_MO_JAR) $(STAGE2)/$(NQP_MO_COMBINED)
@@ -213,20 +213,20 @@ $(STAGE2)/$(MODULE_LOADER_JAR): $(STAGE1) src/vm/jvm/ModuleLoader.nqp
 	    --output=$(STAGE2)/$(MODULE_LOADER_JAR) src/vm/jvm/ModuleLoader.nqp
 
 $(STAGE2)/$(CORE_SETTING_JAR): $(STAGE1) $(CORE_SETTING_SOURCES) $(STAGE2)/$(NQP_MO_JAR) $(STAGE2)/$(MODULE_LOADER_JAR)
-	$(MKPATH) $(STAGE2)/gen
+	$(MKPATH) $(STAGE2)
 	$(PERL) tools/build/gen-cat.pl jvm $(CORE_SETTING_SOURCES) > $(STAGE2)/$(CORE_SETTING_COMBINED)
 	$(STAGE1_NQP) --module-path=$(STAGE2) --setting=NULL --no-regex-lib --target=jar \
 	    --output=$(STAGE2)/$(CORE_SETTING_JAR) $(STAGE2)/$(CORE_SETTING_COMBINED)
 
 $(STAGE2)/$(QASTNODE_JAR): $(STAGE1) $(QASTNODE_SOURCES) $(STAGE2)/$(CORE_SETTING_JAR)
-	$(MKPATH) $(STAGE2)/gen
+	$(MKPATH) $(STAGE2)
 	$(PERL) tools/build/gen-cat.pl jvm $(QASTNODE_SOURCES) > $(STAGE2)/$(QASTNODE_COMBINED)
 	$(STAGE1_NQP) --module-path=$(STAGE2) --setting-path=$(STAGE2) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE2)/$(QASTNODE_JAR) $(STAGE2)/$(QASTNODE_COMBINED)
 
 $(STAGE2)/$(QREGEX_JAR): $(STAGE1) $(QREGEX_SOURCES) $(STAGE2)/$(QASTNODE_JAR)
-	$(MKPATH) $(STAGE2)/gen
+	$(MKPATH) $(STAGE2)
 	$(PERL) tools/build/gen-cat.pl jvm $(QREGEX_SOURCES) > $(STAGE2)/$(QREGEX_COMBINED)
 	$(STAGE1_NQP) --module-path=$(STAGE2) --setting-path=$(STAGE2) \
          --setting=NQPCORE --no-regex-lib --target=jar \
@@ -240,30 +240,30 @@ $(STAGE2)/$(HLL_JAR): $(STAGE1) $(HLL_SOURCES) $(STAGE2)/$(QREGEX_JAR)
 	    --output=$(STAGE2)/$(HLL_JAR) $(STAGE2)/$(HLL_COMBINED)
 
 $(STAGE2)/$(JASTNODES_JAR): $(STAGE1) $(JASTNODES_SOURCES) $(STAGE2)/$(CORE_SETTING_JAR)
-	$(MKPATH) $(STAGE2)/gen
+	$(MKPATH) $(STAGE2)
 	$(PERL) tools/build/gen-cat.pl jvm $(JASTNODES_SOURCES) > $(STAGE2)/$(JASTNODES_COMBINED)
 	$(STAGE1_NQP) --module-path=$(STAGE2) --setting-path=$(STAGE2) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE2)/$(JASTNODES_JAR) $(STAGE2)/$(JASTNODES_COMBINED)
 
 $(STAGE2)/$(QAST_JAR): $(STAGE1) $(QAST_SOURCES) $(STAGE2)/$(HLL_JAR) $(STAGE2)/$(JASTNODES_JAR)
-	$(MKPATH) $(STAGE2)/gen
+	$(MKPATH) $(STAGE2)
 	$(PERL) tools/build/gen-cat.pl jvm $(QAST_SOURCES) > $(STAGE2)/$(QAST_COMBINED)
 	$(STAGE1_NQP) --module-path=$(STAGE2) --setting-path=$(STAGE2) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE2)/$(QAST_JAR) $(STAGE2)/$(QAST_COMBINED)
 
 $(STAGE2)/$(P6QREGEX_JAR): $(STAGE1) $(P6QREGEX_SOURCES) $(STAGE2)/$(QAST_JAR)
-	$(MKPATH) $(STAGE2)/gen
+	$(MKPATH) $(STAGE2)
 	$(PERL) tools/build/gen-cat.pl jvm $(P6QREGEX_SOURCES) > $(STAGE2)/$(P6QREGEX_COMBINED)
 	$(STAGE1_NQP) --module-path=$(STAGE2) --setting-path=$(STAGE2) \
          --setting=NQPCORE --no-regex-lib --target=jar \
 	    --output=$(STAGE2)/$(P6QREGEX_JAR) $(STAGE2)/$(P6QREGEX_COMBINED)
 
 $(STAGE2)/$(NQP_JAR): $(STAGE1) $(NQP_SOURCES) $(STAGE2)/$(P6QREGEX_JAR)
-	$(MKPATH) $(STAGE2)/gen
-	$(PERL) tools/build/gen-version.pl > src/gen/nqp-config.nqp
-	$(PERL) tools/build/gen-cat.pl jvm $(NQP_SOURCES) src/gen/nqp-config.nqp > $(STAGE2)/$(NQP_COMBINED)
+	$(MKPATH) $(STAGE2)
+	$(PERL) tools/build/gen-version.pl > $(STAGE2)/nqp-config.nqp
+	$(PERL) tools/build/gen-cat.pl jvm $(NQP_SOURCES) $(STAGE2)/nqp-config.nqp > $(STAGE2)/$(NQP_COMBINED)
 	$(STAGE1_NQP) --module-path=$(STAGE2) --setting-path=$(STAGE2) \
          --setting=NQPCORE --target=jar --no-regex-lib --javaclass=nqp \
 	    --output=$(STAGE2)/$(NQP_JAR) $(STAGE2)/$(NQP_COMBINED)
@@ -285,7 +285,7 @@ $(RUNNER): src/vm/jvm/runners/$(RUNNER)
 	$(CHMOD) 755 $(RUNNER)
 
 $(P5QREGEX_JAR): $(ALL_OUTPUT) $(P5QREGEX_SOURCES)
-	$(MKPATH) $(STAGE2)/gen
+	$(MKPATH) $(STAGE2)
 	$(PERL) tools/build/gen-cat.pl jvm $(P5QREGEX_SOURCES) > $(STAGE2)/$(P5QREGEX_COMBINED)
 	.@slash@$(RUNNER) --target=jar --output=$(P5QREGEX_JAR) \
 	    $(STAGE2)/$(P5QREGEX_COMBINED)