Merge pull request #54 from btcz/vaultz

build for sapling and vaultz at block 328,500

Author: cryptorex

bitcoinz-wallet/put.binaries.here.txt

@@ -1,4 +1,4 @@
 Put here:
 "jre" dir from: java-1.8.0-openjdk-1.8.0.141-1.b16.ojdkbuild.windows.x86_64.zip
-zcash-cli.exe
-zcashd.exe
+bitcoinz-cli.exe
+bitcoinzd.exe

src/build/build.xml

@@ -1,11 +1,11 @@
 <!--
- *  _________          _     ____          _           __        __    _ _      _   _   _ ___ 
+ *  _________          _     ____          _           __        __    _ _      _   _   _ ___
  * |__  / ___|__ _ ___| |__ / ___|_      _(_)_ __   __ \ \      / /_ _| | | ___| |_| | | |_ _|
- *   / / |   / _` / __| '_ \\___ \ \ /\ / / | '_ \ / _` \ \ /\ / / _` | | |/ _ \ __| | | || | 
- *  / /| |__| (_| \__ \ | | |___) \ V  V /| | | | | (_| |\ V  V / (_| | | |  __/ |_| |_| || | 
+ *   / / |   / _` / __| '_ \\___ \ \ /\ / / | '_ \ / _` \ \ /\ / / _` | | |/ _ \ __| | | || |
+ *  / /| |__| (_| \__ \ | | |___) \ V  V /| | | | | (_| |\ V  V / (_| | | |  __/ |_| |_| || |
  * /____\____\__,_|___/_| |_|____/ \_/\_/ |_|_| |_|\__, | \_/\_/ \__,_|_|_|\___|\__|\___/|___|
- *                                                 |___/                                      
- *                                       
+ *                                                 |___/
+ *
  * Copyright (c) 2016-2017 Ivan Vaklinov <ivan@vaklinov.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -14,21 +14,21 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.                                    
+ * THE SOFTWARE.
  *
 -->
 <project name="BitcoinZWallet" basedir="../.." default="buildit">
-	
+
     <property name="src.dir"     value="src"/>
 	<property name="lib.dir"     value="lib"/>
     <property name="build.dir"   value="build"/>
@@ -65,12 +65,13 @@
     <target name="clean">
         <delete dir="${build.dir}"/>
     </target>
-	
+
     <target name="copyResources" depends="clean">
-    	<copy todir="${classes.dir}" >  
-    	    <fileset dir="${src.dir}/resources">  
+    	<copy todir="${classes.dir}" >
+    	    <fileset dir="${src.dir}/resources">
     	        <include name="images/**"/>
     	        <include name="keys/**"/>
+													<include name="messages/**"/>
     	    </fileset>
     	</copy>
     </target>
@@ -84,19 +85,19 @@
 
     <target name="jar" depends="compile,copyResources">
         <mkdir dir="${jar.dir}"/>
-        <jar destfile="${jar.dir}/${ant.project.name}.jar" 
+        <jar destfile="${jar.dir}/${ant.project.name}.jar"
         	 basedir="${classes.dir}"
         	 excludes="**/tradetest/*.class">
             <manifest>
                 <attribute name="Main-Class" value="${main-class}"/>
                 <attribute name="Class-Path" value="bitcoinj-core-0.14.5.jar sqlite-jdbc-3.21.0.jar"/>
             </manifest>
         </jar>
-        <jar destfile="${jar.dir}/${ant.project.name}-src.jar" 
+        <jar destfile="${jar.dir}/${ant.project.name}-src.jar"
         	 basedir="${src.dir}">
         </jar>
     </target>
-	
+
     <target name="ubuntuPackage" depends="jar,copyothers">
     	<mkdir dir="${ubuntu.package.dir}"/>
 	    <deb destfile="${ubuntu.package.dir}/bitcoinz-wallet_1.1.0.4.deb"
@@ -163,8 +164,8 @@
 	-->
 
 	<target name="copyothers">
-    	<copy todir="${jar.dir}" >  
-    	    <fileset dir="${lib.dir}">  
+    	<copy todir="${jar.dir}" >
+    	    <fileset dir="${lib.dir}">
     	        <include name="bitcoinj-core-0.14.5*"/>
 				<include name="sqlite-jdbc-3.21.0*"/>
     	    </fileset>
@@ -181,4 +182,3 @@
 	</target>
 
 </project>
-