DemonWav / BuildTools / 65e9b035509

Commits

Thinkofname authored 65e9b035509 16 Mar 2015

Fix a few issues

Tags

No tags

0165b6e1c77

Download source

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

Modified

-55
+import org.apache.commons.io.output.TeeOutputStream;
-56
+import org.eclipse.jgit.api.AddCommand;
-57
+import org.eclipse.jgit.api.FetchCommand;
-58
+import org.eclipse.jgit.api.Git;
-59
+import org.eclipse.jgit.api.ResetCommand;
-60
+import org.eclipse.jgit.api.errors.GitAPIException;
-61
+import org.eclipse.jgit.lib.CoreConfig;
-62
+import org.eclipse.jgit.lib.Repository;
-63
+import org.eclipse.jgit.lib.StoredConfig;
-64
+import org.eclipse.jgit.revwalk.RevCommit;
-+
+import org.eclipse.jgit.transport.FetchResult;
-66
+import org.eclipse.jgit.transport.RefSpec;
-67
+import org.eclipse.jgit.transport.RemoteConfig;
-68
+import org.eclipse.jgit.transport.TagOpt;
-69
+import org.eclipse.jgit.transport.URIish;
-70
-71
+public class Builder
-72
+{
-73
-74
+    public static final String LOG_FILE = "BuildTools.log.txt";
-75
+    public static final boolean IS_WINDOWS = System.getProperty( "os.name" ).startsWith( "Windows" );
-403
+        System.out.println( "Success! Everything compiled successfully. Copying final .jar files now." );
-404
+        copyJar( "CraftBukkit/target", "craftbukkit", "craftbukkit-" + versionInfo.getMinecraftVersion() + ".jar" );
-405
+        copyJar( "Spigot/Spigot-Server/target", "spigot", "spigot-" + versionInfo.getMinecraftVersion() + ".jar" );
-406
+    }
-407
-408
+    public static void applyPatches(File base, File orig, File target, File patches, String branch) throws Exception
-409
+    {
-410
+        System.out.println( "Applying patches to " + target );
-411
+        Git gitOrig = Git.open( orig );
-412
--
+        gitOrig.fetch()
--
+                .setRemote( "file://" + base.getAbsolutePath() )
-+
+        FetchResult fr = gitOrig.fetch()
-+
+                .setRemote( base.toURI().toString() )
-415
+                .setRefSpecs( new RefSpec( "refs/heads/*:refs/remotes/origin/*" ) )
-416
+                .call();
-417
+        gitOrig.reset()
--
+                .setRef( "origin/" + branch )
-+
+                .setRef( fr.getAdvertisedRef( "refs/heads/" + branch ).getObjectId().getName() )
-419
+                .setMode( ResetCommand.ResetType.HARD )
-420
+                .call();
-421
+        gitOrig.branchCreate()
-422
+                .setName( "upstream" )
-423
+                .setForce( true )
-424
+                .call();
-425
-426
+        clone( orig.toURI().toString(), target );
-427
+        Git git = Git.open( target );
-428
-429
+        StoredConfig config = git.getRepository().getConfig();
-430
+        config.setString( "remote", "upstream", "url", "file://" + orig.getAbsolutePath() );
-431
+        config.save();
-432
-433
+        git.branchCreate()
-434
+                .setName( "master" )
-435
+                .setForce( true )
-436
+                .call();
-437
+        git.checkout()
-438
+                .setName( "master" )
-439
+                .call();
--
+        git.fetch()
--
+                .setRemote( "upstream" )
--
+                .setRefSpecs( new RefSpec( "refs/heads/*:refs/remotes/upstream/*" ) )
--
+                .call();
-440
+        git.reset()
--
+                .setRef( "refs/remotes/upstream/upstream" )
-+
+                .setRef( "origin/upstream" )
-442
+                .setMode( ResetCommand.ResetType.HARD )
-443
+                .call();
-444
+        git.clean().setCleanDirectories( true ).call();
-445
-446
+        File[] ps = patches.listFiles();
-447
+        Arrays.sort( ps );
-448
+        for ( File patch : ps )
-449
+        {
-450
+            if ( !patch.getName().endsWith( ".patch" ) ) continue;
-451
+            System.out.println( "Applying " + patch.getName() );
-511
-512
+    public static void pull(Git repo, String ref) throws Exception
-513
+    {
-514
+        System.out.println( "Pulling updates for " + repo.getRepository().getDirectory() );
-515
-516
+        repo.reset().setRef( "origin/master" ).setMode( ResetCommand.ResetType.HARD ).call();
-517
+        repo.fetch().call();
-518
-519
+        System.out.println( "Successfully fetched updates!" );
-520
--
+        repo.reset().setRef( ref ).setMode( ResetCommand.ResetType.HARD ).call();
--
+        if ( ref.equals( "master" ) )
--
+        {
--
+            repo.reset().setRef( "origin/master" ).setMode( ResetCommand.ResetType.HARD ).call();
--
+        }
-+
+        if ( ref.equals( "master" ) ) ref = "origin/master";
-+
-+
-+
+        repo.branchCreate()
-+
+                .setForce( true )
-+
+                .setStartPoint( ref )
-+
+                .setName( "master" )
-+
+                .call();
-+
-+
+        repo.checkout()
-+
+                .setForce( true )
-+
+                .setStartPoint( ref )
-+
+                .setName( "master" )
-+
+                .call();
-535
+        System.out.println( "Checked out: " + ref );
-536
+    }
-537
-538
+    public static int maven(File workDir, String... command) throws Exception
-539
+    {
-540
+        File maven = new File( "apache-maven-3.2.3" );
-541
+        if ( !maven.exists() )
-542
+        {
-543
+            System.out.println( "Maven does not exist, downloading. Please wait." );
-544

BuildTools

Commits

Jira Issues

Add shortcut