Author: nhosoi
Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7628
Modified Files: build.properties build.xml Log Message: [186105] Admin Server Makefile updates for Internal build Comment #12 . Preference version number was changed to CONSOLE-MAJOR-VERSION.0 . To do that, introduced Console.MAJOR_VERSION . changed to include the patch number in the jar file name . changed to create a symlink: redhat-mcc-7.2.jar pointing to redhat-mcc-7.2.0.jar
Index: build.properties =================================================================== RCS file: /cvs/dirsec/console/build.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.properties 29 Nov 2005 18:36:50 -0000 1.7 +++ build.properties 24 Mar 2006 01:04:00 -0000 1.8 @@ -21,15 +21,21 @@
lang=en
+console.brand=fedora + console.root=. console.version=10 -console.dotversion=1.0 +console.dotversion=1.0.2 +console.dotgenversion=1.0
-mcc.core=fedora-mcc +mcc.core=${console.brand}-mcc mcc.name=${mcc.core}-${console.dotversion} +mcc.gen.name=${mcc.core}-${console.dotgenversion}
-nmclf.core=fedora-nmclf +nmclf.core=${console.brand}-nmclf nmclf.name=${nmclf.core}-${console.dotversion} +nmclf.gen.name=${nmclf.core}-${console.dotgenversion}
-base.core=fedora-base +base.core=${console.brand}-base base.name=${base.core}-${console.dotversion} +base.gen.name=${base.core}-${console.dotgenversion}
Index: build.xml =================================================================== RCS file: /cvs/dirsec/console/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- build.xml 20 Mar 2006 21:54:02 -0000 1.10 +++ build.xml 24 Mar 2006 01:04:00 -0000 1.11 @@ -172,10 +172,10 @@ destdir="${built.classdir}" debug="${compile.debug}" debuglevel="lines,vars,source" - deprecation="${compile.deprecation}" + deprecation="${compile.deprecation}" optimize="${compile.optimize}" verbose="no" - fork="true" + fork="true" excludes="**/CVS/**"> <classpath refid="console.classpath" /> </javac> @@ -257,6 +257,22 @@ <copy file="${built.jardir}/${nmclf.name}.jar" todir="${java.dir}"/> <copy file="${built.jardir}/${nmclf.name}_${lang}.jar" todir="${java.dir}"/> <copy file="${built.jardir}/${base.name}.jar" todir="${java.dir}"/> + <!-- make a symlinks: e.g., prefix-mcc-1.0.0.jar to prefix-mcc-1.0.jar --> + <exec executable="ln" dir="${java.dir}" vmlauncher="true"> + <arg line="-s ${mcc.name}.jar ${mcc.gen.name}.jar"/> + </exec> + <exec executable="ln" dir="${java.dir}" vmlauncher="true"> + <arg line="-s ${mcc.name}_${lang}.jar ${mcc.gen.name}_${lang}.jar"/> + </exec> + <exec executable="ln" dir="${java.dir}" vmlauncher="true"> + <arg line="-s ${nmclf.name}.jar ${nmclf.gen.name}.jar"/> + </exec> + <exec executable="ln" dir="${java.dir}" vmlauncher="true"> + <arg line="-s ${nmclf.name}_${lang}.jar ${nmclf.gen.name}_${lang}.jar"/> + </exec> + <exec executable="ln" dir="${java.dir}" vmlauncher="true"> + <arg line="-s ${base.name}.jar ${base.gen.name}.jar"/> + </exec>
<!-- Copy components into packaging area --> <copy file="${ldapjdk.local.location}/ldapjdk.jar" todir="${java.dir}"/> @@ -270,6 +286,7 @@ <include name="libssl*"/> <include name="libsmime*"/> <include name="libsoftokn*"/> + <include name="libfreebl*"/> <exclude name="libnssckbi*"/> <exclude name="lib*.a"/> </fileset> @@ -285,15 +302,15 @@ <chmod file="${package.dir}/startconsole" perm="755"/>
<!-- Create a bundle of the Console --> - <tar destfile="${dist.dir}/fedora-console-${console.dotversion}.tar.gz" + <tar destfile="${dist.dir}/${console.brand}-console-${console.dotversion}.tar.gz" compression="gzip"> <tarfileset dir="${package.dir}" - prefix="fedora-console-${console.dotversion}" + prefix="${console.brand}-console-${console.dotversion}" mode="755"> <include name="startconsole"/> </tarfileset> <tarfileset dir="${package.dir}" - prefix="fedora-console-${console.dotversion}"> + prefix="${console.brand}-console-${console.dotversion}"> <include name="**"/> <exclude name="startconsole"/> </tarfileset>