I2P_Developers/i2p.i2p
3
1
Fork 11
Code Issues 340 Pull Requests 7 Actions 2 Packages Projects Releases Wiki Activity

Build: Put i2psnark-standalone build outputs in the i2psnark build/ dir

Browse Source
This commit is contained in:
zzz
2025-02-10 08:41:26 -05:00
parent df1991d8d7
commit 0a91441877
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apps/i2psnark/java/build.xml
View File

@ -208,11 +208,11 @@
<target name="standalone" depends="standalone_prep"> <target name="standalone" depends="standalone_prep">
<!-- doesn't support file permissions <!-- doesn't support file permissions
<zip destfile="i2psnark-standalone.zip"> <zip destfile="build/i2psnark-standalone.zip">
<zipfileset dir="./i2psnark/" /> <zipfileset dir="./build/i2psnark/" fullpath="i2psnark" />
</zip> </zip>
--> -->
<exec executable="zip" failifexecutionfails="true" failonerror="true" > <exec executable="zip" dir="build" failifexecutionfails="true" failonerror="true" >
<arg value="-r" /> <arg value="-r" />
<arg value="i2psnark-standalone.zip" /> <arg value="i2psnark-standalone.zip" />
<arg value="i2psnark" /> <arg value="i2psnark" />
@ -340,34 +340,32 @@
</target> </target>
<target name="standalone_prep" depends="standalone_jar, standalone_war"> <target name="standalone_prep" depends="standalone_jar, standalone_war">
<delete dir="./i2psnark" /> <delete dir="./build/i2psnark" />
<mkdir dir="./i2psnark" /> <mkdir dir="./build/i2psnark" />
<copy file="../launch-i2psnark" todir="./i2psnark/" /> <copy file="../launch-i2psnark" todir="./build/i2psnark/" />
<chmod type="file" file="./i2psnark/launch-i2psnark" perm="+x" /> <chmod type="file" file="./build/i2psnark/launch-i2psnark" perm="+x" />
<copy file="../launch-i2psnark.bat" todir="./i2psnark/" /> <copy file="../launch-i2psnark.bat" todir="./build/i2psnark/" />
<mkdir dir="./i2psnark/contexts" /> <mkdir dir="./build/i2psnark/contexts" />
<copy file="../standalone-context.xml" tofile="./i2psnark/contexts/context.xml" /> <copy file="../standalone-context.xml" tofile="./build/i2psnark/contexts/context.xml" />
<mkdir dir="./i2psnark/docroot" /> <mkdir dir="./build/i2psnark/docroot" />
<copy file="../standalone-index.html" tofile="./i2psnark/docroot/index.html" /> <copy file="../standalone-index.html" tofile="./build/i2psnark/docroot/index.html" />
<mkdir dir="./i2psnark/webapps" /> <mkdir dir="./build/i2psnark/webapps" />
<copy file="../i2psnark.war" tofile="./i2psnark/webapps/i2psnark.war" /> <copy file="../i2psnark.war" tofile="./build/i2psnark/webapps/i2psnark.war" />
<copy file="../jetty-i2psnark.xml" tofile="./i2psnark/jetty-i2psnark.xml" /> <copy file="../jetty-i2psnark.xml" tofile="./build/i2psnark/jetty-i2psnark.xml" />
<copy file="../i2psnark-appctx.config" tofile="./i2psnark/i2psnark-appctx.config" /> <copy file="../i2psnark-appctx.config" tofile="./build/i2psnark/i2psnark-appctx.config" />
<copy file="./build/i2psnark-standalone.jar" tofile="./i2psnark/i2psnark.jar" /> <copy file="./build/i2psnark-standalone.jar" tofile="./build/i2psnark/i2psnark.jar" />
<copy file="../readme-standalone.txt" tofile="./i2psnark/readme.txt" /> <copy file="../readme-standalone.txt" tofile="./build/i2psnark/readme.txt" />
<!-- temp so announces work --> <!-- temp so announces work -->
<copy file="../../../installer/resources/hosts.txt" tofile="./i2psnark/hosts.txt" /> <copy file="../../../installer/resources/hosts.txt" tofile="./build/i2psnark/hosts.txt" />
<copy todir="./i2psnark/licenses" > <copy todir="./build/i2psnark/licenses" >
<fileset dir="../../../licenses" includes="LICENSE-GPLv2.txt, ABOUT-Jetty.html" /> <fileset dir="../../../licenses" includes="LICENSE-GPLv2.txt, ABOUT-Jetty.html" />
</copy> </copy>
<mkdir dir="./i2psnark/logs" /> <mkdir dir="./build/i2psnark/logs" />
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="./build" /> <delete dir="./build" />
<delete file="../i2psnark.war" /> <delete file="../i2psnark.war" />
<delete file="./i2psnark-standalone.zip" />
<delete dir="./i2psnark" />
</target> </target>
<target name="cleandep" depends="clean"> <target name="cleandep" depends="clean">
</target> </target>

2
build.xml
View File

@ -2281,7 +2281,7 @@
<!-- standalone i2psnark zip --> <!-- standalone i2psnark zip -->
<target name="i2psnark" depends="buildStreaming, buildJetty, buildSystray, jbigi, buildDesktopGui" > <target name="i2psnark" depends="buildStreaming, buildJetty, buildSystray, jbigi, buildDesktopGui" >
<ant dir="apps/i2psnark/java" target="standalone" /> <ant dir="apps/i2psnark/java" target="standalone" />
<copy file="apps/i2psnark/java/i2psnark-standalone.zip" todir="." /> <copy file="apps/i2psnark/java/build/i2psnark-standalone.zip" todir="." />
</target> </target>
<target name="i2psnark-release" depends="distclean, i2psnark" > <target name="i2psnark-release" depends="distclean, i2psnark" >
<move file="i2psnark-standalone.zip" tofile="i2psnark-standalone-${release.number}.zip" /> <move file="i2psnark-standalone.zip" tofile="i2psnark-standalone-${release.number}.zip" />