Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2025-02-21 02:33:24 +01:00
Code Issues Projects Releases Wiki Activity

Fix .url.txt not working if building from within creator tools.

Browse Source
This commit is contained in:
sk89q 2016-09-05 12:14:55 -07:00
parent 34f7035bb0
commit 64ed29f9c0
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
creator-tools/src/main/java/com/skcraft/launcher/creator/Creator.java
View File

@ -35,8 +35,6 @@ public class Creator {
this.dataDir = getAppDataDir();
this.config = Persistence.load(new File(dataDir, "config.json"), CreatorConfig.class);
System.setProperty("com.skcraft.builder.ignoreURLOverrides", "true");
// Remove deleted workspaces
List<RecentEntry> recentEntries = config.getRecentEntries();
Iterator<RecentEntry> it = recentEntries.iterator();

4
creator-tools/src/main/java/com/skcraft/launcher/creator/controller/PackManagerController.java
View File

@ -748,7 +748,7 @@ public class PackManagerController {
String version = generateVersionFromDate();
PackBuilder builder = new PackBuilder(pack, webRoot, version, "staging.json", false);
PackBuilder builder = new PackBuilder(pack, webRoot, version, "staging.json", false, false);
InstanceList.Enumerator enumerator = launcher.getInstances().createEnumerator();
TestLauncher instanceLauncher = new TestLauncher(launcher, frame, pack.getCachedConfig().getName(), session);
@ -773,7 +773,7 @@ public class PackManagerController {
if (options != null) {
ConsoleFrame.showMessages();
PackBuilder builder = new PackBuilder(pack, options.getDestDir(), options.getVersion(), options.getManifestFilename(), false);
PackBuilder builder = new PackBuilder(pack, options.getDestDir(), options.getVersion(), options.getManifestFilename(), false, true);
Deferred<?> deferred = Deferreds.makeDeferred(executor.submit(builder), executor)
.handleAsync(result -> {
ConsoleFrame.hideMessages();

5
creator-tools/src/main/java/com/skcraft/launcher/creator/controller/task/PackBuilder.java
View File

@ -25,13 +25,15 @@ public class PackBuilder implements Callable<PackBuilder>, ProgressObservable {
private final String version;
private final String manifestFilename;
private final boolean clean;
private final boolean downloadUrls;
public PackBuilder(Pack pack, File outputDir, String version, String manifestFilename, boolean clean) {
public PackBuilder(Pack pack, File outputDir, String version, String manifestFilename, boolean clean, boolean downloadUrls) {
this.pack = pack;
this.outputDir = outputDir;
this.version = version;
this.manifestFilename = manifestFilename;
this.clean = clean;
this.downloadUrls = downloadUrls;
}
@Override
@ -54,6 +56,7 @@ public class PackBuilder implements Callable<PackBuilder>, ProgressObservable {
//noinspection ResultOfMethodCallIgnored
outputDir.mkdirs();
System.setProperty("com.skcraft.builder.ignoreURLOverrides", downloadUrls ? "false" : "true");
String[] args = {
"--version", version,
"--manifest-dest", new File(outputDir, manifestFilename).getAbsolutePath(),