Ginger Geek / BuildTools / 925ce399c85

Commits

md_5 authored 925ce399c85 08 Nov 2017

Beta: Automatically download and use portable version of git on Windows.

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

Modified

-1
+package org.spigotmc.builder;
-2
-3
+import com.google.common.base.Charsets;
-4
+import com.google.common.base.Predicate;
-5
+import com.google.common.base.Throwables;
-6
+import com.google.common.collect.Iterables;
-+
+import com.google.common.collect.ObjectArrays;
-8
+import com.google.common.hash.Hasher;
-9
+import com.google.common.hash.Hashing;
-10
+import com.google.common.io.ByteStreams;
-11
+import com.google.common.io.CharStreams;
-12
+import com.google.common.io.Files;
-13
+import com.google.common.io.Resources;
-14
+import com.google.gson.Gson;
-15
+import difflib.DiffUtils;
-16
+import difflib.Patch;
-17
+import java.awt.Desktop;
-69
+    public static final String LOG_FILE = "BuildTools.log.txt";
-70
+    public static final boolean IS_WINDOWS = System.getProperty( "os.name" ).startsWith( "Windows" );
-71
+    public static final File CWD = new File( "." );
-72
+    private static final boolean autocrlf = !"\n".equals( System.getProperty( "line.separator" ) );
-73
+    private static boolean dontUpdate;
-74
+    private static boolean skipCompile;
-75
+    private static boolean generateSource;
-76
+    private static boolean generateDocs;
-77
+    private static boolean dev;
-78
+    private static String applyPatchesShell = "sh";
-+
+    //
-+
+    private static File msysDir;
-81
-82
+    public static void main(String[] args) throws Exception
-83
+    {
-84
+        if ( CWD.getAbsolutePath().contains( "'" ) || CWD.getAbsolutePath().contains( "#" ) )
-85
+        {
-86
+            System.err.println( "Please do not run in a path with special characters!" );
-87
+            return;
-88
+        }
-89
-90
+        if ( false && System.console() == null )
-139
+        generateDocs = options.has( generateDocsFlag );
-140
+        dev = options.has( devFlag );
-141
-142
+        logOutput();
-143
-144
+        try
-145
+        {
-146
+            runProcess( CWD, "sh", "-c", "exit" );
-147
+        } catch ( Exception ex )
-148
+        {
--
+            System.out.println( "You must run this jar through bash (msysgit)" );
--
+            System.exit( 1 );
-+
+            if ( IS_WINDOWS )
-+
+            {
-+
+                String gitVersion = "PortableGit-2.15.0-" + ( System.getProperty( "os.arch" ).endsWith( "64" ) ? "64" : "32" ) + "-bit";
-+
+                msysDir = new File( gitVersion, "PortableGit" );
-+
-+
+                if ( !msysDir.isDirectory() )
-+
+                {
-+
+                    System.out.println( "*** Could not find PortableGit installation, downloading. ***" );
-+
-+
+                    String gitName = gitVersion + ".7z.exe";
-+
+                    File gitInstall = new File( gitVersion, gitName );
-+
+                    gitInstall.getParentFile().mkdirs();
-+
-+
+                    if ( !gitInstall.exists() )
-+
+                    {
-+
+                        download( "https://static.spigotmc.org/git/" + gitName, gitInstall );
-+
+                    }
-+
-+
+                    System.out.println( "Extracting downloaded git install" );
-+
+                    // yes to all, silent, don't run. Only -y seems to work
-+
+                    runProcess( gitInstall.getParentFile(), gitInstall.getAbsolutePath(), "-y", "-gm2", "-nr" );
-+
-+
+                    gitInstall.delete();
-+
+                }
-+
-+
+                System.out.println( "*** Using downloaded git " + msysDir + " ***" );
-+
+                System.out.println( "*** Please note that this is a beta feature, so if it does not work please also try a manual install of git from https://git-for-windows.github.io/ ***" );
-+
+            } else
-+
+            {
-+
+                System.out.println( "You must run this jar through bash (msysgit)" );
-+
+                System.exit( 1 );
-+
+            }
-181
+        }
-182
-183
+        try
-184
+        {
-185
+            runProcess( CWD, "git", "config", "--global", "--includes", "user.name" );
-186
+        } catch ( Exception ex )
-187
+        {
-188
+            System.out.println( "Git name not set, setting it to default value." );
-189
+            runProcess( CWD, "git", "config", "--global", "user.name", "BuildTools" );
-190
+        }
-565
-566
+        repo.reset().setRef( ref ).setMode( ResetCommand.ResetType.HARD ).call();
-567
+        if ( ref.equals( "master" ) )
-568
+        {
-569
+            repo.reset().setRef( "origin/master" ).setMode( ResetCommand.ResetType.HARD ).call();
-570
+        }
-571
+        System.out.println( "Checked out: " + ref );
-572
+    }
-573
-574
+    public static int runProcess(File workDir, String... command) throws Exception
-+
+    {
-+
+        if ( msysDir != null )
-+
+        {
-+
+            if ( "bash".equals( command[0] ) )
-+
+            {
-+
+                command[0] = "git-bash";
-+
+            }
-+
+            String[] shim = new String[]
-+
+            {
-+
+                "cmd.exe", "/C"
-+
+            };
-+
+            command = ObjectArrays.concat( shim, command, String.class );
-+
+        }
-+
+        return runProcess0( workDir, command );
-+
+    }
-+
-+
+    private static int runProcess0(File workDir, String... command) throws Exception
-592
+    {
-593
+        ProcessBuilder pb = new ProcessBuilder( command );
-594
+        pb.directory( workDir );
-595
+        pb.environment().put( "JAVA_HOME", System.getProperty( "java.home" ) );
-596
+        if ( !pb.environment().containsKey( "MAVEN_OPTS" ) )
-597
+        {
-598
+            pb.environment().put( "MAVEN_OPTS", "-Xmx1024M" );
-599
+        }
-+
+        if ( msysDir != null )
-+
+        {
-+
+            String pathEnv = null;
-+
+            for ( String key : pb.environment().keySet() )
-+
+            {
-+
+                if ( key.equalsIgnoreCase( "path" ) )
-+
+                {
-+
+                    pathEnv = key;
-+
+                }
-+
+            }
-+
+            if ( pathEnv == null )
-+
+            {
-+
+                throw new IllegalStateException( "Could not find path variable!" );
-+
+            }
-+
-+
+            String path = pb.environment().get( pathEnv );
-+
+            path += ";" + msysDir.getAbsolutePath();
-+
+            path += ";" + new File( msysDir, "bin" ).getAbsolutePath();
-+
+            pb.environment().put( pathEnv, path );
-+
+        }
-620
-621
+        final Process ps = pb.start();
-622
-623
+        new Thread( new StreamRedirector( ps.getInputStream(), System.out ) ).start();
-624
+        new Thread( new StreamRedirector( ps.getErrorStream(), System.err ) ).start();
-625
-626
+        int status = ps.waitFor();
-627
-628
+        if ( status != 0 )
-629
+        {

BuildTools

Commits

Jira Issues

Add shortcut