Mirrors/json-simple
1
0
Fork 0
mirror of https://github.com/fangyidong/json-simple.git synced 2025-12-07 16:00:52 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved filtering of properties on resources/build.xml.

Browse Source
This commit is contained in:
nosslived@gmail.com
2012-01-13 12:12:21 +00:00
parent 911b514cd4
commit 79ba69f0af
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build.xml
View File

@@ -1,26 +1,26 @@
<project name="json-simple" default="main" basedir="."> <project name="json-simple" default="main" basedir=".">
<property name="current-version" value="1.1.1"/> <property name="current-version" value="1.1.1"/>
<property name="jar-name" value="json-simple-${current-version}.jar"/> <property name="jar-name" value="json-simple-${current-version}.jar"/>
<property name="classes-target" value="target/classes"/> <property name="targetDir" value="target"/>
<property name="jar-target" value="target/${jar-name}"/> <property name="jar-target" value="${targetDir}/${jar-name}"/>
<property name="javaSourceDir" value="src/main/java"/>
<property name="javaTargetDir" value="target/classes"/>
<target name="main" depends="jar"> <target name="main" depends="jar"></target>
</target>
<target name="clean"> <target name="clean">
<delete includeemptydirs="true"> <delete includeemptydirs="true">
<fileset dir="target" includes="**/*"/> <fileset dir="${targetDir}" includes="**/*"/>
</delete> </delete>
<delete file="${jar-target}"/>
</target> </target>
<target name="mkdir"> <target name="mkdir">
<mkdir dir="${classes-target}"/> <mkdir dir="${javaTargetDir}"/>
</target> </target>
<target name="compile" depends="mkdir"> <target name="compile" depends="mkdir">
<javac srcdir="src/main/java" <javac srcdir="${javaSourceDir}"
destdir="${classes-target}" destdir="${javaTargetDir}"
includes="**/*.java" includes="**/*.java"
target="1.2" target="1.2"
source="1.2"/> source="1.2"/>
@@ -28,7 +28,7 @@
<target name="jar" depends="compile"> <target name="jar" depends="compile">
<jar destfile="${jar-target}" <jar destfile="${jar-target}"
basedir="${classes-target}" basedir="${javaTargetDir}"
includes="**/*.class"/> excludes="build.xml"/>
</target> </target>
</project> </project>

24
src/main/resources/build.xml
View File

@@ -1,26 +1,26 @@
<project name="${project.artifactId}" default="main" basedir="."> <project name="${project.artifactId}" default="main" basedir=".">
<property name="current-version" value="${project.version}"/> <property name="current-version" value="${project.version}"/>
<property name="jar-name" value="json-simple-${current-version}.jar"/> <property name="jar-name" value="json-simple-${current-version}.jar"/>
<property name="classes-target" value="target/classes"/> <property name="targetDir" value="${project.build.directory}"/>
<property name="jar-target" value="target/${jar-name}"/> <property name="jar-target" value="${targetDir}/${jar-name}"/>
<property name="javaSourceDir" value="${project.build.sourceDirectory}"/>
<property name="javaTargetDir" value="${project.build.outputDirectory}"/>
<target name="main" depends="jar"> <target name="main" depends="jar"></target>
</target>
<target name="clean"> <target name="clean">
<delete includeemptydirs="true"> <delete includeemptydirs="true">
<fileset dir="target" includes="**/*"/> <fileset dir="${targetDir}" includes="**/*"/>
</delete> </delete>
<delete file="${jar-target}"/>
</target> </target>
<target name="mkdir"> <target name="mkdir">
<mkdir dir="${classes-target}"/> <mkdir dir="${javaTargetDir}"/>
</target> </target>
<target name="compile" depends="mkdir"> <target name="compile" depends="mkdir">
<javac srcdir="src/main/java" <javac srcdir="${javaSourceDir}"
destdir="${classes-target}" destdir="${javaTargetDir}"
includes="**/*.java" includes="**/*.java"
target="1.2" target="1.2"
source="1.2"/> source="1.2"/>
@@ -28,7 +28,7 @@
<target name="jar" depends="compile"> <target name="jar" depends="compile">
<jar destfile="${jar-target}" <jar destfile="${jar-target}"
basedir="${classes-target}" basedir="${javaTargetDir}"
includes="**/*.class"/> excludes="build.xml"/>
</target> </target>
</project> </project>