DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 1.7.10 to reprod / drone build

Browse Source
This commit is contained in:
Jonas Herzig
2018-03-16 11:19:05 +01:00
parent 3e23826c8d
commit e32dab8749
13 changed files with 493 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gradle/reprod/patches/forgegradle-1.2/0001-Fix-build-for-newer-gradle-versions.patch Normal file
View File

@@ -0,0 +1,22 @@
From bf77ac2f526b90bd0c04a2aca7e8d9a1bc90d014 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Thu, 8 Mar 2018 17:17:32 +0100
Subject: [PATCH] Fix build for newer gradle versions
diff --git a/build.gradle b/build.gradle
index 5e61544..737ce9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -114,7 +114,7 @@ artifacts {
}
//These should add a compile time only dependancies to eclipse, ide, and javac, but NOT to the generated POM on maven.
-sourceSets.main.compileClasspath += [ configurations.compileOnly ]
+sourceSets.main.compileClasspath += configurations.compileOnly
idea.module.scopes.PROVIDED.plus += [ configurations.compileOnly ]
eclipse.classpath.plusConfigurations += [ configurations.compileOnly ]
--
2.13.6

22
gradle/reprod/patches/forgegradle-1.2/0002-Fix-compilation-with-ECJ.patch Normal file
View File

@@ -0,0 +1,22 @@
From f9056380f0e5955817df282c2ac1c8e60c9fedc2 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Thu, 8 Mar 2018 17:21:53 +0100
Subject: [PATCH] Fix compilation with ECJ
diff --git a/build.gradle b/build.gradle
index 737ce9e..75c2b62 100644
--- a/build.gradle
+++ b/build.gradle
@@ -90,7 +90,7 @@ dependencies {
compileJava {
options.deprecation = true
- options.compilerArgs += ["-Werror"]
+ //options.compilerArgs += ["-Werror"]
//options.compilerArgs += ["-Werror", "-Xlint:unchecked"]
}
--
2.13.6

318
gradle/reprod/patches/forgegradle-1.2/0003-Fix-compilation-for-Gradle-3.patch Normal file
View File

@@ -0,0 +1,318 @@
From 76ef837020b1d7aa826a01bd2d3a8cdc0704a040 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Thu, 8 Mar 2018 17:31:19 +0100
Subject: [PATCH] Fix compilation for Gradle 3
diff --git a/src/main/java/net/minecraftforge/gradle/ZipFileTree.java b/src/main/java/net/minecraftforge/gradle/ZipFileTree.java
deleted file mode 100644
index c3ab7e3..0000000
--- a/src/main/java/net/minecraftforge/gradle/ZipFileTree.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Modified by LexManos 10/23/2013 to remove FileSystemMirroringFileTree
-package net.minecraftforge.gradle;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.apache.commons.io.IOUtils;
-import org.gradle.api.GradleException;
-import org.gradle.api.InvalidUserDataException;
-import org.gradle.api.UncheckedIOException;
-import org.gradle.api.file.FileVisitDetails;
-import org.gradle.api.file.FileVisitor;
-import org.gradle.api.file.RelativePath;
-import org.gradle.api.internal.file.collections.MinimalFileTree;
-import org.gradle.util.DeprecationLogger;
-import org.gradle.util.GFileUtils;
-
-public class ZipFileTree implements MinimalFileTree
-{
- private final File zipFile;
-
- public ZipFileTree(File zipFile)
- {
- this.zipFile = zipFile;
- }
-
- public String getDisplayName()
- {
- return String.format("ZIP '%s'", zipFile);
- }
-
- public void visit(FileVisitor visitor)
- {
- if (!zipFile.exists())
- {
- DeprecationLogger.nagUserOfDeprecatedBehaviour(
- String.format("The specified zip file %s does not exist and will be silently ignored", getDisplayName())
- );
- return;
- }
- if (!zipFile.isFile())
- {
- throw new InvalidUserDataException(String.format("Cannot expand %s as it is not a file.", getDisplayName()));
- }
-
- AtomicBoolean stopFlag = new AtomicBoolean();
-
- try
- {
- ZipFile zip = new ZipFile(zipFile);
- try
- {
- // The iteration order of zip.getEntries() is based on the hash of the zip entry. This isn't much use
- // to us. So, collect the entries in a map and iterate over them in alphabetical order.
- Map<String, ZipEntry> entriesByName = new TreeMap<String, ZipEntry>();
- Enumeration<? extends ZipEntry> entries = zip.entries();
- while (entries.hasMoreElements())
- {
- ZipEntry entry = (ZipEntry) entries.nextElement();
- entriesByName.put(entry.getName(), entry);
- }
- Iterator<ZipEntry> sortedEntries = entriesByName.values().iterator();
- while (!stopFlag.get() && sortedEntries.hasNext())
- {
- ZipEntry entry = sortedEntries.next();
- if (entry.isDirectory())
- {
- visitor.visitDir(new DetailsImpl(entry, zip, stopFlag));
- }
- else
- {
- visitor.visitFile(new DetailsImpl(entry, zip, stopFlag));
- }
- }
- }
- finally
- {
- zip.close();
- }
- }
- catch (Exception e)
- {
- throw new GradleException(String.format("Could not expand %s.", getDisplayName()), e);
- }
- }
-
- private class DetailsImpl implements FileVisitDetails
- {
- private final ZipEntry entry;
- private final ZipFile zip;
- private final AtomicBoolean stopFlag;
- private File file;
-
- public DetailsImpl(ZipEntry entry, ZipFile zip, AtomicBoolean stopFlag)
- {
- this.entry = entry;
- this.zip = zip;
- this.stopFlag = stopFlag;
- }
-
- public String getDisplayName()
- {
- return String.format("zip entry %s!%s", zipFile, entry.getName());
- }
-
- public void stopVisiting()
- {
- stopFlag.set(true);
- }
-
- /**
- * Changed this to return a broken value! Be warned! Will not be a valid file, do not read it.
- * Standard Jar/Zip tasks don't care about this, even though they call it.
- */
- public File getFile()
- {
- if (file == null)
- {
- file = new File(entry.getName());
- //copyTo(file);
- }
- return file;
- }
-
- public long getLastModified()
- {
- return entry.getTime();
- }
-
- public boolean isDirectory()
- {
- return entry.isDirectory();
- }
-
- public long getSize()
- {
- return entry.getSize();
- }
-
- public InputStream open()
- {
- try
- {
- return zip.getInputStream(entry);
- }
- catch (IOException e)
- {
- throw new UncheckedIOException(e);
- }
- }
-
- public RelativePath getRelativePath()
- {
- return new RelativePath(!entry.isDirectory(), entry.getName().split("/"));
- }
-
- // Stuff below this line was --------------------------------------------------
- // Stolen from Gradle's org.gradle.api.internal.file.AbstractFileTreeElement
-
- public String toString()
- {
- return getDisplayName();
- }
-
- public String getName()
- {
- return getRelativePath().getLastName();
- }
-
- public String getPath()
- {
- return getRelativePath().getPathString();
- }
-
- public void copyTo(OutputStream outstr)
- {
- try
- {
- InputStream inputStream = open();
- try
- {
- IOUtils.copyLarge(inputStream, outstr);
- }
- finally
- {
- inputStream.close();
- }
- }
- catch (IOException e)
- {
- throw new UncheckedIOException(e);
- }
- }
-
- public boolean copyTo(File target)
- {
- validateTimeStamps();
- try
- {
- if (isDirectory())
- {
- GFileUtils.mkdirs(target);
- }
- else
- {
- GFileUtils.mkdirs(target.getParentFile());
- copyFile(target);
- }
- return true;
- }
- catch (Exception e)
- {
- throw new GradleException(String.format("Could not copy %s to '%s'.", new Object[] { getDisplayName(), target }), e);
- }
- }
-
- private void validateTimeStamps()
- {
- long lastModified = getLastModified();
- if (lastModified < 0L)
- throw new GradleException(String.format("Invalid Timestamp %s for '%s'.", new Object[] { Long.valueOf(lastModified), getDisplayName() }));
- }
-
- private void copyFile(File target) throws IOException
- {
- FileOutputStream outputStream = new FileOutputStream(target);
- try
- {
- copyTo(outputStream);
- }
- finally
- {
- outputStream.close();
- }
- }
-
- public int getMode()
- {
- return ((isDirectory()) ? 493 : 420);
- }
- }
-}
diff --git a/src/main/java/net/minecraftforge/gradle/delayed/DelayedFileTree.java b/src/main/java/net/minecraftforge/gradle/delayed/DelayedFileTree.java
index 5ecccae..aeed0a3 100644
--- a/src/main/java/net/minecraftforge/gradle/delayed/DelayedFileTree.java
+++ b/src/main/java/net/minecraftforge/gradle/delayed/DelayedFileTree.java
@@ -1,10 +1,7 @@
package net.minecraftforge.gradle.delayed;
-import net.minecraftforge.gradle.ZipFileTree;
-
import org.gradle.api.Project;
import org.gradle.api.file.FileTree;
-import org.gradle.api.internal.file.collections.FileTreeAdapter;
@SuppressWarnings("serial")
public class DelayedFileTree extends DelayedBase<FileTree>
@@ -40,7 +37,7 @@ public class DelayedFileTree extends DelayedBase<FileTree>
{
if (zipTree)
//resolved = project.zipTree(DelayedString.resolve(pattern, project, resolvers));
- return new FileTreeAdapter(new ZipFileTree(project.file(DelayedBase.resolve(pattern, project, resolvers))));
+ return project.zipTree(DelayedBase.resolve(pattern, project, resolvers));
else
return project.fileTree(DelayedBase.resolve(pattern, project, resolvers));
}
diff --git a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
index adbaa27..4d39d52 100644
--- a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
+++ b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
@@ -1129,7 +1129,6 @@ public abstract class UserBasePlugin<T extends UserExtension> extends BasePlugin
@Override
public void execute(Object arg0)
{
- ((ScalaCompile) arg0).getScalaCompileOptions().setUseAnt(false);
}
});
}
--
2.13.6

31
gradle/reprod/patches/forgegradle-1.2/0004-Remove-redundant-sourcepath-compiler-argument.patch Normal file
View File

@@ -0,0 +1,31 @@
From 58e8ce507b599b45479aa0d6d823a4e285aecb58 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Thu, 8 Mar 2018 19:38:05 +0100
Subject: [PATCH] Remove redundant -sourcepath compiler argument
diff --git a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
index 4d39d52..f2995e9 100644
--- a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
+++ b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
@@ -354,17 +354,6 @@ public abstract class UserBasePlugin<T extends UserExtension> extends BasePlugin
project.getConfigurations().getByName("apiCompile").extendsFrom(project.getConfigurations().getByName("compile"));
project.getConfigurations().getByName("testCompile").extendsFrom(project.getConfigurations().getByName("apiCompile"));
-
- // set compile not to take from libs
- JavaCompile compileTask = ((JavaCompile)project.getTasks().getByName(main.getCompileJavaTaskName()));
- List<String> args = compileTask.getOptions().getCompilerArgs();
- if (args == null || args.isEmpty())
- {
- args = Lists.newArrayList();
- }
- args.add("-sourcepath");
- args.add(".");
- compileTask.getOptions().setCompilerArgs(args);
}
private void readAndApplyJson(File file, String depConfig, String nativeConfig, Logger log)
--
2.13.6