Merge 21afba7 into 0bb2cfe

area515 · Mar 7, 2016 · af98b74 · af98b74
2 parents 0bb2cfe + 21afba7
commit af98b74
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 22 deletions.
diff --git a/.bintray.yml b/.bintray.yml
@@ -1,21 +1,20 @@
 {
   "package": {
-    "name": "Creation-Workshop-Host",
-    "repo": "CWH",
-    "subject": "jmkao"
+    "name": "Photonic3D",
+    "repo": "Photonic3D",
+    "subject": "area515"
   },
 
   "version": {
-    "name": "Dev"
+    "name": "Development-Stream"
   },
 
   "files": [
     {
-      "includePattern": "host\/(.*)-.*\.zip",
+      "includePattern": "host\/([^-]+)-.*\.zip",
       "uploadPattern": "$1.zip",
       "matrixParams": { "override": 1 }
     }
   ],
-  "publish": false
+  "publish": true
 }
-
diff --git a/.travis.yml b/.travis.yml
@@ -6,13 +6,21 @@ jdk:
 - oraclejdk8
 os:
 - linux
-script: (cd host ; ant clean dist)
+script: "(cd host ; ant clean dist)"
 deploy:
-  provider: bintray
-  file: ".bintray.yml"
-  user: jmkao
-  key:
-    secure: lt+DYM/l8U4E2z1uV+86kxt7089Flwvmxm+DvwMMp4pMM7DUITYF3zR3eOQntwIy2cwPyhBhke2Z9eTZTGy8U1xvDE71lOLDmXBaxCX3i7CSA+qRQq9eMYeHO3XGvo+1BLD/dppZU2AvkkQHGCjYtOi868Kd9L/ppr0LwCE1q8oa1TYkhpxjbBVfqIJ8lq8UvXteVELn7WHj15xulT6cPSGdNbUtHtybZ2i7UaGrlXfXfyDpWvGj4A1Uel43mkP4xHyapIUYwV0/E/c8lV7LAcUTNrJeWAqDvEJ8kOvpBHtFBf3QHzoZcoJ0ybiFyz+bD5jSClyIRZoWt03wbAlmIA3fJD35iG4+18eT98tGYT0AhcqIX/yva1HQ3NrkkbEfa6Q9M1LnLmgIx/EQNFkrw3rjmsbz6xzzWNrNLfxPuBDd3RPXgokH0aTs7oP5LPPouiJR9lpUDFsdGCIcIx3WRq6eZMI/a956ZGMOxuy0Qge/vudkuTPs5DST0JaNxOVs0JwsJ/+H8x8SsQ7t9661LnGlvEJEfYwQ4z5uDt/yFIXOpI3k2hp/mKyyJ1nmAhYMRWQ74HsDlLCNIhYzB5jHA+SkaGlK0dyCrW0vsEX5lP88Vv04ublLh6+MK45NLy0vZRpQieaVip/UaXVpxGwzIcMgfgkysZNKTAg6+gZaMRk=
-  on:
-    tags: true
-  dry-run: true
+  - provider: bintray
+    file: ".bintray.yml"
+    user: jmkao
+    key:
+      secure: "wwJPSP5OLn5JISA8cZCgui7DcG15JwvUildF0BckSMZ1b6tLb6z/7gxb+wPQ7sDzauKjhQq3x777ej6h4KUrTNxpPS3fwNxjAPAvim1F96enrAY+8Q7hX4PdZYsdHdx/KZ1Q49B7l2eJ4wwEq0IlIOcSsg3u72hsUxjiMTSsmLGZOFPWj1qf/5Rc7ID8QhWaUNo7T8LWw/aaD0qPffNSTaMZw4xZOlhCmYFwXD9X28+aIUBWxHJtkFLjUNwhfKr5M35CrRdXZnj+zhgvABXHFhGdmmGtwAYaGpGBLz2AEoS18YF89nTg/jXqxpb6grsYF1f+vh73YTR9bbXfiNEhMCBM8B5YtECJGQgNZLCgQAC6YrtSozNNpojPihYwb0AHjzswPN02QdLxqLxC1IYjdmfj/2Exv6NHlbQ/qLi3g51GnlchAK4svQuKgHudlS2ZpAzqzzbMiK8Ih6HeQmrhIAa6X8dQgvnIjL9gLTJh8OqbpnO7CWClblKglaBXC0NpZEj+yTvBbFxjxVdjYdDW32miz+7NHvIOw6SCcXy7lxL48RS5gEXzU3JIf079620KgVJUMpYunP3rE9rBJimVXqmoDEoXoTc6Uog953l/ikbkPLAwYN5111m59SGeouEfVrO0fwjHdR0eMtKOp7CXSnJJpZXPd9yXwBHhxc0jHhY="
+    on:
+      all_branches: true
+  - provider: releases
+    skip_cleanup: true
+    prerelease: true
+    api_key:
+      secure: "lt+86YtJtOUeUTdY2PDtIe0vzBEktq0YNGg7N/1xAp/QedzHThhGqORg3dCjZ4MH43WzD7Jq1hMiwU8VBWfdikY+Y1rsGzOSK5UFJmNKSH6Bxe5RoHC2NE8hcb6pwEQQr6aQsRRpwMSDPGWg3RfbA9lamXpT+WHTACZPIhGXjpL0mWLWPQsJqa6HaiZ4hJ6mhASHtGznANPbPDP6P2HnNbh0nvHAhVS/p58OJrXN0ICj9hALjOxcXZZQjxh0bY5VAhKBwAdfXDkJRpderw14qW1w+yuyr4qs3J0x9k4KV4FLCFEc4aWr5tsfEIC5AB2ztEzqYHXjXMWh1qpMSmwcdYM0ygUw0K4gTUKyvCJT7rWn6DQS6oYGgYiTufDR6alBKK04rPnSueg5BWILqLLUJLw9XFyjyi7M+u1nJF8YReVLE9kYeGzvy7iKRQZE58EyBC5mpo8LPqdqAPbjn20I5wUPOWA6zDUfrCCkNTXTAGKbdKqoKKSt1WYu5mT+ND2/i22XqJrSmvrGt1QYS+/JnAEPvNlEiLxMHJ0L0l8F5yUYqMJ5upul0Nlacds/oIRjNWbjsuFZ/adnTiNxOY+JQCWZfZdSwFMNs75seYS5DXYVbNDrtyTnD2aK9xg5EDPwgtvpYB0c9g1isAKRkfOzuUKZncrcVtDLstgwrDl68dg="
+    file_glob: true
+    file: "host/*.zip"
+    on:
+      tags: true
diff --git a/host/BuildCWH.xml b/host/BuildCWH.xml
@@ -1,13 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Packaging Generator" default="BuildCWH">
-	<target name="BuildCWH" description="build server and client">
+	<property environment="env"/>
+
+	<target name="git" description="Store git revision in ${repository.version}">
+	    <exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
+	        <arg value="describe"/>
+	        <arg value="--abbrev=5"/>
+	        <arg value="--always"/>
+	        <arg value="--tags"/>
+	    </exec>
+	    <condition property="repo.version" value="${git.revision}" else="unknown">
+	        <and>
+	            <isset property="git.revision"/>
+	            <length string="${git.revision}" trim="yes" length="0" when="greater"/>
+	        </and>
+	    </condition>
+			<echo>Repo version is: ${repo.version}</echo>
+	</target>
+
+	<target name="BuildCWH" depends="git" description="build server and client">
 		<buildnumber/>
-		<property name="deployedServerZipFile" value="cwh-0.${build.number}.zip"/>
-		<property name="deployedTestZipFile" value="cwhTestKit-0.${build.number}.zip"/>
-		<property name="deployedClientZipFile" value="cwhClient-0.${build.number}.zip"/>
+
+		<condition property="deployedServerZipFile" value="cwh-${repo.version}-${build.number}.zip"
+			else="cwh-0.${build.number}.zip">
+			<istrue value="${env.CI}"/>
+		</condition>
+
+		<condition property="deployedTestZipFile" value="cwhTestKit-${repo.version}-${build.number}.zip"
+			else="cwhTestKit-0.${build.number}.zip">
+			<istrue value="${env.CI}"/>
+		</condition>
+
+		<condition property="deployedClientZipFile" value="cwhClient-${repo.version}-${build.number}.zip"
+			else="cwhClient-0.${build.number}.zip">
+			<istrue value="${env.CI}"/>
+		</condition>
+
+		<copy file="build.number" tofile="srcbin/build.number" overwrite="yes">
+			<filterchain>
+				<replacetokens>
+					<token key="@REPO_VER@" value="${repo.version}" />
+				</replacetokens>
+			</filterchain>
+		</copy>
 
 		<zip destfile="${deployedServerZipFile}">
-			<zipfileset dir="." includes="**/build.number"/>
+			<zipfileset dir="srcbin" includes="**/build.number"/>
 			<zipfileset dir="srcbin" includes="**/*.class"/>
 			<zipfileset dir="srcbin" includes="**/*.png"/>
 			<zipfileset dir="srcbin" includes="**/*.properties"/>
@@ -31,7 +69,7 @@
 			<zipfileset dir="libs/log4j" prefix="lib" includes="**/*"/>
 		</zip>
 		<zip destfile="${deployedTestZipFile}">
-			<zipfileset dir="." includes="**/build.number"/>
+			<zipfileset dir="srcbin" includes="**/build.number"/>
 			<zipfileset dir="srcbin" includes="**/*.class"/>
 			<zipfileset dir="srcbin" includes="**/*.png"/>
 			<zipfileset dir="srcbin" includes="**/*.properties"/>
@@ -58,6 +96,7 @@
       <zipfileset dir="libs/alphanumeric-comparator" prefix="lib" includes="**/*"/>
 		</zip>
 		<zip destfile="${deployedClientZipFile}">
+			<zipfileset dir="srcbin" includes="**/build.number"/>
 			<zipfileset dir="srcbin/org/area515/resinprinter/client" prefix="org/area515/resinprinter/client" includes="**/*.class"/>
 			<zipfileset dir="srcbin/org/area515/resinprinter/slice" prefix="org/area515/resinprinter/slice" includes="**/*.class"/>
 			<zipfileset dir="srcbin/org/area515/resinprinter/stl" prefix="org/area515/resinprinter/stl" includes="**/*.class"/>

diff --git a/host/build.number b/host/build.number
@@ -1,3 +1,4 @@
 #Build Number for ANT. Do not edit!
 #Sun Feb 14 18:09:03 CST 2016
 build.number=228
+repo.version=@@REPO_VER@@