Merge pull request #408 from micro-manager/mvnBuild

MMCoreJ build: simplify mvn build
micro-manager · Dec 1, 2023 · e64c67d · e64c67d
2 parents acbd5bc + 061cdcb
commit e64c67d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/MMCoreJ_wrap/build.xml b/MMCoreJ_wrap/build.xml
@@ -10,12 +10,10 @@
 	<target name="compile" depends="prepare" description="Compile Java sources">
 		<mkdir dir="${intdir}"/>
 
-		<copy todir="${srcdir}/${package}" file="TaggedImage.java"/>
-
 		<mm-javac destdir="${intdir}">
 			<src path="${json.srcdir}"/>
+			<include name="mmcorej/*"/>
 			<include name="mmcorej/org/json/**"/>
-
 			<src path="${srcdir}"/>
 			<include name="${package}/**"/>
 		</mm-javac>

diff --git a/MMCoreJ_wrap/pom.xml b/MMCoreJ_wrap/pom.xml
@@ -66,7 +66,7 @@
 						</goals>
 						<configuration>
 							<sources>
-                        <source>../../build/intermediates/Swig</source>
+                        <source>../build/intermediates/Swig</source>
 							</sources>
 						</configuration>
 					</execution>

diff --git a/MMCoreJ_wrap/TaggedImage.java → ...ap/src/main/java/mmcorej/TaggedImage.java b/MMCoreJ_wrap/TaggedImage.java → ...ap/src/main/java/mmcorej/TaggedImage.java