efiyo/lanemu-mirror
1
0
Fork 0
mirror of https://gitlab.com/Monsterovich/lanemu.git synced 2024-07-07 06:01:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved clean target

Browse source
This commit is contained in:
Monsterovich 2024-05-24 02:03:50 +02:00
parent 0c5d609700
commit 3c9f4846a5
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -10,4 +10,4 @@ install:
clean: clean:
@$(MAKE) -C native clean @$(MAKE) -C native clean
rm -rf build lib clib ant clean

31
build.xml
View file

@ -24,14 +24,15 @@
<property name="build" value="build"/> <property name="build" value="build"/>
<property name="build.classes" value="build/classes"/> <property name="build.classes" value="build/classes"/>
<property name="clib" value="clib"/> <property name="clib" value="clib"/>
<property name="lib" value="lib"/>
<property name="resources" value="resources"/> <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"/> <property name="ivy.install.version" value="2.5.2"/>
<condition property="ivy.home" value="${env.IVY_HOME}"> <condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME"/> <isset property="env.IVY_HOME"/>
</condition> </condition>
<property name="ivy.home" value="${user.home}/.ant"/> <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"/> <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
<target name="init"> <target name="init">
@ -39,8 +40,10 @@
<mkdir dir="${build.classes}"/> <mkdir dir="${build.classes}"/>
</target> </target>
<target name="clean"> <target name="clean" depends="clean-3rdparty">
<delete dir="${build}"/> <delete dir="${build}"/>
<delete dir="${clib}"/>
<delete dir="${lib}"/>
</target> </target>
<target name="compile" depends="init,resolve,compile-3rdparty"> <target name="compile" depends="init,resolve,compile-3rdparty">
@ -61,8 +64,12 @@
<target name="compile-3rdparty"> <target name="compile-3rdparty">
<ant dir="3rdparty/WaifUPnP"/> <ant dir="3rdparty/WaifUPnP"/>
<copy file="3rdparty/WaifUPnP/dist/WaifUPnP.jar" tofile="lib/WaifUPnP.jar"/> <copy file="3rdparty/WaifUPnP/dist/WaifUPnP.jar" tofile="${lib}/WaifUPnP.jar"/>
</target> </target>
<target name="clean-3rdparty">
<ant dir="3rdparty/WaifUPnP" target="clean"/>
</target>
<target name="resolve" depends="init-ivy"> <target name="resolve" depends="init-ivy">
<ivy:retrieve/> <ivy:retrieve/>
@ -81,16 +88,16 @@
</target> </target>
<target name="jar" depends="compile"> <target name="jar" depends="compile">
<mkdir dir="${build}/lib"/> <mkdir dir="${build}/${lib}"/>
<copy todir="${build}/lib"> <copy todir="${build}/${lib}">
<fileset dir="lib/"> <fileset dir="${lib}/">
<exclude name="junit-4.5.jar"/> <exclude name="junit-4.5.jar"/>
</fileset> </fileset>
</copy> </copy>
<mkdir dir="${build}/clib"/> <mkdir dir="${build}/${clib}"/>
<copy todir="${build}/clib"> <copy todir="${build}/${clib}">
<fileset dir="clib/"> <fileset dir="${clib}/">
</fileset> </fileset>
</copy> </copy>
@ -103,7 +110,7 @@
<zipfileset dir="${resources}" prefix="resources"/> <zipfileset dir="${resources}" prefix="resources"/>
<manifest> <manifest>
<attribute name="Main-Class" value="org.p2pvpn.Main"/> <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> </manifest>
</jar> </jar>
</target> </target>