From: <jpi...@us...> - 2011-12-05 21:49:09
|
Revision: 3707 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3707&view=rev Author: jpilgrim Date: 2011-12-05 21:49:02 +0000 (Mon, 05 Dec 2011) Log Message: ----------- signing information are interactively retrieved similar to applet build Modified Paths: -------------- trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml Modified: trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml =================================================================== --- trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml 2011-12-05 12:41:45 UTC (rev 3706) +++ trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml 2011-12-05 21:49:02 UTC (rev 3707) @@ -457,15 +457,19 @@ * ******************************************************************** --> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/features/org.lwjgl_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" keypass="${keypass}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/features/org.lwjgl.sdk_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" keypass="${keypass}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" keypass="${keypass}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.doc_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" keypass="${keypass}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.source_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" keypass="${keypass}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.info_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" keypass="${keypass}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.tools_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" keypass="${keypass}" /> + <input message="Please enter the keystore" addproperty="keystore.location" defaultvalue="applet/lwjglkeystore"/> + <input message="Please enter the keystore alias" addproperty="keystore.alias" defaultvalue="lwjgl"/> + <input message="Please type the password for the keystore" addproperty="sign.pwd" defaultvalue="123456"/> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/features/org.lwjgl_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/features/org.lwjgl.sdk_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.doc_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.source_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.info_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.tools_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> + <echo>Created Eclipse update site: ${eclipse.build.plugins}/org.lwjgl.updatesite</echo> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2011-12-06 22:46:34
|
Revision: 3709 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3709&view=rev Author: matzon Date: 2011-12-06 22:46:27 +0000 (Tue, 06 Dec 2011) Log Message: ----------- updating update site build script to use pre-packaged zip file in dist, updating signjar to not use keypass Modified Paths: -------------- trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml Modified: trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml =================================================================== --- trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml 2011-12-06 22:42:23 UTC (rev 3708) +++ trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml 2011-12-06 22:46:27 UTC (rev 3709) @@ -17,7 +17,6 @@ <property name="keystore" value="teststore" /> <property name="alias" value="tester" /> <property name="password" value="tester" /> - <property name="keypass" value="${password}" /> <property name="eclipse.updatesite" value="http://www.lwjgl.org/update/" /> <property name="eclipse.bundle.vendor" value="lwjgl.org" /> @@ -59,8 +58,10 @@ <property name="NL" value=" " /> - <target name="eclipse-updatesite" depends="release"> - <antcall target="eclipse-updatesite-simple" /> + <target name="eclipse-updatesite"> + <mkdir dir="${lwjgl.temp}"/> + <unzip dest="${lwjgl.temp}/eclipse" src="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" /> + <antcall target="eclipse-updatesite-simple"> </target> @@ -97,7 +98,7 @@ </copy> <!-- Copy LWJGL native files and classes --> <copy todir="${eclipse.build.plugins}/org.lwjgl"> - <fileset dir="${lwjgl.temp}"> + <fileset dir="${lwjgl.temp}/eclipse/lwjgl-${lwjgl.version}/"> <patternset refid="lwjgl_base"/> </fileset> </copy> @@ -247,7 +248,7 @@ <!-- Calculate package export and bundle class paths --> <packagelist property="eclipse.bundle.export-package" pathsep=",${NL} "> - <fileset dir="${lwjgl.temp}/jar"> + <fileset dir="${lwjgl.temp}/eclipse/lwjgl-${lwjgl.version}/jar"> <exclude name="**/lwjgl-debug.jar" /> </fileset> <patternset> @@ -256,8 +257,8 @@ </patternset> </packagelist> <pathconvert property="eclipse.bundle.classpath.jars" pathsep=",${NL} "> - <map from="${lwjgl.temp}/jar/" to="" /> - <fileset dir="${lwjgl.temp}/jar"> + <map from="${lwjgl.temp}/eclipse/lwjgl-${lwjgl.version}/jar/" to="" /> + <fileset dir="${lwjgl.temp}/eclipse/lwjgl-${lwjgl.version}/jar"> <exclude name="**/lwjgl-debug.jar" /> <exclude name="**/lwjgl_test.jar" /> </fileset> @@ -457,19 +458,14 @@ * ******************************************************************** --> - <input message="Please enter the keystore" addproperty="keystore.location" defaultvalue="applet/lwjglkeystore"/> - <input message="Please enter the keystore alias" addproperty="keystore.alias" defaultvalue="lwjgl"/> - <input message="Please type the password for the keystore" addproperty="sign.pwd" defaultvalue="123456"/> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/features/org.lwjgl_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/features/org.lwjgl.sdk_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.doc_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.source_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.info_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" /> + <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.tools_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/features/org.lwjgl_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/features/org.lwjgl.sdk_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.doc_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.source_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.info_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> - <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.tools_${eclipse.normversion}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${sign.pwd}" /> - - <echo>Created Eclipse update site: ${eclipse.build.plugins}/org.lwjgl.updatesite</echo> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpi...@us...> - 2011-12-15 17:40:12
|
Revision: 3711 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3711&view=rev Author: jpilgrim Date: 2011-12-15 17:40:06 +0000 (Thu, 15 Dec 2011) Log Message: ----------- fixed typo in update site build script, added publisher task Modified Paths: -------------- trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml Modified: trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml =================================================================== --- trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml 2011-12-15 17:32:08 UTC (rev 3710) +++ trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml 2011-12-15 17:40:06 UTC (rev 3711) @@ -23,14 +23,19 @@ <taskdef name="packagelist" classname="org.lwjgl.ant.PackageList"> <classpath> - <pathelement location="eclipse-update/org.lwjgl.build/anttasks.jar" /> + <pathelement location="${eclipse.antscript.basedir}/anttasks.jar" /> </classpath> </taskdef> <taskdef name="normalizeversion" classname="org.lwjgl.ant.NormalizeVersion"> <classpath> - <pathelement location="eclipse-update/org.lwjgl.build/anttasks.jar" /> + <pathelement location="${eclipse.antscript.basedir}/anttasks.jar" /> </classpath> </taskdef> + <taskdef name="publishBundlesAndFeatures" classname="org.lwjgl.ant.StandalonePublisher"> + <classpath> + <pathelement location="${eclipse.antscript.basedir}/anttasks.jar" /> + </classpath> + </taskdef> <!-- properties imported from build-definitions.xml: <property name="lwjgl.temp" location="temp" /> @@ -61,7 +66,7 @@ <target name="eclipse-updatesite"> <mkdir dir="${lwjgl.temp}"/> <unzip dest="${lwjgl.temp}/eclipse" src="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" /> - <antcall target="eclipse-updatesite-simple"> + <antcall target="eclipse-updatesite-simple" /> </target> @@ -466,6 +471,29 @@ <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.info_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" /> <signjar jar="${eclipse.build.plugins}/org.lwjgl.updatesite/plugins/org.lwjgl.tools_${eclipse.normversion}.jar" keystore="${keystore}" alias="${alias}" storepass="${password}" /> + <!-- ******************************************************************* + * + * Publish plugins and feature + * content.xml/jar and artifacts.xml/jar, required for some newer featues + * and tools such as Eclipse Tycho. + * + ******************************************************************** --> + <publishBundlesAndFeatures compressed="true" + updatesitefolder="${eclipse.build.plugins}/org.lwjgl.updatesite" + repositoryname="lwjgl.org" + repositoryuri="${eclipse.updatesite}" /> + <jar destfile="${eclipse.build.plugins}/org.lwjgl.updatesite/content.jar"> + <fileset file="${eclipse.build.plugins}/org.lwjgl.updatesite/content.xml" /> + </jar> + <jar destfile="${eclipse.build.plugins}/org.lwjgl.updatesite/artifacts.jar"> + <fileset file="${eclipse.build.plugins}/org.lwjgl.updatesite/artifacts.xml" /> + </jar> + <delete> + <fileset file="${eclipse.build.plugins}/org.lwjgl.updatesite/content.xml" /> + <fileset file="${eclipse.build.plugins}/org.lwjgl.updatesite/artifacts.xml" /> + </delete> + + <echo>Created Eclipse update site: ${eclipse.build.plugins}/org.lwjgl.updatesite</echo> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |