Mercurial > hg > truffle

comparison src/share/tools/ProjectCreator/BuildConfig.java @ 21792:da7e30544879

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix windows build for jvmci (JBS:GRAAL-52)
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Mon, 08 Jun 2015 17:04:02 +0200
parents 2a69cbe850a8
children
comparison
equal deleted inserted replaced
21791:cd36556e1b78 21792:da7e30544879
73 int lastDirectorySeparator = Math.max(outDir.lastIndexOf("/"), outDir.lastIndexOf("\\")); 73 int lastDirectorySeparator = Math.max(outDir.lastIndexOf("/"), outDir.lastIndexOf("\\"));
74 if (lastDirectorySeparator >= 0) { 74 if (lastDirectorySeparator >= 0) {
75 outDir = outDir.substring(0, lastDirectorySeparator); 75 outDir = outDir.substring(0, lastDirectorySeparator);
76 } 76 }
77 outDir += Util.sep + build + Util.sep + "jre" + Util.sep + "bin"; 77 outDir += Util.sep + build + Util.sep + "jre" + Util.sep + "bin";
78 if (flavour.equals("graal")) { 78 if (flavour.equals("jvmci")) {
79 outDir += Util.sep + "graal"; 79 outDir += Util.sep + "jvmci";
80 } else if (flavour.equals("compiler1")) { 80 } else if (flavour.equals("compiler1")) {
81 outDir += Util.sep + "client"; 81 outDir += Util.sep + "client";
82 } else { 82 } else {
83 outDir += Util.sep + "server"; 83 outDir += Util.sep + "server";
84 } 84 }
557 String getOptFlag() { 557 String getOptFlag() {
558 return getCI().getNoOptFlag(); 558 return getCI().getNoOptFlag();
559 } 559 }
560 560
561 GraalDebugConfig() { 561 GraalDebugConfig() {
562 initNames("graal", "debug", "jvm.dll"); 562 initNames("jvmci", "debug", "jvm.dll");
563 init(getIncludes(), getDefines()); 563 init(getIncludes(), getDefines());
564 } 564 }
565 } 565 }
566 566
567 class GraalFastDebugConfig extends GenericDebugNonKernelConfig { 567 class GraalFastDebugConfig extends GenericDebugNonKernelConfig {
568 String getOptFlag() { 568 String getOptFlag() {
569 return getCI().getOptFlag(); 569 return getCI().getOptFlag();
570 } 570 }
571 571
572 GraalFastDebugConfig() { 572 GraalFastDebugConfig() {
573 initNames("graal", "fastdebug", "jvm.dll"); 573 initNames("jvmci", "fastdebug", "jvm.dll");
574 init(getIncludes(), getDefines()); 574 init(getIncludes(), getDefines());
575 } 575 }
576 } 576 }
577 577
578 class C1DebugConfig extends GenericDebugNonKernelConfig { 578 class C1DebugConfig extends GenericDebugNonKernelConfig {
653 } 653 }
654 } 654 }
655 655
656 class GraalProductConfig extends ProductConfig { 656 class GraalProductConfig extends ProductConfig {
657 GraalProductConfig() { 657 GraalProductConfig() {
658 initNames("graal", "product", "jvm.dll"); 658 initNames("jvmci", "product", "jvm.dll");
659 init(getIncludes(), getDefines()); 659 init(getIncludes(), getDefines());
660 } 660 }
661 } 661 }
662 662
663 class C1ProductConfig extends ProductConfig { 663 class C1ProductConfig extends ProductConfig {