Skip to content

Commit

Permalink
Merged "develop" branch
Browse files Browse the repository at this point in the history
  • Loading branch information
lvca committed Nov 3, 2013
2 parents d634c4f + 29716bd commit 1719a33
Show file tree
Hide file tree
Showing 775 changed files with 39,997 additions and 50,188 deletions.
144 changes: 73 additions & 71 deletions _base/base-build.xml
Original file line number Diff line number Diff line change
@@ -1,88 +1,90 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Copyright (c) 1999-2010 Luca Garulli - LICENSE: Apache 2.0 -->
<project basedir=".">
<property name="project.src" value="src/main/java" />
<property name="project.src2" value="${project.src}" />
<property name="project.res" value="src/main/resources" />
<property name="project.lib" value="lib" />
<property name="project.lib2" value="${project.lib}" />
<property name="project.doc" value="doc" />
<property name="project.build" value="target/classes" />
<property name="project.dist" value="target" />
<property name="project.is-debug" value="true" />
<property name="project.debug-level" value="lines,vars,source" />
<property name="project.target-comp" value="1.6" />
<property name="project.source-comp" value="1.6" />
<property name="build.sysclasspath" value="ignore" />
<property name="project.src" value="src/main/java"/>
<property name="project.src2" value="${project.src}"/>
<property name="project.res" value="src/main/resources"/>
<property name="project.lib" value="lib"/>
<property name="project.lib2" value="${project.lib}"/>
<property name="project.doc" value="doc"/>
<property name="project.build" value="target/classes"/>
<property name="project.dist" value="target"/>
<property name="project.is-debug" value="true"/>
<property name="project.debug-level" value="lines,vars,source"/>
<property name="project.target-comp" value="1.6"/>
<property name="project.source-comp" value="1.6"/>
<property name="build.sysclasspath" value="ignore"/>

<path id="project.classpath">
<filelist dir=".." files="${project.jar-deps}" />
<fileset dir="${project.lib}" includes="**/*.jar" />
<fileset dir="${project.lib2}" includes="**/*.jar" />
<fileset dir=".." includes="**/target/*.jar" />
</path>
<path id="project.classpath">
<filelist dir=".." files="${project.jar-deps}"/>
<fileset dir="${project.lib}" includes="**/*.jar"/>
<fileset dir="${project.lib2}" includes="**/*.jar"/>
<fileset dir=".." includes="**/target/*.jar"/>
</path>

<target name="init">
<echo>-----------------------------------</echo>
<echo>-> ${ant.project.name}</echo>
<echo>-----------------------------------</echo>
<mkdir dir="${project.build}" />
</target>
<target name="init">
<echo>-----------------------------------</echo>
<echo>-> ${ant.project.name}</echo>
<echo>-----------------------------------</echo>
<mkdir dir="${project.build}"/>
</target>

<target name="clean">
<delete dir="${project.build}" />
<delete dir="${project.dist}" />
</target>
<target name="clean">
<delete dir="${project.build}"/>
<delete dir="${project.dist}"/>
</target>

<target name="compile" depends="init">
<mkdir dir="${project.lib}" />
<javac destdir="${project.build}" debug="${project.is-debug}" debuglevel="${project.debug-level}" target="${project.target-comp}" source="${project.source-comp}" verbose="false" includeAntRuntime="false">
<src path="${project.src}" />
<src path="${project.src2}" />
<classpath refid="project.classpath" />
</javac>
<target name="compile" depends="init">
<mkdir dir="${project.lib}"/>
<javac destdir="${project.build}" debug="${project.is-debug}" debuglevel="${project.debug-level}"
target="${project.target-comp}" source="${project.source-comp}" verbose="false"
includeAntRuntime="false">
<src path="${project.src}"/>
<src path="${project.src2}"/>
<classpath refid="project.classpath"/>
</javac>
<!--<copydir dest="${web.dir}/${deploy.name}" src="${src.web.dir}">
<include name="**/*" />
</copydir> -->

<copy todir="${project.build}">
<fileset dir="${project.res}">
<fileset dir="${project.res}">
<include name="**/*"/>
</fileset>
</copy>
</target>
</fileset>
</copy>
</target>

<target name="jar" depends="compile">
<mkdir dir="${project.dist}" />
<delete file="${project.dist}/${project.dist}/${ant.project.name}-${version}.jar" />
<jar compress="true" basedir="${project.build}" destfile="${project.dist}/${ant.project.name}-${version}.jar">
<manifest>
<attribute name="Implementation-Vendor" value="${vendor}" />
<attribute name="Implementation-Title" value="${product}" />
<attribute name="Implementation-Version" value="${version}" />
<attribute name="Main-Class" value="${project.jar-mainclass}" />
<attribute name="Class-Path" value="${project.jar-classpath}" />
</manifest>
</jar>
<copy todir="${project.dist}">
<fileset dir="${project.lib}" includes="*.jar" excludes="test*.jar" />
</copy>
</target>
<target name="jar" depends="compile">
<mkdir dir="${project.dist}"/>
<delete file="${project.dist}/${project.dist}/${ant.project.name}-${version}.jar"/>
<jar compress="true" basedir="${project.build}" destfile="${project.dist}/${ant.project.name}-${version}.jar">
<manifest>
<attribute name="Implementation-Vendor" value="${vendor}"/>
<attribute name="Implementation-Title" value="${product}"/>
<attribute name="Implementation-Version" value="${version}"/>
<attribute name="Main-Class" value="${project.jar-mainclass}"/>
<attribute name="Class-Path" value="${project.jar-classpath}"/>
</manifest>
</jar>
<copy todir="${project.dist}">
<fileset dir="${project.lib}" includes="*.jar" excludes="test*.jar"/>
</copy>
</target>

<target name="install" depends="jar">
<copy todir="${global.lib}">
<fileset dir="${project.dist}" includes="*.jar">
<exclude name="*test*.jar" />
<exclude name="*-javadoc.jar" />
<exclude name="*-sources.jar" />
</fileset>
</copy>
</target>
<target name="install" depends="jar">
<copy todir="${global.lib}">
<fileset dir="${project.dist}" includes="*.jar">
<exclude name="*test*.jar"/>
<exclude name="*-javadoc.jar"/>
<exclude name="*-sources.jar"/>
</fileset>
</copy>
</target>

<target name="install-zip">
<mkdir dir="${project.dist}" />
<delete file="${project.dist}/${ant.project.name}.zip" />
<zip destfile="${project.dist}/${ant.project.name}.zip" basedir="." excludes="**.svn/" />
</target>
<target name="install-zip">
<mkdir dir="${project.dist}"/>
<delete file="${project.dist}/${ant.project.name}.zip"/>
<zip destfile="${project.dist}/${ant.project.name}.zip" basedir="." excludes="**.svn/"/>
</target>

</project>
Loading

0 comments on commit 1719a33

Please sign in to comment.