DemonWav / BuildTools / b653222d5a3

Commits

DemonWav authored b653222d5a3 14 Dec 2014

Testing removal of duplicate cloned repos

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

Modified

-111
+            runProcess( CWD, "git", "config", "--global", "user.email" );
-112
+        } catch ( Exception ex )
-113
+        {
-114
+            System.out.println( "Git email not set, setting it to default value." );
-115
+            runProcess( CWD, "git", "config", "--global", "user.email", "unconfigured@null.spigotmc.org" );
-116
+        }
-117
-118
+        File workDir = new File( "work" );
-119
+        workDir.mkdir();
-120
--
+        File bukkit = new File( "Bukkit" );
-+
+        File spigot = new File( "Spigot" );
-+
+        if ( !spigot.exists() )
-+
+        {
-+
+            clone( "https://hub.spigotmc.org/stash/scm/spigot/spigot.git", spigot );
-+
+        }
-+
-+
+        File bukkit = new File( spigot, "Bukkit" );
-128
+        if ( !bukkit.exists() )
-129
+        {
-130
+            clone( "https://hub.spigotmc.org/stash/scm/spigot/bukkit.git", bukkit );
-131
+        }
-132
--
+        File craftBukkit = new File( "CraftBukkit" );
-+
+        File craftBukkit = new File( spigot, "CraftBukkit" );
-134
+        if ( !craftBukkit.exists() )
-135
+        {
-136
+            clone( "https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git", craftBukkit );
-137
+        }
-138
--
+        File spigot = new File( "Spigot" );
--
+        if ( !spigot.exists() )
--
+        {
--
+            clone( "https://hub.spigotmc.org/stash/scm/spigot/spigot.git", spigot );
--
+        }
--
-139
+        File buildData = new File( "BuildData" );
-140
+        if ( !buildData.exists() )
-141
+        {
-142
+            clone( "https://hub.spigotmc.org/stash/scm/spigot/builddata.git", buildData );
-143
+        }
-144
-145
+        if ( !jacobeDir.exists() )
-146
+        {
-147
+            System.out.println( "Jacobe does not exist, downloading" );
-148
+            getJacobe();
-263
+            List<?> modifiedLines = DiffUtils.patch( Files.readLines( clean, Charsets.UTF_8 ), parsedPatch );
-264
-265
+            BufferedWriter bw = new BufferedWriter( new FileWriter( t ) );
-266
+            for ( String line : (List<String>) modifiedLines )
-267
+            {
-268
+                bw.write( line );
-269
+                bw.newLine();
-270
+            }
-271
+            bw.close();
-272
+        }
--
+        File tmpNms = new File( craftBukkit, "tmp-nms" );
--
+        FileUtils.copyDirectory( nmsDir, tmpNms );
-+
+        //File tmpNms = new File( craftBukkit, "tmp-nms" );
-+
+        //FileUtils.copyDirectory( nmsDir, tmpNms );
-275
-276
+        craftBukkitGit.branchDelete().setBranchNames( "patched" ).setForce( true ).call();
-277
+        craftBukkitGit.checkout().setCreateBranch( true ).setForce( true ).setName( "patched" ).call();
-278
+        craftBukkitGit.add().addFilepattern( "src/main/java/net/" ).call();
-279
+        craftBukkitGit.commit().setMessage( "CraftBukkit $ " + new Date() ).call();
--
+        craftBukkitGit.checkout().setName( "master" ).call();
-+
+        //craftBukkitGit.checkout().setName( "master" ).call();
-281
--
+        FileUtils.moveDirectory( tmpNms, nmsDir );
-+
+        //FileUtils.moveDirectory( tmpNms, nmsDir );
-283
--
+        File spigotApi = new File( spigot, "Bukkit" );
--
+        if ( !spigotApi.exists() )
--
+        {
--
+            clone( "file://" + bukkit.getAbsolutePath(), spigotApi );
--
+        }
--
+        File spigotServer = new File( spigot, "CraftBukkit" );
--
+        if ( !spigotServer.exists() )
--
+        {
--
+            clone( "file://" + craftBukkit.getAbsolutePath(), spigotServer );
--
+        }
-+
+        //File spigotApi = new File( spigot, "Bukkit" );
-+
+        //if ( !spigotApi.exists() )
-+
+        //{
-+
+        //    clone( "file://" + bukkit.getAbsolutePath(), spigotApi );
-+
+        //}
-+
+        //File spigotServer = new File( spigot, "CraftBukkit" );
-+
+        //if ( !spigotServer.exists() )
-+
+        //{
-+
+        //    clone( "file://" + craftBukkit.getAbsolutePath(), spigotServer );
-+
+        //}
-294
-295
+        // Git spigotApiGit = Git.open( spigotApi );
-296
+        // Git spigotServerGit = Git.open( spigotServer );
-297
+        if ( !skipCompile )
-298
+        {
-299
+            System.out.println( "Compiling Bukkit" );
-300
+            runProcess( bukkit, "sh", mvn, "clean", "install" );
-301
-302
+            System.out.println( "Compiling CraftBukkit" );
-303
+            runProcess( craftBukkit, "sh", mvn, "clean", "install" );
-318
+            System.err.println( "Error compiling Spigot, are you running this jar via msysgit?" );
-319
+            ex.printStackTrace();
-320
+            System.exit( 1 );
-321
+        }
-322
-323
+        for ( int i = 0; i < 35; i++ )
-324
+        {
-325
+            System.out.println( " " );
-326
+        }
-327
+        System.out.println( "Success! Everything compiled successfully. Copying final .jar files now." );
--
+        copyJar( "CraftBukkit/target", "craftbukkit", "craftbukkit-" + MC_VERSION + ".jar" );
--
+        copyJar( "Spigot/Spigot-Server/target", "spigot", "spigot-" + MC_VERSION + ".jar" );
-+
+        copyJar( new File( craftBukkit, "target" ).getAbsolutePath(), "craftbukkit", "craftbukkit-" + MC_VERSION + ".jar" );
-+
+        copyJar( new File( spigot, "Spigot-Server/target" ).getAbsolutePath(), "spigot", "spigot-" + MC_VERSION + ".jar" );
-330
+    }
-331
-332
+    public static void copyJar(String path, final String jarPrefix, String outJarName) throws Exception
-333
+    {
-334
+        File[] files = new File( path ).listFiles( new FilenameFilter()
-335
+        {
-336
+            @Override
-337
+            public boolean accept(File dir, String name)
-338
+            {
-339
+                return name.startsWith( jarPrefix ) && name.endsWith( ".jar" );

BuildTools

Commits

Jira Issues

Add shortcut