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

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

diff --git a/make/build.xml b/make/build.xml
index b07120f1..85681071 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -778,7 +778,7 @@
         <!--delete includeEmptyDirs="true" quiet="true" failonerror="false">
             <fileset dir="${build}" includes="jocl-java-src.zip" />
         </delete-->
-        <zip destfile="${build}/jocl-java-src.zip">
+        <zip destfile="${build}/jar/jocl-java-src.zip">
             <fileset dir="${src.java}"/>
             <fileset dir="${build}/gensrc"/>
         </zip>
@@ -792,8 +792,7 @@
         <copy file="${build}/artifact.properties" todir="${archive}"/>
         <mkdir dir="${archive}/jar" />
         <copy todir="${archive}/jar">
-            <fileset dir="${build}/jar" includes="jocl*.jar"/>
-            <fileset dir="${build}/jar" includes="jocl*.apk"/>
+            <fileset dir="${build}/jar" includes="**"/>
         </copy>
         <mkdir dir="${archive}/lib" />
         <copy todir="${archive}/lib">
@@ -809,7 +808,6 @@
         </copy>
         <copy file="../README.txt" todir="${archive}"/>
         <copy file="../LICENSE.txt" todir="${archive}"/>
-        <copy todir="${archive}" file="${build}/jocl-java-src.zip"/>
         <archive.7z destfile="${build}/${archive.name}.7z"
              basedir="${build}"
              includes="${archive.name}/**" />
-- 
cgit v1.2.3