mirror of
https://gitlab.com/Monsterovich/lanemu.git
synced 2024-07-04 12:41:16 +02:00
Improved clean target
This commit is contained in:
parent
0c5d609700
commit
3c9f4846a5
2
Makefile
2
Makefile
|
@ -10,4 +10,4 @@ install:
|
|||
|
||||
clean:
|
||||
@$(MAKE) -C native clean
|
||||
rm -rf build lib clib
|
||||
ant clean
|
31
build.xml
31
build.xml
|
@ -24,14 +24,15 @@
|
|||
<property name="build" value="build"/>
|
||||
<property name="build.classes" value="build/classes"/>
|
||||
<property name="clib" value="clib"/>
|
||||
<property name="lib" value="lib"/>
|
||||
<property name="resources" value="resources"/>
|
||||
<property name="classpath" value="lib/commons-jxpath-1.1.jar;lib/commons-logging-1.2.jar;lib/bcprov-jdk15on-1.70.jar;lib/junit-4.5.jar;lib/commons-codec-1.3.jar;lib/swing-layout-1.0.3.jar;lib/WaifUPnP.jar;lib/flatlaf-3.1.1.jar"/>
|
||||
<property name="classpath" value="${lib}/commons-jxpath-1.1.jar;${lib}/commons-logging-1.2.jar;${lib}/bcprov-jdk15on-1.70.jar;${lib}/junit-4.5.jar;${lib}/commons-codec-1.3.jar;${lib}/swing-layout-1.0.3.jar;${lib}/WaifUPnP.jar;${lib}/flatlaf-3.1.1.jar"/>
|
||||
<property name="ivy.install.version" value="2.5.2"/>
|
||||
<condition property="ivy.home" value="${env.IVY_HOME}">
|
||||
<isset property="env.IVY_HOME"/>
|
||||
</condition>
|
||||
<property name="ivy.home" value="${user.home}/.ant"/>
|
||||
<property name="ivy.jar.dir" value="${ivy.home}/lib"/>
|
||||
<property name="ivy.jar.dir" value="${ivy.home}/${lib}"/>
|
||||
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
|
||||
|
||||
<target name="init">
|
||||
|
@ -39,8 +40,10 @@
|
|||
<mkdir dir="${build.classes}"/>
|
||||
</target>
|
||||
|
||||
<target name="clean">
|
||||
<target name="clean" depends="clean-3rdparty">
|
||||
<delete dir="${build}"/>
|
||||
<delete dir="${clib}"/>
|
||||
<delete dir="${lib}"/>
|
||||
</target>
|
||||
|
||||
<target name="compile" depends="init,resolve,compile-3rdparty">
|
||||
|
@ -61,8 +64,12 @@
|
|||
|
||||
<target name="compile-3rdparty">
|
||||
<ant dir="3rdparty/WaifUPnP"/>
|
||||
<copy file="3rdparty/WaifUPnP/dist/WaifUPnP.jar" tofile="lib/WaifUPnP.jar"/>
|
||||
</target>
|
||||
<copy file="3rdparty/WaifUPnP/dist/WaifUPnP.jar" tofile="${lib}/WaifUPnP.jar"/>
|
||||
</target>
|
||||
|
||||
<target name="clean-3rdparty">
|
||||
<ant dir="3rdparty/WaifUPnP" target="clean"/>
|
||||
</target>
|
||||
|
||||
<target name="resolve" depends="init-ivy">
|
||||
<ivy:retrieve/>
|
||||
|
@ -81,16 +88,16 @@
|
|||
</target>
|
||||
|
||||
<target name="jar" depends="compile">
|
||||
<mkdir dir="${build}/lib"/>
|
||||
<copy todir="${build}/lib">
|
||||
<fileset dir="lib/">
|
||||
<mkdir dir="${build}/${lib}"/>
|
||||
<copy todir="${build}/${lib}">
|
||||
<fileset dir="${lib}/">
|
||||
<exclude name="junit-4.5.jar"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<mkdir dir="${build}/clib"/>
|
||||
<copy todir="${build}/clib">
|
||||
<fileset dir="clib/">
|
||||
<mkdir dir="${build}/${clib}"/>
|
||||
<copy todir="${build}/${clib}">
|
||||
<fileset dir="${clib}/">
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
|
@ -103,7 +110,7 @@
|
|||
<zipfileset dir="${resources}" prefix="resources"/>
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="org.p2pvpn.Main"/>
|
||||
<attribute name="Class-Path" value="lib/commons-jxpath-1.1.jar lib/commons-logging-1.2.jar lib/bcprov-jdk15on-1.70.jar lib/commons-codec-1.3.jar lib/swing-layout-1.0.3.jar lib/WaifUPnP.jar lib/flatlaf-3.1.1.jar"/>
|
||||
<attribute name="Class-Path" value="${lib}/commons-jxpath-1.1.jar ${lib}/commons-logging-1.2.jar ${lib}/bcprov-jdk15on-1.70.jar ${lib}/commons-codec-1.3.jar ${lib}/swing-layout-1.0.3.jar ${lib}/WaifUPnP.jar ${lib}/flatlaf-3.1.1.jar"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</target>
|
||||
|
|
Loading…
Reference in a new issue