fixed classpath

This commit is contained in:
Hendrik Brummermann 2023-09-29 20:45:14 +02:00
parent 998e030b22
commit 5d0d97641e
2 changed files with 9 additions and 6 deletions

View file

@ -23,7 +23,7 @@
<classpathentry kind="lib" path="libs/marauroa.jar" sourcepath="/marauroa"/>
<classpathentry kind="lib" path="libs/luaj-jse-3.0.1.jar" sourcepath="/luaj"/>
<classpathentry kind="lib" path="libs/jakarta.annotation-api-2.1.1.jar"/>
<classpathentry kind="lib" path="libs/tomcat-embed-core-10.1.13.jar"/>
<classpathentry exported="true" kind="lib" path="libs/tomcat-embed-core-10.1.13.jar"/>
<classpathentry kind="lib" path="libs/tomcat-embed-websocket-10.1.13.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View file

@ -16,6 +16,9 @@
</not>
</condition>
-->
<condition property="exclude.webclientdist" value="true">
<isset property="exclude.webclient"/>
</condition>
<!-- property to exclude Android webview client build -->
<condition property="exclude.webview" value="true">
@ -382,7 +385,7 @@
<copy todir="${buildroot}/stendhal-server-${version}/data/conf" file="data/conf/admins.txt"/>
<antcall target="webclient_build" unless:set="exclude.webclient"/>
<antcall target="webclient_build" unless:set="exclude.webclientdist"/>
<copy todir="${buildroot}/stendhal-server-${version}" file="README.md"/>
<mkdir dir="${buildroot}/stendhal-server-${version}/log"/>
@ -391,10 +394,10 @@
<zipfileset dir="${buildroot}/stendhal-server-${version}" excludes="${server_jarname}"/>
<zipfileset dir="${buildroot}/stendhal-server-${version}" includes="${server_jarname}" filemode="755"/>
<!-- webclient files -->
<zipfileset dir="${build_client_data}" unless:set="exclude.webclient"/>
<zipfileset dir="${build_client_music_data}" unless:set="exclude.webclient"/>
<zipfileset dir="${build_client_sound_data}" unless:set="exclude.webclient"/>
<zipfileset dir="${build_webclient}" prefix="js" unless:set="exclude.webclient"/>
<zipfileset dir="${build_client_data}" unless:set="exclude.webclientdist"/>
<zipfileset dir="${build_client_music_data}" unless:set="exclude.webclientdist"/>
<zipfileset dir="${build_client_sound_data}" unless:set="exclude.webclientdist"/>
<zipfileset dir="${build_webclient}" prefix="js" unless:set="exclude.webclientdist"/>
</zip>
<delete dir="${buildroot}/stendhal-server-${version}"/>
<delete dir="${build_webclient}"/>