From a6fe729b61eb28c9197e573eac5fae3c5b045df8 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 7 May 2023 19:53:49 +0200
Subject: JOAL File Layout: Have *-java-src.zip inside jar folder

---
 make/build.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'make')

diff --git a/make/build.xml b/make/build.xml
index 2fe7fc5..34c0ef8 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -841,7 +841,7 @@
         <!--delete includeEmptyDirs="true" quiet="true" failonerror="false">
             <fileset dir="${build}" includes="joal-java-src.zip" />
         </delete-->
-        <zip destfile="${build}/joal-java-src.zip">
+        <zip destfile="${build}/jar/joal-java-src.zip">
             <fileset dir="${src.java}"/>
             <fileset dir="${build}/gensrc/classes"/>
         </zip>
@@ -855,8 +855,7 @@
         <copy file="${build}/artifact.properties" todir="${archive}"/>
         <mkdir dir="${archive}/jar" />
         <copy todir="${archive}/jar">
-            <fileset dir="${build}/jar" includes="joal*.jar"/>
-            <fileset dir="${build}/jar" includes="joal*.apk"/>
+            <fileset dir="${build}/jar" includes="**"/>
         </copy>
         <mkdir dir="${archive}/lib" />
         <copy todir="${archive}/lib">
@@ -872,7 +871,6 @@
         </copy>
         <copy file="../README.txt" todir="${archive}"/>
         <copy file="../LICENSE.txt" todir="${archive}"/>
-        <copy todir="${archive}" file="${build}/joal-java-src.zip"/>
         <archive.7z destfile="${build}/${archive.name}.7z"
              basedir="${build}"
              includes="${archive.name}/**" />
-- 
cgit v1.2.3