From cf9550d8df51d927c63176675280d69b86e7a6e2 Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 4 May 2011 17:35:49 -0400 Subject: Build infrastructure improvements. Setting to show remote branches. The JGit team is now publishing 0.12.1 artifacts on the Eclipse Maven site. Yeah! That was the last missing piece for a slick Git:Blit deployment. The build has been reworked to download from Eclipse and to also download source and javadoc jars for setting up a development environment. Made the log4j pattern configurable by operating system. Moved Markdown utils to their own class since I need StringUtils for Build and that introduced a chicken-and-egg scenario. --- src/com/gitblit/Build.java | 276 +++++++++++++++++++++++++++++++++------------ 1 file changed, 201 insertions(+), 75 deletions(-) (limited to 'src/com/gitblit/Build.java') diff --git a/src/com/gitblit/Build.java b/src/com/gitblit/Build.java index 604ee08f..8b7fe3c1 100644 --- a/src/com/gitblit/Build.java +++ b/src/com/gitblit/Build.java @@ -20,6 +20,10 @@ import com.gitblit.utils.StringUtils; public class Build { + public static enum BuildType { + RUNTIME, COMPILETIME; + } + public static void main(String... args) { runtime(); compiletime(); @@ -27,21 +31,40 @@ public class Build { } public static void runtime() { - downloadFromMaven(MavenObject.JCOMMANDER); - downloadFromMaven(MavenObject.JETTY); - downloadFromMaven(MavenObject.SERVLET); - downloadFromMaven(MavenObject.SLF4JAPI); - downloadFromMaven(MavenObject.SLF4LOG4J); - downloadFromMaven(MavenObject.LOG4J); - downloadFromMaven(MavenObject.WICKET); - downloadFromMaven(MavenObject.WICKET_EXT); - downloadFromMaven(MavenObject.WICKET_AUTH_ROLES); - downloadFromMaven(MavenObject.WICKET_GOOGLE_CHARTS); - downloadFromMaven(MavenObject.MARKDOWNPAPERS); + downloadFromApache(MavenObject.JCOMMANDER, BuildType.RUNTIME); + downloadFromApache(MavenObject.JETTY, BuildType.RUNTIME); + downloadFromApache(MavenObject.SERVLET, BuildType.RUNTIME); + downloadFromApache(MavenObject.SLF4JAPI, BuildType.RUNTIME); + downloadFromApache(MavenObject.SLF4LOG4J, BuildType.RUNTIME); + downloadFromApache(MavenObject.LOG4J, BuildType.RUNTIME); + downloadFromApache(MavenObject.WICKET, BuildType.RUNTIME); + downloadFromApache(MavenObject.WICKET_EXT, BuildType.RUNTIME); + downloadFromApache(MavenObject.WICKET_AUTH_ROLES, BuildType.RUNTIME); + downloadFromApache(MavenObject.WICKET_GOOGLE_CHARTS, BuildType.RUNTIME); + downloadFromApache(MavenObject.MARKDOWNPAPERS, BuildType.RUNTIME); + downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.RUNTIME); + + downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME); + downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.RUNTIME); } public static void compiletime() { - downloadFromMaven(MavenObject.JUNIT); + downloadFromApache(MavenObject.JUNIT, BuildType.RUNTIME); + downloadFromApache(MavenObject.JCOMMANDER, BuildType.COMPILETIME); + downloadFromApache(MavenObject.JETTY, BuildType.COMPILETIME); + downloadFromApache(MavenObject.SERVLET, BuildType.COMPILETIME); + downloadFromApache(MavenObject.SLF4JAPI, BuildType.COMPILETIME); + downloadFromApache(MavenObject.SLF4LOG4J, BuildType.COMPILETIME); + downloadFromApache(MavenObject.LOG4J, BuildType.COMPILETIME); + downloadFromApache(MavenObject.WICKET, BuildType.COMPILETIME); + downloadFromApache(MavenObject.WICKET_EXT, BuildType.COMPILETIME); + downloadFromApache(MavenObject.WICKET_AUTH_ROLES, BuildType.COMPILETIME); + downloadFromApache(MavenObject.WICKET_GOOGLE_CHARTS, BuildType.COMPILETIME); + downloadFromApache(MavenObject.MARKDOWNPAPERS, BuildType.COMPILETIME); + downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.COMPILETIME); + + downloadFromEclipse(MavenObject.JGIT, BuildType.COMPILETIME); + downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.COMPILETIME); } public static void buildSettingKeys() { @@ -114,6 +137,28 @@ public class Build { } } + /** + * Download a file from the official Apache Maven repository. + * + * @param mo + * the maven object to download. + * @return + */ + private static List downloadFromApache(MavenObject mo, BuildType type) { + return downloadFromMaven("http://repo1.maven.org/maven2/", mo, type); + } + + /** + * Download a file from the official Eclipse Maven repository. + * + * @param mo + * the maven object to download. + * @return + */ + private static List downloadFromEclipse(MavenObject mo, BuildType type) { + return downloadFromMaven("http://download.eclipse.org/jgit/maven/", mo, type); + } + /** * Download a file from a Maven repository. * @@ -121,105 +166,186 @@ public class Build { * the maven object to download. * @return */ - private static File downloadFromMaven(MavenObject mo) { - File targetFile = mo.getLocalFile("ext"); - if (targetFile.exists()) { - return targetFile; + private static List downloadFromMaven(String mavenRoot, MavenObject mo, BuildType type) { + List downloads = new ArrayList(); + String[] jars = { "" }; + if (BuildType.RUNTIME.equals(type)) { + jars = new String[] { "" }; + } else if (BuildType.COMPILETIME.equals(type)) { + jars = new String[] { "-sources", "-javadoc" }; } - - String mavenURL = "http://repo1.maven.org/maven2/" + mo.getRepositoryPath(); - if (!targetFile.getAbsoluteFile().getParentFile().exists()) { - boolean success = targetFile.getAbsoluteFile().getParentFile().mkdirs(); - if (!success) { - throw new RuntimeException("Failed to create destination folder structure!"); + for (String jar : jars) { + File targetFile = mo.getLocalFile("ext", jar); + if (targetFile.exists()) { + downloads.add(targetFile); + continue; } - } - ByteArrayOutputStream buff = new ByteArrayOutputStream(); - try { - System.out.println("Downloading " + mavenURL); - URL url = new URL(mavenURL); - InputStream in = new BufferedInputStream(url.openStream()); - long last = System.currentTimeMillis(); - int len = 0; - while (true) { - long now = System.currentTimeMillis(); - if (now > last + 200) { - System.out.println(" downloaded " + len + " bytes"); - last = now; + String expectedSHA1 = mo.getSHA1(jar); + if (expectedSHA1 == null) { + // skip this jar + continue; + } + float approximateLength = mo.getApproximateLength(jar); + String mavenURL = mavenRoot + mo.getRepositoryPath(jar); + if (!targetFile.getAbsoluteFile().getParentFile().exists()) { + boolean success = targetFile.getAbsoluteFile().getParentFile().mkdirs(); + if (!success) { + throw new RuntimeException("Failed to create destination folder structure!"); } - int x = in.read(); - len++; - if (x < 0) { - break; + } + ByteArrayOutputStream buff = new ByteArrayOutputStream(); + try { + URL url = new URL(mavenURL); + InputStream in = new BufferedInputStream(url.openStream()); + byte[] buffer = new byte[4096]; + int downloadedLen = 0; + float lastProgress = 0f; + + updateDownload(0, targetFile); + while (true) { + int len = in.read(buffer); + if (len < 0) { + break; + } + downloadedLen += len; + buff.write(buffer, 0, len); + float progress = downloadedLen / approximateLength; + if (progress - lastProgress >= 0.1f) { + lastProgress = progress; + updateDownload(progress, targetFile); + } } - buff.write(x); + in.close(); + updateDownload(1f, targetFile); + + } catch (IOException e) { + throw new RuntimeException("Error downloading " + mavenURL + " to " + targetFile, e); } - in.close(); - } catch (IOException e) { - throw new RuntimeException("Error downloading " + mavenURL + " to " + targetFile, e); - } - byte[] data = buff.toByteArray(); - String got = StringUtils.getSHA1(data); - if (mo.sha1 != null && !got.equals(mo.sha1)) { - throw new RuntimeException("SHA1 checksum mismatch; got: " + got); + byte[] data = buff.toByteArray(); + String calculatedSHA1 = StringUtils.getSHA1(data); + + System.out.println(); + + if (expectedSHA1.length() == 0) { + updateProgress(0, "sha: " + calculatedSHA1); + System.out.println(); + } else { + if (!calculatedSHA1.equals(expectedSHA1)) { + throw new RuntimeException("SHA1 checksum mismatch; got: " + calculatedSHA1); + } + } + try { + RandomAccessFile ra = new RandomAccessFile(targetFile, "rw"); + ra.write(data); + ra.setLength(data.length); + ra.close(); + } catch (IOException e) { + throw new RuntimeException("Error writing to file " + targetFile, e); + } + downloads.add(targetFile); } - try { - RandomAccessFile ra = new RandomAccessFile(targetFile, "rw"); - ra.write(data); - ra.setLength(data.length); - ra.close(); - } catch (IOException e) { - throw new RuntimeException("Error writing to file " + targetFile, e); + return downloads; + } + + private static void updateDownload(float progress, File file) { + updateProgress(progress, "d/l: " + file.getName()); + } + + private static void updateProgress(float progress, String url) { + String anim = "=========="; + int width = Math.round(anim.length() * progress); + System.out.print("\r["); + System.out.print(anim.substring(0, width)); + for (int i = 0; (i < anim.length() - width); i++) { + System.out.print(" "); } - return targetFile; + System.out.print("] " + url); } private static class MavenObject { - public static final MavenObject JCOMMANDER = new MavenObject("jCommander", "com/beust", "jcommander", "1.17", "219a3540f3b27d7cc3b1d91d6ea046cd8723290e"); + public static final MavenObject JCOMMANDER = new MavenObject("jCommander", "com/beust", "jcommander", "1.17", 34000, 32000, 141000, "219a3540f3b27d7cc3b1d91d6ea046cd8723290e", "0bb50eec177acf0e94d58e0cf07262fe5164331d", "c7adc475ca40c288c93054e0f4fe58f3a98c0cb5"); + + public static final MavenObject JETTY = new MavenObject("Jetty", "org/eclipse/jetty/aggregate", "jetty-all", "7.2.2.v20101205", 1430000, 965000, 3871000, "b9b7c812a732721c427e208c54fbb71ca17a2ee1", "cbc4fc72c4a646d8822bf7369c2101d4d5d1ff98", "34c87e11bba426fe97bfe23ccff12eda477c8f57"); - public static final MavenObject JETTY = new MavenObject("Jetty", "org/eclipse/jetty/aggregate", "jetty-all", "7.2.2.v20101205", "b9b7c812a732721c427e208c54fbb71ca17a2ee1"); + public static final MavenObject SERVLET = new MavenObject("Servlet 2.5", "javax/servlet", "servlet-api", "2.5", 105000, 158000, 0, "5959582d97d8b61f4d154ca9e495aafd16726e34", "021599814ad9a605b86f3e6381571beccd861a32", null); - public static final MavenObject SERVLET = new MavenObject("Servlet 2.5", "javax/servlet", "servlet-api", "2.5", "5959582d97d8b61f4d154ca9e495aafd16726e34"); + public static final MavenObject SLF4JAPI = new MavenObject("SLF4J API", "org/slf4j", "slf4j-api", "1.6.1", 25500, 45000, 182000, "6f3b8a24bf970f17289b234284c94f43eb42f0e4", "46a386136c901748e6a3af67ebde6c22bc6b4524", "e223571d77769cdafde59040da235842f3326453"); - public static final MavenObject SLF4JAPI = new MavenObject("SLF4J API", "org/slf4j", "slf4j-api", "1.6.1", "6f3b8a24bf970f17289b234284c94f43eb42f0e4"); + public static final MavenObject SLF4LOG4J = new MavenObject("SLF4J LOG4J", "org/slf4j", "slf4j-log4j12", "1.6.1", 9800, 9500, 52400, "bd245d6746cdd4e6203e976e21d597a46f115802", "7a26b08b265f55622fa1fed3bda68bbd37a465ba", "6e4b16bce7994e3692e82002f322a0dd2f32741e"); - public static final MavenObject SLF4LOG4J = new MavenObject("SLF4J LOG4J", "org/slf4j", "slf4j-log4j12", "1.6.1", "bd245d6746cdd4e6203e976e21d597a46f115802"); + public static final MavenObject LOG4J = new MavenObject("Apache LOG4J", "log4j", "log4j", "1.2.16", 481000, 471000, 1455000, "7999a63bfccbc7c247a9aea10d83d4272bd492c6", "bf945d1dc995be7fe64923625f842fbb6bf443be", "78aa1cbf0fa3b259abdc7d87f9f6788d785aac2a"); - public static final MavenObject LOG4J = new MavenObject("Apache LOG4J", "log4j", "log4j", "1.2.16", "7999a63bfccbc7c247a9aea10d83d4272bd492c6"); + public static final MavenObject WICKET = new MavenObject("Apache Wicket", "org/apache/wicket", "wicket", "1.4.17", 1960000, 1906000, 6818000, "39815e37a6f56465b2d2c3d3017c4f3bf17db50a", "a792ebae4123253ffd039c3be49e773f8622f94e", "f2f244ca72d10081529b017e89d6276eab62c621"); - public static final MavenObject WICKET = new MavenObject("Apache Wicket", "org/apache/wicket", "wicket", "1.4.17", "39815e37a6f56465b2d2c3d3017c4f3bf17db50a"); + public static final MavenObject WICKET_EXT = new MavenObject("Apache Wicket Extensions", "org/apache/wicket", "wicket-extensions", "1.4.17", 1180000, 1118000, 1458000, "01111d0dbffdc425581b006a43864c22797ce72a", "f194f40ea6e361bb745dfa22e2f9171eb63a9355", "bd42e5ba9444a426bb2d7cacce91c6033b663b57"); - public static final MavenObject WICKET_EXT = new MavenObject("Apache Wicket Extensions", "org/apache/wicket", "wicket-extensions", "1.4.17", "01111d0dbffdc425581b006a43864c22797ce72a"); + public static final MavenObject WICKET_AUTH_ROLES = new MavenObject("Apache Wicket Auth Roles", "org/apache/wicket", "wicket-auth-roles", "1.4.17", 44000, 45000, 166000, "86d20ff32f62d3026213ff11a78555da643bc676", "37e815350a2d6b97734b250a8a03d8bf3712bba7", "ac3896368bfb372d178041a4ac3ee2c44f62e21c"); - public static final MavenObject WICKET_AUTH_ROLES = new MavenObject("Apache Wicket Auth Roles", "org/apache/wicket", "wicket-auth-roles", "1.4.17", "86d20ff32f62d3026213ff11a78555da643bc676"); + public static final MavenObject WICKET_GOOGLE_CHARTS = new MavenObject("Apache Wicket Google Charts Add-On", "org/wicketstuff", "googlecharts", "1.4.17", 34000, 18750, 161000, "c567b98b0c5efe4147e77ef2d0d3c2d45c49dea5", "3d32d958b2f7aa58388af5701ea3aafc433e573f", "c37518b67ea85af485dd61fe854137eeacc50318"); - public static final MavenObject WICKET_GOOGLE_CHARTS = new MavenObject("Apache Wicket Google Charts Add-On", "org/wicketstuff", "googlecharts", "1.4.17", "c567b98b0c5efe4147e77ef2d0d3c2d45c49dea5"); + public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "3.8.2", 120000, 0, 0, "07e4cde26b53a9a0e3fe5b00d1dbbc7cc1d46060", "", ""); - public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "3.8.2", "07e4cde26b53a9a0e3fe5b00d1dbbc7cc1d46060"); + public static final MavenObject MARKDOWNPAPERS = new MavenObject("MarkdownPapers", "org/tautua/markdownpapers", "markdownpapers-core", "1.0.0", 87000, 58000, 278000, "feda63bd149f3315da210e397d45d02277038ad5", "a9a6c4d163af81e265a15138fcaeafa9829c6054", "f932656266a7f9593488d3f89e815d0af44d0853"); + + public static final MavenObject BOUNCYCASTLE = new MavenObject("BouncyCastle", "org/bouncycastle", "bcprov-jdk16", "1.46", 1900000, 1400000, 4670000, "ce091790943599535cbb4de8ede84535b0c1260c", "d2b70567594225923450d7e3f80cd022c852725e", "873a6fe765f33fc27df498a5d1f5bf077e503b2f"); - public static final MavenObject MARKDOWNPAPERS = new MavenObject("MarkdownPapers", "org/tautua/markdownpapers", "markdownpapers-core", "1.0.0", "feda63bd149f3315da210e397d45d02277038ad5"); + public static final MavenObject JGIT = new MavenObject("JGit", "org/eclipse/jgit", "org.eclipse.jgit", "0.12.1", 1318000, 1354000, 2993000, "fd77699699b9651d2fc31c7ed63af98b14fc1975", "c8b3d84922c7802cfe6a661e13a002641a78583d", "5609aa3ce3ac3d52030befd27ddd2941f6c07570"); + + public static final MavenObject JGIT_HTTP = new MavenObject("JGit", "org/eclipse/jgit", "org.eclipse.jgit.http.server", "0.12.1", 68000, 62000, 99000, "384058ca906dffb8b8708c2db8849c9754359b28", "7b026658ed8de2eccc2d11d647d43d7c84a56911", "6c19e37b3caafd70c1b7b024ae1858c725181688"); public final String name; public final String group; public final String artifact; public final String version; - public final String sha1; + public final int len_library; + public final int len_sources; + public final int len_javadoc; + public final String sha1_library; + public final String sha1_sources; + public final String sha1_javadoc; - private MavenObject(String name, String group, String artifact, String version, String sha1) { + private MavenObject(String name, String group, String artifact, String version, int len_library, int len_sources, int len_javadoc, String sha1_library, String sha1_sources, String sha1_javadoc) { this.name = name; this.group = group; this.artifact = artifact; this.version = version; - this.sha1 = sha1; + this.len_library = len_library; + this.len_sources = len_sources; + this.len_javadoc = len_javadoc; + this.sha1_library = sha1_library; + this.sha1_sources = sha1_sources; + this.sha1_javadoc = sha1_javadoc; + } + + private String getRepositoryPath(String jar) { + return group + "/" + artifact + "/" + version + "/" + artifact + "-" + version + jar + ".jar"; } - private String getRepositoryPath() { - return group + "/" + artifact + "/" + version + "/" + artifact + "-" + version + ".jar"; + private File getLocalFile(String basePath, String jar) { + return new File(basePath, artifact + "-" + version + jar + ".jar"); } - private File getLocalFile(String basePath) { - return new File(basePath, artifact + "-" + version + ".jar"); + private String getSHA1(String jar) { + if (jar.equals("")) { + return sha1_library; + } else if (jar.equals("-sources")) { + return sha1_sources; + } else if (jar.equals("-javadoc")) { + return sha1_javadoc; + } + return sha1_library; + } + + private int getApproximateLength(String jar) { + if (jar.equals("")) { + return len_library; + } else if (jar.equals("-sources")) { + return len_sources; + } else if (jar.equals("-javadoc")) { + return len_javadoc; + } + return len_library; } @Override -- cgit v1.2.3