Y2K_ / BuildTools / 9c3baed030d

Commits

md_5 authored 9c3baed030d 07 Jan 2022

Do version download / check before initial clone

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

Modified

-250
+        }
-251
+        try
-252
+        {
-253
+            runProcess( CWD, "git", "config", "--global", "--includes", "user.email" );
-254
+        } catch ( Exception ex )
-255
+        {
-256
+            System.out.println( "Git email not set, setting it to default value." );
-257
+            runProcess( CWD, "git", "config", "--global", "user.email", "unconfigured@null.spigotmc.org" );
-258
+        }
-259
-+
+        if ( !dontUpdate && !dev )
-+
+        {
-+
+            String askedVersion = options.valueOf( jenkinsVersion );
-+
+            System.out.println( "Attempting to build version: '" + askedVersion + "' use --rev <version> to override" );
-+
-+
+            String verInfo;
-+
+            try
-+
+            {
-+
+                verInfo = get( "https://hub.spigotmc.org/versions/" + askedVersion + ".json" );
-+
+            } catch ( IOException ex )
-+
+            {
-+
+                System.err.println( "Could not get version " + askedVersion + " does it exist? Try another version or use 'latest'" );
-+
+                ex.printStackTrace();
-+
+                System.exit( 1 );
-+
+                return;
-+
+            }
-+
+            System.out.println( "Found version" );
-+
+            System.out.println( verInfo );
-+
-+
+            buildInfo = new Gson().fromJson( verInfo, BuildInfo.class );
-+
-+
+            if ( buildNumber != -1 && buildInfo.getToolsVersion() != -1 && buildNumber < buildInfo.getToolsVersion() )
-+
+            {
-+
+                System.err.println( "**** Your BuildTools is out of date and will not build the requested version. Please grab a new copy from https://www.spigotmc.org/go/buildtools-dl" );
-+
+                System.exit( 1 );
-+
+            }
-+
-+
+            if ( !options.has( disableJavaCheck ) )
-+
+            {
-+
+                if ( buildInfo.getJavaVersions() == null )
-+
+                {
-+
+                    buildInfo.setJavaVersions( new int[]
-+
+                    {
-+
+                        JavaVersion.JAVA_7.getVersion(), JavaVersion.JAVA_8.getVersion()
-+
+                    } );
-+
+                }
-+
-+
+                Preconditions.checkArgument( buildInfo.getJavaVersions().length == 2, "Expected only two Java versions, got %s", JavaVersion.printVersions( buildInfo.getJavaVersions() ) );
-+
-+
+                JavaVersion curVersion = JavaVersion.getCurrentVersion();
-+
+                JavaVersion minVersion = JavaVersion.getByVersion( buildInfo.getJavaVersions()[0] );
-+
+                JavaVersion maxVersion = JavaVersion.getByVersion( buildInfo.getJavaVersions()[1] );
-+
-+
+                if ( curVersion.getVersion() < minVersion.getVersion() || curVersion.getVersion() > maxVersion.getVersion() )
-+
+                {
-+
+                    System.err.println( "*** The version you have requested to build requires Java versions between " + JavaVersion.printVersions( buildInfo.getJavaVersions() ) + ", but you are using " + curVersion );
-+
+                    System.err.println( "*** Please rerun BuildTools using an appropriate Java version. For obvious reasons outdated MC versions do not support Java versions that did not exist at their release." );
-+
+                    System.exit( 1 );
-+
+                }
-+
+            }
-+
+        }
-+
-312
+        File workDir = new File( "work" );
-313
+        workDir.mkdir();
-314
-315
+        File bukkit = new File( "Bukkit" );
-316
+        if ( !bukkit.exists() || !containsGit( bukkit ) )
-317
+        {
-318
+            clone( "https://hub.spigotmc.org/stash/scm/spigot/bukkit.git", bukkit );
-319
+        }
-320
-321
+        File craftBukkit = new File( "CraftBukkit" );
-356
+            }
-357
+        }
-358
-359
+        Git bukkitGit = Git.open( bukkit );
-360
+        Git craftBukkitGit = Git.open( craftBukkit );
-361
+        Git spigotGit = Git.open( spigot );
-362
+        Git buildGit = Git.open( buildData );
-363
-364
+        if ( !dontUpdate )
-365
+        {
--
+            if ( !dev )
--
+            {
--
+                String askedVersion = options.valueOf( jenkinsVersion );
--
+                System.out.println( "Attempting to build version: '" + askedVersion + "' use --rev <version> to override" );
--
--
+                String verInfo;
--
+                try
--
+                {
--
+                    verInfo = get( "https://hub.spigotmc.org/versions/" + askedVersion + ".json" );
--
+                } catch ( IOException ex )
--
+                {
--
+                    System.err.println( "Could not get version " + askedVersion + " does it exist? Try another version or use 'latest'" );
--
+                    ex.printStackTrace();
--
+                    System.exit( 1 );
--
+                    return;
--
+                }
--
+                System.out.println( "Found version" );
--
+                System.out.println( verInfo );
--
--
+                buildInfo = new Gson().fromJson( verInfo, BuildInfo.class );
--
--
+                if ( buildNumber != -1 && buildInfo.getToolsVersion() != -1 && buildNumber < buildInfo.getToolsVersion() )
--
+                {
--
+                    System.err.println( "**** Your BuildTools is out of date and will not build the requested version. Please grab a new copy from https://www.spigotmc.org/go/buildtools-dl" );
--
+                    System.exit( 1 );
--
+                }
--
--
+                if ( !options.has( disableJavaCheck ) )
--
+                {
--
+                    if ( buildInfo.getJavaVersions() == null )
--
+                    {
--
+                        buildInfo.setJavaVersions( new int[]
--
+                        {
--
+                            JavaVersion.JAVA_7.getVersion(), JavaVersion.JAVA_8.getVersion()
--
+                        } );
--
+                    }
--
--
+                    Preconditions.checkArgument( buildInfo.getJavaVersions().length == 2, "Expected only two Java versions, got %s", JavaVersion.printVersions( buildInfo.getJavaVersions() ) );
--
--
+                    JavaVersion curVersion = JavaVersion.getCurrentVersion();
--
+                    JavaVersion minVersion = JavaVersion.getByVersion( buildInfo.getJavaVersions()[0] );
--
+                    JavaVersion maxVersion = JavaVersion.getByVersion( buildInfo.getJavaVersions()[1] );
--
--
+                    if ( curVersion.getVersion() < minVersion.getVersion() || curVersion.getVersion() > maxVersion.getVersion() )
--
+                    {
--
+                        System.err.println( "*** The version you have requested to build requires Java versions between " + JavaVersion.printVersions( buildInfo.getJavaVersions() ) + ", but you are using " + curVersion );
--
+                        System.err.println( "*** Please rerun BuildTools using an appropriate Java version. For obvious reasons outdated MC versions do not support Java versions that did not exist at their release." );
--
+                        System.exit( 1 );
--
+                    }
--
+                }
--
+            }
--
-366
+            boolean buildDataChanged = pull( buildGit, buildInfo.getRefs().getBuildData() );
-367
+            boolean bukkitChanged = pull( bukkitGit, buildInfo.getRefs().getBukkit() );
-368
+            boolean craftBukkitChanged = pull( craftBukkitGit, buildInfo.getRefs().getCraftBukkit() );
-369
+            boolean spigotChanged = pull( spigotGit, buildInfo.getRefs().getSpigot() );
-370
-371
+            // Checks if any of the 4 repositories have been updated via a fetch, the --compile-if-changed flag is set and none of the repositories were cloned in this run.
-372
+            if ( !buildDataChanged && !bukkitChanged && !craftBukkitChanged && !spigotChanged && options.has( compileIfChanged ) && !didClone )
-373
+            {
-374
+                System.out.println( "*** No changes detected in any of the repositories!" );
-375
+                System.out.println( "*** Exiting due to the --compile-if-changes" );

BuildTools

Commits

Jira Issues

Add shortcut