Skip to content

Commit

Permalink
Merge branch 'master' of [email protected]:arianne/marauroa.git
Browse files Browse the repository at this point in the history
  • Loading branch information
nhnb committed Jan 23, 2025
2 parents 38263dd + 4238f15 commit 0c6d83c
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ Legal
Marauroa(c) is copyright of Miguel Angel Blanch Lardin, 2003-2007,
arianne_rpg at users dot sourceforge dot net

Marauroa(c) is copyright of the Arianne Project, 2006-2021,
Marauroa(c) is copyright of the Arianne Project, 2006-2025,
arianne-general at lists dot sourceforge dot net
34 changes: 24 additions & 10 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
<property name="jarname" value="marauroa-${version}.jar"/>
<property name="jarname_client" value="marauroa-client-only-${version}.jar"/>

<!-- time & date -->
<tstamp>
<format property="year" pattern="yyyy"/>
<format property="date" pattern="yyyy-MM-dd"/>
<format property="time" pattern="HH:mm:ss"/>
</tstamp>
<property name="datetime" value="${date} ${time}"/>

<path id="compile-classpath">
<pathelement path="${log4j_jar}"/>
<pathelement path="${junit_jar}"/>
Expand All @@ -15,19 +23,19 @@
<include name="json-simple*.jar"/>
</fileset>
</path>

<path id="compile-tests-classpath">
<path refid="compile-classpath" />
<path location="${build-classes}" />
</path>

<path id="run-tests-classpath">
<path refid="compile-tests-classpath" />
<pathelement location="${h2_jar}"/>
<pathelement path="${build-tests}" />
<pathelement path="."/>
</path>

<!-- Clears the instalation -->
<target name="clean">
<delete dir="${build}"/>
Expand All @@ -46,6 +54,12 @@
<mkdir dir="${build-coverage}" />
<mkdir dir="${dist}" />
<mkdir dir="${docs}" />

<!-- date & timestamps -->
<replaceregexp file="README.md"
match="^Marauroa\(c\) is copyright of the Arianne Project, 2006-.*?,"
replace="Marauroa(c) is copyright of the Arianne Project, 2006-${year},"
byline="true"/>
</target>

<!-- Compiles the project -->
Expand Down Expand Up @@ -75,7 +89,7 @@
</not>
</or>
</condition>

<!-- Update version number. -->
<replaceregexp file="${src}/marauroa/server/marauroad.java"
match="private static final String VERSION = &quot;.*&quot;;"
Expand All @@ -94,7 +108,7 @@
<include name="*.properties"/>
</fileset>
</copy>

<ant target="compile-js" />
<mkdir dir="${build-classes}/js" />
<copy todir="${build-classes}/js">
Expand All @@ -109,7 +123,7 @@
<target name="compile-client">
<delete dir="${build-client}" quiet="true" />
<mkdir dir="${build-client}"/>

<!-- Compile it -->
<javac srcdir="${src}" source="8" target="8" destdir="${build-client}" debug="true" debuglevel="source,lines" includeantruntime="false">
<compilerarg line="-encoding utf-8"/>
Expand Down Expand Up @@ -260,7 +274,7 @@

<!-- builds the whole project for releasing -->
<target name="dist" depends="dist_binary, dist_docs, dist_source"/>

<!-- testing targets -->
<target name="compile-tests" depends="compile">
<javac srcdir="${src-test}" source="8" target="8" destdir="${build-tests}" debug="true" debuglevel="source,lines" includes="**/marauroa/**" excludes="${exclude.python};${exclude.junit}" includeantruntime="false">
Expand All @@ -280,12 +294,12 @@
</copy>
<copy file="${test-server-ini}" tofile="./server.ini" />
</target>

<target name="test" depends="compile-tests">
<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
<classpath path="buildtools/jacoco/jacocoant.jar"/>
</taskdef>

<jacoco:coverage destfile="build/jacoco.exec" append="false">
<junit printsummary="yes" fork="yes" forkmode="once" haltonerror="true" haltonfailure="true">
<jvmarg value="-Djava.awt.headless=true"/>
Expand Down Expand Up @@ -319,5 +333,5 @@
<xml destfile="${build-coverage}/jacoco.xml" />
</jacoco:report>
</target>

</project>

0 comments on commit 0c6d83c

Please sign in to comment.