Adding prebuild plugins... again...

opensourceBIM · Mar 14, 2014 · 9703827 · 9703827
1 parent dd9c8e7
commit 9703827
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Builds/build/bimserver.build.xml b/Builds/build/bimserver.build.xml
@@ -48,7 +48,9 @@
 		<copy todir="builds/BuildJar/plugins">
 			<fileset dir="builds/pluginlibs" />
 		</copy>
-
+		<copy todir="builds/BuildJar/plugins">
+			<fileset dir="../prebuildplugins" />
+		</copy>
 		<copy todir="builds/BuildWar/WEB-INF/plugins" failonerror="false">
 			<fileset dir="additionalplugins" />
 		</copy>
@@ -129,7 +131,9 @@
 		<copy todir="builds/BuildWar/WEB-INF/plugins">
 			<fileset dir="builds/pluginlibs" />
 		</copy>
-
+		<copy todir="builds/BuildWar/WEB-INF/plugins">
+			<fileset dir="../prebuildplugins" />
+		</copy>
 		<copy todir="builds/BuildWar/WEB-INF/plugins" failonerror="false">
 			<fileset dir="additionalplugins" />
 		</copy>

diff --git a/Builds/build/release.build.xml b/Builds/build/release.build.xml
@@ -37,8 +37,10 @@
 		<ant antfile="bimserverlib.build.xml" target="Build ServerLib"/>
 		<copy file="builds/bimserver-lib-${version}.zip" todir="/var/www/BIMserver/${majorversion}.${minorversion}/${version}"/>
 
+<!--
 		<ant antfile="source.build.xml" target="Build Source"/>
 		<copy file="builds/bimserver-source-${version}.zip" todir="/var/www/BIMserver/${majorversion}.${minorversion}/${version}"/>
+-->
 
 		<java jar="antlibs/githubrelease.jar" fork="true">
 			<classpath>

diff --git a/Builds/src/org/bimserver/build/CreateGitHubRelease.java b/Builds/src/org/bimserver/build/CreateGitHubRelease.java
@@ -46,7 +46,9 @@ public static void main(String[] args) {
 		map.put("draft", draft);
 		map.put("prerelease", prerelease);
 		try {
-			JsonObject gitHubResponse = gitHubClient.post("/repos/" + repo + "/" + project + "/releases", map, JsonObject.class);
+			String string = "/repos/" + repo + "/" + project + "/releases";
+			System.out.println(string);
+			JsonObject gitHubResponse = gitHubClient.post(string, map, JsonObject.class);
 			System.out.println(gitHubResponse);
 			String id = gitHubResponse.get("id").getAsString();