Commits

md_5 authored 2f33f39df47 
Remove warnings for non-existent Maven profiles
No tags
1f7c0c759ce
master

src/main/java/org/spigotmc/builder/Builder.java

Modified
491 491 memberMappings = new File( workDir, "bukkit-" + mappingsVersion + "-members.csrg" );
492 492 mapUtil.makeFieldMaps( mojangMappings, memberMappings, true );
493 493 } else if ( !fieldMappings.exists() )
494 494 {
495 495 mapUtil.makeFieldMaps( mojangMappings, fieldMappings, false );
496 496 }
497 497 ​
498 498 // 1.17+
499 499 if ( memberMappings.exists() )
500 500 {
501 - runMaven( CWD, "install:install-file", "-Dfile=" + memberMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc",
501 + runMavenInstall( CWD, "install:install-file", "-Dfile=" + memberMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc",
502 502 "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot-members", "-DgeneratePom=false" );
503 503 }
504 504 ​
505 505 // 1.17
506 506 if ( fieldMappings.exists() )
507 507 {
508 - runMaven( CWD, "install:install-file", "-Dfile=" + fieldMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc",
508 + runMavenInstall( CWD, "install:install-file", "-Dfile=" + fieldMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc",
509 509 "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot-fields", "-DgeneratePom=false" );
510 510 ​
511 511 File combinedMappings = new File( workDir, "bukkit-" + mappingsVersion + "-combined.csrg" );
512 512 if ( !combinedMappings.exists() )
513 513 {
514 514 mapUtil.makeCombinedMaps( combinedMappings, memberMappings );
515 515 }
516 516 ​
517 - runMaven( CWD, "install:install-file", "-Dfile=" + combinedMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc",
517 + runMavenInstall( CWD, "install:install-file", "-Dfile=" + combinedMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc",
518 518 "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot", "-DgeneratePom=false" );
519 519 } else
520 520 {
521 521 // 1.18+
522 - runMaven( CWD, "install:install-file", "-Dfile=" + classMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc",
522 + runMavenInstall( CWD, "install:install-file", "-Dfile=" + classMappings, "-Dpackaging=csrg", "-DgroupId=org.spigotmc",
523 523 "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-spigot", "-DgeneratePom=false" );
524 524 }
525 525 ​
526 526 // 1.17+
527 - runMaven( CWD, "install:install-file", "-Dfile=" + mojangMappings, "-Dpackaging=txt", "-DgroupId=org.spigotmc",
527 + runMavenInstall( CWD, "install:install-file", "-Dfile=" + mojangMappings, "-Dpackaging=txt", "-DgroupId=org.spigotmc",
528 528 "-DartifactId=minecraft-server", "-Dversion=" + versionInfo.getSpigotVersion(), "-Dclassifier=maps-mojang", "-DgeneratePom=false" );
529 529 }
530 530 ​
531 531 File clMappedJar = new File( finalMappedJar + "-cl" );
532 532 File mMappedJar = new File( finalMappedJar + "-m" );
533 533 ​
534 534 if ( versionInfo.getClassMapCommand() == null )
535 535 {
536 536 versionInfo.setClassMapCommand( "java -jar BuildData/bin/SpecialSource-2.jar map -i {0} -m {1} -o {2}" );
537 537 }
545 545 memberMappings.getPath(), mMappedJar.getPath() ).split( " " ) );
546 546 ​
547 547 if ( versionInfo.getFinalMapCommand() == null )
548 548 {
549 549 versionInfo.setFinalMapCommand( "java -jar BuildData/bin/SpecialSource.jar --kill-lvt -i {0} --access-transformer {1} -m {2} -o {3}" );
550 550 }
551 551 runProcess( CWD, MessageFormat.format( versionInfo.getFinalMapCommand(), mMappedJar.getPath(), "BuildData/mappings/" + versionInfo.getAccessTransforms(),
552 552 ( versionInfo.getPackageMappings() == null ) ? fieldMappings.getPath() : "BuildData/mappings/" + versionInfo.getPackageMappings(), finalMappedJar.getPath() ).split( " " ) );
553 553 }
554 554 ​
555 - runMaven( CWD, "install:install-file", "-Dfile=" + finalMappedJar, "-Dpackaging=jar", "-DgroupId=org.spigotmc",
555 + runMavenInstall( CWD, "install:install-file", "-Dfile=" + finalMappedJar, "-Dpackaging=jar", "-DgroupId=org.spigotmc",
556 556 "-DartifactId=minecraft-server", "-Dversion=" + ( versionInfo.getSpigotVersion() != null ? versionInfo.getSpigotVersion() : versionInfo.getMinecraftVersion() + "-SNAPSHOT" ) );
557 557 ​
558 558 File decompileDir = new File( workDir, "decompile-" + mappingsVersion );
559 559 if ( !decompileDir.exists() )
560 560 {
561 561 decompileDir.mkdir();
562 562 ​
563 563 File clazzDir = new File( decompileDir, "classes" );
564 564 unzip( finalMappedJar, clazzDir, (input) -> input.startsWith( "net/minecraft" ) );
565 565 if ( versionInfo.getDecompileCommand() == null )
680 680 {
681 681 compile = Arrays.asList( Compile.CRAFTBUKKIT, Compile.SPIGOT );
682 682 } else
683 683 {
684 684 compile = Collections.singletonList( Compile.SPIGOT );
685 685 }
686 686 }
687 687 if ( compile.contains( Compile.CRAFTBUKKIT ) )
688 688 {
689 689 System.out.println( "Compiling Bukkit" );
690 - runMaven( bukkit, "clean", "install" );
690 + runMavenAPI( bukkit, "clean", "install" );
691 691 if ( generateDocs )
692 692 {
693 - runMaven( bukkit, "javadoc:jar" );
693 + runMavenAPI( bukkit, "javadoc:jar" );
694 694 }
695 695 if ( generateSource )
696 696 {
697 - runMaven( bukkit, "source:jar" );
697 + runMavenAPI( bukkit, "source:jar" );
698 698 }
699 699 ​
700 700 System.out.println( "Compiling CraftBukkit" );
701 - runMaven( craftBukkit, "clean", "install" );
701 + runMavenServer( craftBukkit, "clean", "install" );
702 702 }
703 703 ​
704 704 try
705 705 {
706 706 runProcess( spigot, applyPatchesShell, "applyPatches.sh" );
707 707 System.out.println( "*** Spigot patches applied!" );
708 708 ​
709 709 if ( compile.contains( Compile.SPIGOT ) )
710 710 {
711 711 System.out.println( "Compiling Spigot & Spigot-API" );
712 - runMaven( spigot, "clean", "install" );
712 + runMavenServer( spigot, "clean", "install" );
713 713 ​
714 714 File spigotApi = new File( spigot, "Spigot-API" );
715 715 if ( generateDocs )
716 716 {
717 - runMaven( spigotApi, "javadoc:jar" );
717 + runMavenAPI( spigotApi, "javadoc:jar" );
718 718 }
719 719 if ( generateSource )
720 720 {
721 - runMaven( spigotApi, "source:jar" );
721 + runMavenAPI( spigotApi, "source:jar" );
722 722 }
723 723 }
724 724 } catch ( Exception ex )
725 725 {
726 726 System.err.println( "Error compiling Spigot. Please check the wiki for FAQs." );
727 727 System.err.println( "If this does not resolve your issue then please pastebin the entire BuildTools.log.txt file when seeking support." );
728 728 ex.printStackTrace();
729 729 System.exit( 1 );
730 730 }
731 731 ​
838 838 if ( ref.equals( "master" ) )
839 839 {
840 840 repo.reset().setRef( "origin/master" ).setMode( ResetCommand.ResetType.HARD ).call();
841 841 }
842 842 System.out.println( "Checked out: " + ref );
843 843 ​
844 844 // Return true if fetch changed any tracking refs.
845 845 return !result.getTrackingRefUpdates().isEmpty();
846 846 }
847 847 ​
848 - public static int runMaven(File workDir, String... command) throws Exception
848 + private static int runMavenInstall(File workDir, String... command) throws Exception
849 + {
850 + return runMaven0( workDir, false, false, command );
851 + }
852 +​
853 + private static int runMavenAPI(File workDir, String... command) throws Exception
854 + {
855 + return runMaven0( workDir, dev, false, command );
856 + }
857 +​
858 + private static int runMavenServer(File workDir, String... command) throws Exception
859 + {
860 + return runMaven0( workDir, dev, remapped, command );
861 + }
862 +​
863 + private static int runMaven0(File workDir, boolean dev, boolean remapped, String... command) throws Exception
849 864 {
850 865 List<String> args = new LinkedList<>();
851 866 ​
852 867 if ( IS_WINDOWS )
853 868 {
854 869 args.add( maven.getAbsolutePath() + "/bin/mvn.cmd" );
855 870 } else
856 871 {
857 872 args.add( "sh" );
858 873 args.add( maven.getAbsolutePath() + "/bin/mvn" );

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut