Skip to content

Fix: Compile classlib annotations before core sources #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mo-dev-studio-eg wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix: Compile classlib annotations before core sources #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions core/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<property name="my-classes-plan.dir" value="${my-build.dir}/classes-plan"/>
<property name="my-src.dir" value="${basedir}/src"/>
<property name="my-non-resources" value="**/*.java,**/package.html"/>
<property name="my-classlib-classes.dir" value="${my-build.dir}/classes-classlib"/>
<property name="classlib.jar" value="${basedir}/../all/lib/classlib.jar"/>

<!-- Subproject specific classpath -->
<path id="my-cp">
Expand Down Expand Up @@ -132,8 +134,35 @@
<mkdir dir="${my-classes.dir}"/>
<mkdir dir="${my-testclasses.dir}"/>
<mkdir dir="${my-gen.dir}"/>
<mkdir dir="${my-classlib-classes.dir}"/>
<jnode.copy-descriptors/>
</target>

<!-- Compile classlib sources and create the classlib.jar -->
<target name="compile-classlib" depends="prepare">
<echo message="Compiling classlib sources to create classlib.jar"/>
<mkdir dir="${my-classlib-classes.dir}"/>
<javac destdir="${my-classlib-classes.dir}"
debug="on"
optimize="on"
fork="on"
memoryMaximumSize="${memoryMaximumSize}"
compiler="modern"
includeJavaRuntime="false"
target="${java.target}"
source="${java.source}"
encoding="${java.encoding}"
excludes="**/*-template.java,**/package-info.java">
<src>
<pathelement location="${my-src.dir}/classlib"/>
</src>
</javac>
<jar destfile="${classlib.jar}" basedir="${my-classlib-classes.dir}" includes="**/*.class"/>
<echo message="Created ${classlib.jar}"/>
</target>

<!-- Compile all subproject java files -->
<target name="compile" depends="compile-classlib">
<copy todir="${my-classes.dir}">
<fileset dir="${my-src.dir}/classpath/vm" includes="**/*.security"/>
<fileset dir="${my-src.dir}/openjdk/vm" includes="**/*.jav"/>
Expand All @@ -154,10 +183,7 @@
tofile="${my-gen.dir}/org/jnode/security/JNodeSecurityManagerSettings.java">
<token name="@jnode.security.enabled@" value="${jnode.security.enabled}"/>
</template>
</target>

<!-- Compile all subproject java files -->
<target name="compile" depends="prepare">
<jnode.compile>
<src refid="my-sources" />
<classpath refid="my-cp"/>
Expand Down