From fdeae72d38bd4b5549518fd1f1df7c6095995e68 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 6 Dec 2020 12:31:22 +0000
Subject: [PATCH] i2psnark: Fix up standalone build
---
apps/i2psnark/java/build.xml | 45 +++++++++++++++++-------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index a75a7639ec..d35f5c755e 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -250,54 +250,51 @@
<!-- add css, image, and js files for standalone snark to the war -->
<target name="standalone_war" depends="war">
-<!-- FIXME
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
--->
- <mkdir dir="build/standalone-resources/.resources/themes/snark" />
- <copy todir="build/standalone-resources/.resources/themes/snark" >
- <fileset dir="../../../installer/resources/themes/snark/" />
+ <mkdir dir="build/standalone-resources/.resources/themes/" />
+ <copy todir="build/standalone-resources/.resources/themes/" >
+ <fileset dir="../resources/themes/" />
</copy>
- <replace dir="build/standalone-resources/.resources/themes/snark"
+ <replace dir="build/standalone-resources/.resources/themes"
summary="true"
token="url(/themes/console/dark/images/"
- value="url(/i2psnark/.resources/themes/snark/dark/images/" >
+ value="url(/i2psnark/.resources/themes/dark/images/" >
<include name="**/*.css" />
</replace>
- <replace dir="build/standalone-resources/.resources/themes/snark"
+ <replace dir="build/standalone-resources/.resources/themes"
summary="true"
token="url(../../console/light/images/"
- value="url(/i2psnark/.resources/themes/snark/light/images/" >
+ value="url(/i2psnark/.resources/themes/light/images/" >
<include name="**/*.css" />
</replace>
- <replace dir="build/standalone-resources/.resources/themes/snark"
+ <replace dir="build/standalone-resources/.resources/themes"
summary="true"
token="url(/themes/console/light/images/"
- value="url(/i2psnark/.resources/themes/snark/light/images/" >
+ value="url(/i2psnark/.resources/themes/light/images/" >
<include name="**/*.css" />
</replace>
- <replace dir="build/standalone-resources/.resources/themes/snark"
+ <replace dir="build/standalone-resources/.resources/themes"
summary="true"
token="url(/themes/console/images/transparent.gif"
- value="url(/i2psnark/.resources/themes/snark/ubergine/images/transparent.gif" >
+ value="url(/i2psnark/.resources/themes/ubergine/images/transparent.gif" >
<include name="**/*.css" />
</replace>
- <replace dir="build/standalone-resources/.resources/themes/snark"
+ <replace dir="build/standalone-resources/.resources/themes"
summary="true"
token="url(/themes/console/images/info/"
- value="url(/i2psnark/.resources/themes/snark/ubergine/images/" >
+ value="url(/i2psnark/.resources/themes/ubergine/images/" >
<include name="**/*.css" />
</replace>
<!-- Rather than pulling in all the console theme images, let's just specify the ones we need -->
- <copy file="../../../installer/resources/themes/console/images/transparent.gif"
- todir="build/standalone-resources/.resources/themes/snark/ubergine/images" />
- <copy file="../../../installer/resources/themes/console/dark/images/header.png"
- todir="build/standalone-resources/.resources/themes/snark/dark/images" />
- <copy file="../../../installer/resources/themes/console/light/images/header.png"
- todir="build/standalone-resources/.resources/themes/snark/light/images" />
- <copy file="../../../installer/resources/themes/console/images/info/errortriangle.png"
- todir="build/standalone-resources/.resources/themes/snark/ubergine/images" />
+ <copy file="../../routerconsole/jsp/themes/console/images/transparent.gif"
+ todir="build/standalone-resources/.resources/themes/ubergine/images" />
+ <copy file="../../routerconsole/jsp/themes/console/dark/images/header.png"
+ todir="build/standalone-resources/.resources/themes/dark/images" />
+ <copy file="../../routerconsole/jsp/themes/console/light/images/header.png"
+ todir="build/standalone-resources/.resources/themes/light/images" />
+ <copy file="../../routerconsole/jsp/themes/console/images/info/errortriangle.png"
+ todir="build/standalone-resources/.resources/themes/ubergine/images" />
<mkdir dir="build/standalone-resources/.resources/js" />
<copy file="../../routerconsole/jsp/js/ajax.js" todir="build/standalone-resources/.resources/js" />
--
GitLab