Menu
▾
▴
[Arianne-commits] stendhal build.xml,1.284,1.285
|
From: Hendrik B. <nh...@us...> - 2010-05-31 22:46:36
|
Update of /cvsroot/arianne/stendhal In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12764 Modified Files: build.xml Log Message: don't include signed jar files in the source download because that will cause the automatic updater to think it is an offical release. And therefore it will try to update it and download signed jar files causing java to refuse to the start the client because of mixed signing status within one package (fixes #2996229) Index: build.xml =================================================================== RCS file: /cvsroot/arianne/stendhal/build.xml,v retrieving revision 1.284 retrieving revision 1.285 diff -C2 -d -r1.284 -r1.285 *** build.xml 2 May 2010 16:00:45 -0000 1.284 --- build.xml 31 May 2010 22:46:27 -0000 1.285 *************** *** 24,27 **** --- 24,31 ---- <property name="build_stendhaltools" value="${buildroot}/build_stendhaltools"/> <property name="build_stendhaltextclient" value="${buildroot}/build_stendhaltextclient"/> + + <property name="build_sign" value="${buildroot}/build_sign"/> + + <property name="build_client" value="${buildroot}/build_client"/> <property name="client_data" value="stendhal-data-${version}.jar"/> *************** *** 119,122 **** --- 123,127 ---- <delete dir="${build_server_maps}" /> <delete dir="${build_server_script}" /> + <delete dir="${build_sign}" /> <delete dir="${buildroot}/build_server_quests" /> <delete dir="${buildroot}/build_server_xmlconf" /> *************** *** 483,488 **** </condition> ! <target name="sign_jars" depends="server_build, client_build" unless="exclude.signing"> ! <signjar alias="${keystore.alias}" keystore="keystore.ks" storepass="${keystore.password}"> <fileset dir="${lib}"> <include name="**/*.jar"/> --- 488,494 ---- </condition> ! <target name="prepare_sign" depends="server_build, client_build"> ! <mkdir dir="${build_sign}" /> ! <copy todir="${build_sign}"> <fileset dir="${lib}"> <include name="**/*.jar"/> *************** *** 492,495 **** --- 498,509 ---- <fileset file="${pagelayout_jar}"/> <fileset file="${jorbis_jar}"/> + </copy> + </target> + + <target name="sign_jars" depends="prepare_sign" unless="exclude.signing"> + <signjar alias="${keystore.alias}" keystore="keystore.ks" storepass="${keystore.password}"> + <fileset dir="${build_sign}"> + <include name="**/*.jar"/> + </fileset> </signjar> </target> *************** *** 544,555 **** <mkdir dir="${buildroot}/stendhal-${version}/log"/> ! <copy todir="${buildroot}/stendhal-${version}" file="${lib}/${client_jarname}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${log4j_jar}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${marauroa_jar}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${pagelayout_jar}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${jorbis_jar}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${lib}/${client_sound_data}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${lib}/${client_music_data}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${lib}/${client_data}"/> <copy todir="${buildroot}/stendhal-${version}/lib"> <fileset dir="libs"> --- 558,569 ---- <mkdir dir="${buildroot}/stendhal-${version}/log"/> ! <copy todir="${buildroot}/stendhal-${version}" file="${build_sign}/${client_jarname}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/log4j.jar"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/marauroa.jar"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/pagelayout1.16.jar"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/jorbis.jar"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/${client_sound_data}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/${client_music_data}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/${client_data}"/> <copy todir="${buildroot}/stendhal-${version}/lib"> <fileset dir="libs"> *************** *** 575,584 **** <mkdir dir="${buildroot}/stendhal-${version}/log"/> ! <copy todir="${buildroot}/stendhal-${version}" file="${lib}/${client_jarname}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${log4j_jar}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${marauroa_jar}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${pagelayout_jar}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${jorbis_jar}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${lib}/${client_data}"/> <copy todir="${buildroot}/stendhal-${version}/lib"> <fileset dir="libs"> --- 589,598 ---- <mkdir dir="${buildroot}/stendhal-${version}/log"/> ! <copy todir="${buildroot}/stendhal-${version}" file="${build_sign}/${client_jarname}"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/log4j.jar"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/marauroa.jar"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/pagelayout1.16.jar"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/jorbis.jar"/> ! <copy todir="${buildroot}/stendhal-${version}/lib" file="${build_sign}/${client_data}"/> <copy todir="${buildroot}/stendhal-${version}/lib"> <fileset dir="libs"> *************** *** 601,605 **** <target name="dist_client_starter"> <mkdir dir="${buildroot}/stendhal-${version}"/> ! <copy todir="${buildroot}/stendhal-${version}" file="${lib}/${client_starter_jarname}"/> <copy todir="${buildroot}/stendhal-${version}/lib"> <fileset dir="libs"> --- 615,619 ---- <target name="dist_client_starter"> <mkdir dir="${buildroot}/stendhal-${version}"/> ! <copy todir="${buildroot}/stendhal-${version}" file="${build_sign}//${client_starter_jarname}"/> <copy todir="${buildroot}/stendhal-${version}/lib"> <fileset dir="libs"> |