inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes in the ant targets

Browse Source 
* Get properties from the pom file rather than defining it again in the build.properties
 * Add to the created zip file name for the localisation package the project version
 * Remove "assembleIconPackage" for rm-server

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@60559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-01-25 21:58:43 +00:00
parent 66027bda20
commit a7839d51d5
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@@ -2,8 +2,6 @@
# create a file called "build.local.properties" in the same folder and change the value in that file. # create a file called "build.local.properties" in the same folder and change the value in that file.
# The application war file properties # The application war file properties
app.war.version=4.2.0
app.war.groupId=org.alfresco
app.war.packaging=war app.war.packaging=war
# Executable properties # Executable properties

25
build.xml
View File

@@ -20,11 +20,12 @@
</target> </target>
<target name="fetchWarFile"> <target name="fetchWarFile">
<xmlproperty file="../pom.xml" keepRoot="false"/>
<exec executable="${mvn.exec}" failonerror="true"> <exec executable="${mvn.exec}" failonerror="true">
<arg value="dependency:get" /> <arg value="dependency:get" />
<arg value="-DgroupId=${app.war.groupId}" /> <arg value="-DgroupId=${groupId}" />
<arg value="-DartifactId=${app.war.artifactId}" /> <arg value="-DartifactId=${app.war.artifactId}" />
<arg value="-Dversion=${app.war.version}" /> <arg value="-Dversion=${properties.alfresco.base.version}" />
<arg value="-Dpackaging=${app.war.packaging}" /> <arg value="-Dpackaging=${app.war.packaging}" />
<arg value="-Ddest=${ant.build.directory}/${app.package}" /> <arg value="-Ddest=${ant.build.directory}/${app.package}" />
</exec> </exec>
@@ -79,16 +80,13 @@
<exclude name="**/file-mapping.properties" /> <exclude name="**/file-mapping.properties" />
</fileset> </fileset>
</copy> </copy>
<zip destfile="${i18n}/${ant.project.name}-r${Revision}.zip" basedir="${i18n}" /> <xmlproperty file="../pom.xml" keepRoot="false"/>
<zip destfile="${i18n}/${ant.project.name}-${version}-r${Revision}.zip" basedir="${i18n}" />
</target> </target>
<target name="assembleIconPackage" description=""> <target name="copyWebDirectory" if="${web.directory.exists}">
<delete dir="${ant.build.directory}/icons" failonerror="true" /> <copy todir="${app.folder}" failonerror="true">
<copy todir="${ant.build.directory}/icons/${ant.project.name}" failonerror="true"> <fileset dir="${ant.source.web.directory}" />
<fileset dir=".">
<include name="**/*.png"/>
<exclude name="**/${ant.build.directory}/**"/>
</fileset>
</copy> </copy>
</target> </target>
@@ -111,8 +109,9 @@
<exclude name="**/file-mapping.properties" /> <exclude name="**/file-mapping.properties" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${app.folder}" failonerror="false"> <condition property="web.directory.exists">
<fileset dir="${ant.source.web.directory}" /> <available file="${ant.source.web.directory}" type="dir" />
</copy> </condition>
<antcall target="copyWebDirectory"></antcall>
</target> </target>
</project> </project>