zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup. Move output of packaging to dist directory. Don't always create resources directory. Make jar take on the package name. 

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1023 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
hanna 2009-06-16 22:47:23 +00:00
parent 78b7fb25c7
commit e2ccea4883
2 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.xml
View File

@ -270,8 +270,9 @@
<!-- Build a package consisting of all supporting files --> <!-- Build a package consisting of all supporting files -->
<target name="package" depends="dist,stage" description="bundle up an executable for distribution"> <target name="package" depends="dist,stage" description="bundle up an executable for distribution">
<xslt in="packages/${executable}.xml" out="packages/Build${executable}.xml" style="packages/CreatePackager.xsl" /> <mkdir dir="dist/packages" />
<ant antfile="packages/Build${executable}.xml" /> <xslt in="packages/${executable}.xml" out="dist/packages/Build${executable}.xml" style="packages/CreatePackager.xsl" />
<ant antfile="dist/packages/Build${executable}.xml" />
</target> </target>
<target name="clean" description="clean up"> <target name="clean" description="clean up">

70
packages/CreatePackager.xsl
View File

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:variable name="ant.basedir" select="'${basedir}'" />
<xsl:variable name="sting.dir" select="'${sting.dir}/'" />
<xsl:variable name="dist.dir" select="'${sting.dir}/dist'" />
<xsl:variable name="staging.dir" select="'${sting.dir}/staging'" />
<xsl:variable name="package.dir" select="'${package.dir}/'" />
<xsl:variable name="resources.dir" select="'${package.dir}/resources'" />
<xsl:template match="package"> <xsl:template match="package">
<xsl:output method="xml" indent="yes"/> <xsl:output method="xml" indent="yes"/>
<xsl:variable name="project.name" select="name" /> <xsl:variable name="project.name" select="name" />
<xsl:variable name="ant.basedir" select="'${basedir}'" />
<xsl:variable name="sting.dir" select="'${sting.dir}/'" />
<xsl:variable name="staging.dir" select="'${sting.dir}/staging'" />
<xsl:variable name="package.dir" select="'${package.dir}/'" />
<xsl:variable name="resources.dir" select="'${package.dir}/resources'" />
<project name="{$project.name}" default="package" basedir=".."> <project name="{$project.name}" default="package" basedir="..">
<property name="sting.dir" value="{$ant.basedir}" /> <property name="sting.dir" value="{$ant.basedir}" />
<property name="package.dir" value="{concat($ant.basedir,'/packages/',$project.name)}" /> <property name="package.dir" value="{concat($dist.dir,'/packages/',$project.name)}" />
<target name="package"> <target name="package">
<mkdir dir="{$package.dir}"/> <mkdir dir="{$package.dir}"/>
<mkdir dir="{$resources.dir}"/> <jar jarfile="{concat($package.dir,'/',$project.name,'.jar')}">
<jar jarfile="{concat($package.dir,'/GenomeAnalysisTK.jar')}">
<classfileset dir="{$staging.dir}"> <classfileset dir="{$staging.dir}">
<root classname="{main-class}"/> <root classname="{main-class}"/>
<xsl:for-each select="dependencies/class"> <xsl:for-each select="dependencies/class">
@ -31,39 +31,42 @@
</manifest> </manifest>
</jar> </jar>
<xsl:for-each select="scripts/file"> <xsl:for-each select="scripts/file">
<xsl:variable name="short.name"> <xsl:call-template name="symlink">
<xsl:call-template name="get-short-name"> <xsl:with-param name="file.name" select="." />
<xsl:with-param name="string" select="." /> <xsl:with-param name="target.dir" select="$package.dir" />
</xsl:call-template> </xsl:call-template>
</xsl:variable>
<xsl:variable name="full.path">
<xsl:call-template name="get-full-path">
<xsl:with-param name="working-dir" select="$sting.dir"/>
<xsl:with-param name="file" select="."/>
</xsl:call-template>
</xsl:variable>
<delete file="{concat($package.dir,$short.name)}" />
<symlink link="{concat($package.dir,$short.name)}" resource="{$full.path}" />
</xsl:for-each> </xsl:for-each>
<xsl:for-each select="resources/file"> <xsl:for-each select="resources/file">
<xsl:variable name="short.name"> <mkdir dir="{$resources.dir}"/>
<xsl:call-template name="get-short-name"> <xsl:call-template name="symlink">
<xsl:with-param name="string" select="." /> <xsl:with-param name="file.name" select="." />
<xsl:with-param name="target.dir" select="concat($resources.dir,'/')" />
</xsl:call-template> </xsl:call-template>
</xsl:variable>
<xsl:variable name="full.path">
<xsl:call-template name="get-full-path">
<xsl:with-param name="working-dir" select="$sting.dir"/>
<xsl:with-param name="file" select="."/>
</xsl:call-template>
</xsl:variable>
<delete file="{concat($resources.dir,'/',$short.name)}" />
<symlink link="{concat($resources.dir,'/',$short.name)}" resource="{$full.path}" overwrite="true" />
</xsl:for-each> </xsl:for-each>
</target> </target>
</project> </project>
</xsl:template> </xsl:template>
<!-- Create a symlink for the given file in the given target directory -->
<xsl:template name="symlink">
<xsl:param name="file.name" />
<xsl:param name="target.dir" />
<xsl:variable name="short.name">
<xsl:call-template name="get-short-name">
<xsl:with-param name="string" select="$file.name" />
</xsl:call-template>
</xsl:variable>
<xsl:variable name="full.path">
<xsl:call-template name="get-full-path">
<xsl:with-param name="working-dir" select="$sting.dir"/>
<xsl:with-param name="file" select="$file.name" />
</xsl:call-template>
</xsl:variable>
<delete file="{concat($target.dir,'/',$short.name)}" />
<symlink link="{concat($target.dir,'/',$short.name)}" resource="{$full.path}" overwrite="true" />
</xsl:template>
<!-- Determine the short name (filename w/o directory structure of the given filename -->
<xsl:template name="get-short-name"> <xsl:template name="get-short-name">
<xsl:param name="string"/> <xsl:param name="string"/>
<xsl:choose> <xsl:choose>
@ -76,6 +79,7 @@
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<!-- Determine the full path of the given filename. Take into account absolute / relative paths -->
<xsl:template name="get-full-path"> <xsl:template name="get-full-path">
<xsl:param name="working-dir"/> <xsl:param name="working-dir"/>
<xsl:param name="file"/> <xsl:param name="file"/>