diff --git a/live/bootstrap.json b/live/bootstrap.json deleted file mode 100644 index 350d1574e9..0000000000 --- a/live/bootstrap.json +++ /dev/null @@ -1,311 +0,0 @@ -{ - "buildCommit": "6fe334c02648d3f8b38625e3175e3f547d54aa37", - "client": { - "artifactId": "client", - "classifier": "", - "extension": "jar", - "groupId": "net.runelite", - "properties": "", - "version": "1.5.30" - }, - "clientJvm9Arguments": [ - "-XX:+DisableAttachMechanism", - "-Xmx512m", - "-Xss2m", - "-XX:CompileThreshold=1500", - "-Djna.nosys=true" - ], - "clientJvmArguments": [ - "-XX:+DisableAttachMechanism", - "-Xmx512m", - "-Xss2m", - "-XX:CompileThreshold=1500", - "-Xincgc", - "-XX:+UseConcMarkSweepGC", - "-XX:+UseParNewGC", - "-Djna.nosys=true" - ], - "launcherArguments": [ - "-XX:+DisableAttachMechanism", - "-Drunelite.launcher.nojvm=true", - "-Xmx512m", - "-Xss2m", - "-XX:CompileThreshold=1500", - "-Xincgc", - "-XX:+UseConcMarkSweepGC", - "-XX:+UseParNewGC", - "-Djna.nosys=true" - ], - "artifacts": [ - { - "hash": "b12331da8683e5f107d294adeebb83ecf9124abc1db533554d2a8d3c62832d75", - "name": "asm-all-6.0_BETA.jar", - "path": "https://mvn.runelite.net/org/ow2/asm/asm-all/6.0_BETA/asm-all-6.0_BETA.jar", - "size": "265176" - }, - { - "hash": "37abf0103ce5318bfda004fabc004c75ed0dc6d392a8459175692ab7eac97083", - "name": "naturalmouse-2.0.0.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/artifacts/naturalmouse-2.0.0.jar", - "size": "3168921" - }, - { - "hash": "50d1e07f11827672249dee9ce8a23691fc59f663deed084bb7b52a4f778d5fbc", - "name": "jcl-core-2.9-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/artifacts/jcl-core-2.9-SNAPSHOT.jar", - "size": "3168921" - }, - { - "hash": "0ee2a90d5f9b611b5a28cbf73b9ed5b04343d5ba6593798d343783f63e2071ad", - "name": "client-1.5.30-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/client-1.5.30-SNAPSHOT.jar", - "size": "6291757" - }, - { - "hash": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79", - "name": "slf4j-api-1.7.25.jar", - "path": "https://mvn.runelite.net/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar", - "size": "41203" - }, - { - "hash": "fb53f8539e7fcb8f093a56e138112056ec1dc809ebb020b59d8a36a5ebac37e0", - "name": "logback-classic-1.2.3.jar", - "path": "https://mvn.runelite.net/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar", - "size": "290339" - }, - { - "hash": "5946d837fe6f960c02a53eda7a6926ecc3c758bbdd69aa453ee429f858217f22", - "name": "logback-core-1.2.3.jar", - "path": "https://mvn.runelite.net/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar", - "size": "471901" - }, - { - "hash": "9f0c8d50fa4b79b6ff1502dbec8502179d6b9497cacbe17a13074001aed537ec", - "name": "jopt-simple-5.0.1.jar", - "path": "https://mvn.runelite.net/net/sf/jopt-simple/jopt-simple/5.0.1/jopt-simple-5.0.1.jar", - "size": "78826" - }, - { - "hash": "5be9a7d05ba0ccd74708bc8018ae412255f85843c0b92302e9b9befa6ed52564", - "name": "guava-23.2-jre.jar", - "path": "https://mvn.runelite.net/com/google/guava/guava/23.2-jre/guava-23.2-jre.jar", - "size": "2649860" - }, - { - "hash": "905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed", - "name": "jsr305-1.3.9.jar", - "path": "https://mvn.runelite.net/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar", - "size": "33015" - }, - { - "hash": "cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b", - "name": "error_prone_annotations-2.0.18.jar", - "path": "https://mvn.runelite.net/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar", - "size": "12078" - }, - { - "hash": "2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6", - "name": "j2objc-annotations-1.1.jar", - "path": "https://mvn.runelite.net/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar", - "size": "8782" - }, - { - "hash": "2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d", - "name": "animal-sniffer-annotations-1.14.jar", - "path": "https://mvn.runelite.net/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar", - "size": "3482" - }, - { - "hash": "9264c6931c431e928dc64adc842584d5f57d17b2f3aff29221f2b3fdea673dad", - "name": "guice-4.1.0-no_aop.jar", - "path": "https://mvn.runelite.net/com/google/inject/guice/4.1.0/guice-4.1.0-no_aop.jar", - "size": "428603" - }, - { - "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", - "name": "javax.inject-1.jar", - "path": "https://mvn.runelite.net/javax/inject/javax.inject/1/javax.inject-1.jar", - "size": "2497" - }, - { - "hash": "0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08", - "name": "aopalliance-1.0.jar", - "path": "https://mvn.runelite.net/aopalliance/aopalliance/1.0/aopalliance-1.0.jar", - "size": "4467" - }, - { - "hash": "233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81", - "name": "gson-2.8.5.jar", - "path": "https://mvn.runelite.net/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar", - "size": "241622" - }, - { - "hash": "0467d25f408428824d5c9c09ec60ee1f0bc341d9bf48971a77fd14939a826c83", - "name": "substance-8.0.02.jar", - "path": "https://repo.runelite.net/net/runelite/pushingpixels/substance/8.0.02/substance-8.0.02.jar", - "size": "1589195" - }, - { - "hash": "3214e1c23d549d5d67c91da4da1ef33c5248470bb824f91cbe8f9e0beea59eef", - "name": "trident-1.5.00.jar", - "path": "https://repo.runelite.net/net/runelite/pushingpixels/trident/1.5.00/trident-1.5.00.jar", - "size": "79726" - }, - { - "hash": "d4a57bbc1627da7c391308fd0fe910b83170fb66afd117236a5b111d2db1590b", - "name": "commons-text-1.2.jar", - "path": "https://mvn.runelite.net/org/apache/commons/commons-text/1.2/commons-text-1.2.jar", - "size": "136544" - }, - { - "hash": "6e8dc31e046508d9953c96534edf0c2e0bfe6f468966b5b842b3f87e43b6a847", - "name": "commons-lang3-3.7.jar", - "path": "https://mvn.runelite.net/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar", - "size": "499634" - }, - { - "hash": "e74603dc77b4183f108480279dbbf7fed3ac206069478636406c1fb45e83b31a", - "name": "jogl-all-2.3.2.jar", - "path": "https://mvn.runelite.net/org/jogamp/jogl/jogl-all/2.3.2/jogl-all-2.3.2.jar", - "size": "3414448" - }, - { - "hash": "8c53b1884cef19309d34fd10a94b010136d9d6de9a88c386f46006fb47acab5d", - "name": "jogl-all-2.3.2-natives-windows-amd64.jar", - "path": "https://mvn.runelite.net/org/jogamp/jogl/jogl-all/2.3.2/jogl-all-2.3.2-natives-windows-amd64.jar", - "size": "240721" - }, - { - "hash": "507a0e6bd1ee4e81c3dfb287783af93775864eec742988d4162f98ce0cbac9d6", - "name": "jogl-all-2.3.2-natives-windows-i586.jar", - "path": "https://mvn.runelite.net/org/jogamp/jogl/jogl-all/2.3.2/jogl-all-2.3.2-natives-windows-i586.jar", - "size": "209445" - }, - { - "hash": "82637302ae9effdf7d6f302e1050ad6aee3b13019914ddda5b502b9faa980216", - "name": "jogl-all-2.3.2-natives-linux-amd64.jar", - "path": "https://mvn.runelite.net/org/jogamp/jogl/jogl-all/2.3.2/jogl-all-2.3.2-natives-linux-amd64.jar", - "size": "224010" - }, - { - "hash": "f474ef2ef01be24ec811d3858b0f4bc5659076975f4a58ddd79abd787e9305c7", - "name": "jogl-all-2.3.2-natives-linux-i586.jar", - "path": "https://mvn.runelite.net/org/jogamp/jogl/jogl-all/2.3.2/jogl-all-2.3.2-natives-linux-i586.jar", - "size": "217274" - }, - { - "hash": "084844543b18f7ff71b4c0437852bd22f0cb68d7e44c2c611c1bbea76f8c6fdf", - "name": "gluegen-rt-2.3.2.jar", - "path": "https://mvn.runelite.net/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2.jar", - "size": "345605" - }, - { - "hash": "3474017422eff384db466bdb56c96c61220c43133a9da6329cf1781bea16c6b6", - "name": "gluegen-rt-2.3.2-natives-windows-amd64.jar", - "path": "https://mvn.runelite.net/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2-natives-windows-amd64.jar", - "size": "8159" - }, - { - "hash": "4eeed9fc2ebea5b9dc48a342b9478d127e989a2e1aa7129b512a98ec75cde338", - "name": "gluegen-rt-2.3.2-natives-windows-i586.jar", - "path": "https://mvn.runelite.net/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2-natives-windows-i586.jar", - "size": "7577" - }, - { - "hash": "f2dfd1800202059cf7e0294db5d57755147304e6eb220a9277526dbe6842bde2", - "name": "gluegen-rt-2.3.2-natives-linux-amd64.jar", - "path": "https://mvn.runelite.net/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2-natives-linux-amd64.jar", - "size": "4149" - }, - { - "hash": "1365d463f98c0abec92f3ad6b35aa4b53a9599a517800cf99fdabea6712ca7ec", - "name": "gluegen-rt-2.3.2-natives-linux-i586.jar", - "path": "https://mvn.runelite.net/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2-natives-linux-i586.jar", - "size": "4130" - }, - { - "hash": "7b7ae00e2aa98c3b2b5ac76e793e2c9b752bf51c86c54654dbd473843a25f1aa", - "name": "jbsdiff-1.0.jar", - "path": "https://mvn.runelite.net/io/sigpipe/jbsdiff/1.0/jbsdiff-1.0.jar", - "size": "24589" - }, - { - "hash": "55bbfe26cee9296fd5b7c0d47ce6a00ea4dd572e235b63e9bb4eaf6f802315e4", - "name": "commons-compress-1.5.jar", - "path": "https://mvn.runelite.net/org/apache/commons/commons-compress/1.5/commons-compress-1.5.jar", - "size": "256241" - }, - { - "hash": "fbc9de96a0cc193a125b4008dbc348e9ed54e5e13fc67b8ed40e645d303cc51b", - "name": "jna-4.5.1.jar", - "path": "https://mvn.runelite.net/net/java/dev/jna/jna/4.5.1/jna-4.5.1.jar", - "size": "1440662" - }, - { - "hash": "84c8667555ee8dd91fef44b451419f6f16f71f727d5fc475a10c2663eba83abb", - "name": "jna-platform-4.5.1.jar", - "path": "https://mvn.runelite.net/net/java/dev/jna/jna-platform/4.5.1/jna-platform-4.5.1.jar", - "size": "2327547" - }, - { - "hash": "b157f7ff5f79a64a082df67358dc00f58d320d620fcb0fb09f7c69090d59e164", - "name": "runelite-api-1.5.30-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runelite-api-1.5.30-SNAPSHOT.jar", - "size": "1033870" - }, - { - "hash": "e8e743c2eb9e59f2990a5bdc48f061b7138890f065c0d603ecb8cdf0b0b158f7", - "name": "runescape-api-1.5.30-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runescape-api-1.5.30-SNAPSHOT.jar", - "size": "58398" - }, - { - "hash": "4164ba6337441640f0a8e672bb930eaefddf6b0cb5a797588221fc4e1b9e5542", - "name": "http-api-1.5.30-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/http-api-1.5.30-SNAPSHOT.jar", - "size": "139679" - }, - { - "hash": "f55abda036da75e1af45bd43b9dfa79b2a3d90905be9cb38687c6621597a8165", - "name": "okhttp-3.7.0.jar", - "path": "https://mvn.runelite.net/com/squareup/okhttp3/okhttp/3.7.0/okhttp-3.7.0.jar", - "size": "394987" - }, - { - "hash": "bfe7dfe483c37137966a1690f0c7d0b448ba217902c1fed202aaffdbba3291ae", - "name": "okio-1.12.0.jar", - "path": "https://mvn.runelite.net/com/squareup/okio/okio/1.12.0/okio-1.12.0.jar", - "size": "81088" - }, - { - "hash": "9d4924588d6280c7516db3a4b7298306db5b6f0d1cdf568ce738309b5660f008", - "name": "commons-csv-1.4.jar", - "path": "https://mvn.runelite.net/org/apache/commons/commons-csv/1.4/commons-csv-1.4.jar", - "size": "39978" - }, - { - "hash": "7e26a8d043418f2f22d5f6a3083a9a131817009ee8cd72c004e83b50d1849a7c", - "name": "discord-1.1.jar", - "path": "https://repo.runelite.net/net/runelite/discord/1.1/discord-1.1.jar", - "size": "617294" - }, - { - "hash": "21b5cac673a156cd8d6cf9efe15ff267b6353eeb129678aa4b39542683ba0dc2", - "name": "rxjava-2.2.10.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/artifacts/rxjava-2.2.10.jar", - "size": "2348810" - }, - { - "hash": "830a08b9d5c20ab8e2033c16fc6ee067e6ffcd0c730f303d648aadfa81210d62", - "name": "rxrelay-2.1.0.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/artifacts/rxrelay-2.1.0.jar", - "size": "27750" - }, - { - "hash": "cc09ab0b140e0d0496c2165d4b32ce24f4d6446c0a26c5dc77b06bdf99ee8fae", - "name": "reactive-streams-1.0.2.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/artifacts/reactive-streams-1.0.2.jar", - "size": "27750" - } - ] -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index b0595c1e19..5048173093 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -72,6 +72,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.ui.overlay.infobox.InfoBoxOverlay; import net.runelite.client.ui.overlay.tooltip.TooltipOverlay; import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay; +import net.runelite.client.util.bootstrap.Bootstrapper; import net.runelite.client.ws.PartyService; import org.slf4j.LoggerFactory; @@ -178,7 +179,8 @@ public class RuneLite parser.accepts("developer-mode", "Enable developer tools"); parser.accepts("debug", "Show extra debugging output"); parser.accepts("no-splash", "Do not show the splash screen"); - + parser.accepts("bootstrap", "Builds a bootstrap with locally built jars"); + parser.accepts("bootstrap-staging", "Builds a testing bootstrap with locally built jars"); final ArgumentAcceptingOptionSpec proxyInfo = parser .accepts("proxy") .withRequiredArg().ofType(String.class); @@ -200,6 +202,16 @@ public class RuneLite parser.accepts("help", "Show this text").forHelp(); OptionSet options = parser.parse(args); + if (options.has("bootstrap")) + { + Bootstrapper.main(false); + System.exit(0); + } + if (options.has("bootstrap-staging")) + { + Bootstrapper.main(true); + System.exit(0); + } if (options.has("proxy")) { String[] proxy = options.valueOf(proxyInfo).split(":"); diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java index f26b23035b..3400cefea6 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java @@ -331,31 +331,31 @@ public class Bootstrap artifacts[3].name = "client-" + projectVersion + ".jar"; artifacts[3].hash = getChecksumFile("./runelite-client/build/libs/" + artifacts[3].name); artifacts[3].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/" + Bootstrapper.remoteLocation + artifacts[3].name; - artifacts[3].size = Long.toString(getFileSize("./runelite-client/target/" + artifacts[3].name)); + artifacts[3].size = Long.toString(getFileSize("./runelite-client/build/libs/" + artifacts[3].name)); copyTodir("./runelite-client/build/libs/" + artifacts[3].name, Bootstrapper.localLocation); artifacts[35] = new Artifact(); artifacts[35].name = "runelite-api-" + projectVersion + ".jar"; artifacts[35].hash = getChecksumFile("./runelite-api/build/libs/" + artifacts[35].name); artifacts[35].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/" + Bootstrapper.remoteLocation + artifacts[35].name; - artifacts[35].size = Long.toString(getFileSize("./runelite-api/target/" + artifacts[35].name)); + artifacts[35].size = Long.toString(getFileSize("./runelite-api/build/libs/" + artifacts[35].name)); copyTodir("./runelite-api/build/libs/" + artifacts[35].name, Bootstrapper.localLocation); artifacts[36] = new Artifact(); artifacts[36].name = "runescape-api-" + projectVersion + ".jar"; artifacts[36].hash = getChecksumFile("./runescape-api/build/libs/" + artifacts[36].name); artifacts[36].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/" + Bootstrapper.remoteLocation + artifacts[36].name; - artifacts[36].size = Long.toString(getFileSize("./runescape-api/target/" + artifacts[36].name)); + artifacts[36].size = Long.toString(getFileSize("./runescape-api/build/libs/" + artifacts[36].name)); copyTodir("./runescape-api/build/libs/" + artifacts[36].name, Bootstrapper.localLocation); artifacts[37] = new Artifact(); artifacts[37].name = "http-api-" + projectVersion + ".jar"; artifacts[37].hash = getChecksumFile("./http-api/build/libs/" + artifacts[37].name); artifacts[37].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/" + Bootstrapper.remoteLocation + artifacts[37].name; - artifacts[37].size = Long.toString(getFileSize("./http-api/target/" + artifacts[37].name)); + artifacts[37].size = Long.toString(getFileSize("./http-api/build/libs/" + artifacts[37].name)); copyTodir("./http-api/build/libs/" + artifacts[37].name, Bootstrapper.localLocation); artifacts[47] = new Artifact(); artifacts[47].name = "injected-client-" + projectVersion + ".jar"; artifacts[47].hash = getChecksumFile("./injected-client/build/libs/" + artifacts[47].name); artifacts[47].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/" + Bootstrapper.remoteLocation + artifacts[47].name; - artifacts[47].size = Long.toString(getFileSize("./http-api/target/" + artifacts[47].name)); + artifacts[47].size = Long.toString(getFileSize("./injected-client/build/libs/" + artifacts[47].name)); copyTodir("./injected-client/build/libs/" + artifacts[47].name, Bootstrapper.localLocation); } catch (IOException | NoSuchAlgorithmException e) diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java index 770c377457..c934f2e043 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java @@ -11,10 +11,10 @@ public class Bootstrapper public static String remoteLocation; public static String localLocation; - public static void main(String[] args) + public static void main(boolean staging) { - if (args.length > 0) + if (staging) { remoteLocation = "staging/"; localLocation = "./staging/"; diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Client.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Client.java index a8c1e18678..5402beebba 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Client.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Client.java @@ -8,5 +8,5 @@ public class Client String extension = "jar"; String groupId = "net.runelite"; String properties = ""; - String version = "1.5.30"; + String version = "1.5.31"; }