From 8a19b3c5f0d4ffdae7bc15c0a4bb83c4891672ca Mon Sep 17 00:00:00 2001
From: Naohide Sano <namachapanda2005@gmail.com>
Date: Fri, 30 Sep 2022 12:10:46 +0900
Subject: [PATCH] update build environment

---
 .gitignore                                    |  8 +--
 build.xml                                     | 54 ++++++-------------
 etc/config/settings.txt                       | 28 ----------
 local.properties.sample                       |  4 ++
 .../java/vavi/apps/appleii/AppleIIApp.java    |  6 ++-
 src/main/resources/appleii.properties         | 11 ++++
 6 files changed, 38 insertions(+), 73 deletions(-)
 delete mode 100644 etc/config/settings.txt
 create mode 100644 local.properties.sample
 create mode 100644 src/main/resources/appleii.properties

diff --git a/.gitignore b/.gitignore
index 7574165..cea4964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-bin/
-00000.*
-META-INF/
-etc/config/
 tmp/
+build/
+local.properties
+src/main/resources/APPLE2E.ROM
+src/main/resources/*.dsk
diff --git a/build.xml b/build.xml
index 30c094d..f2776c4 100644
--- a/build.xml
+++ b/build.xml
@@ -24,11 +24,7 @@
   <!-- class path definitions -->
   <path id="project.class.path">
     <fileset dir="${dir.bdj}/common">
-      <include name="*.jar" />
-      <include name="jmf/jmf.jar" />
-      <exclude name="javassist.jar" />
-      <exclude name="metouia.jar" />
-      <exclude name="nanoxml-2.2.3.jar" />
+      <exclude name="bdj.jar" />
     </fileset>
   </path>
 
@@ -43,7 +39,6 @@
   <!-- clean -->
   <target name="clean" description="clear build enviroment">
     <delete file="${jar.name}" failonerror="false" />
-    <delete dir="META-INF" failonerror="false" />
     <delete dir="${dir.build}" failonerror="false" />
   </target>
 
@@ -64,7 +59,10 @@
         <pathelement location="${dir.bdj}/lib/basis.jar" />
       </bootclasspath>
 -->
-      <classpath refid="project.class.path" />
+      <classpath>
+        <path refid="project.class.path" />
+        <pathelement location="${dir.bdj}/common/bdj.jar" />
+      </classpath>
       <src path="src/main/java" />
     </javac>
   </target>
@@ -72,23 +70,14 @@
   <!-- jar -->
   <target name="packaging" depends="compile" description="packaging">
 
-    <copy file="etc/bluray.MyXlet.perm" toFile="${dir.build}/${paem.file}" /> 
-
-    <copy toDir="${dir.build}">
-      <fileset dir="src/main/java">
-        <include name="**/*.properties" />
-      </fileset>
-    </copy>
+    <copy file="etc/bluray.MyXlet.perm" toFile="${dir.build}/vavi/apps/appleii/bluray.MyXlet.perm" /> 
 
     <copy toDir="${dir.build}">
       <fileset dir="src/main/resources" />
     </copy>
 
     <jar jarfile="${jar.name}">
-      <fileset dir="${dir.build}">
-        <exclude name="config" />
-        <exclude name="config/**/*" />
-      </fileset>
+      <fileset dir="${dir.build}" />
     </jar>
 
   </target>
@@ -100,11 +89,12 @@
       <arg line="-keystore ${dir.sign}/sig.ks" />
       <arg value="${jar.name}" />
     </java>
+    <delete dir="META-INF" failonerror="false" />
   </target>
 
   <!-- dist -->
   <target name="dist" depends="sign" description="distribution">
-    <java jar="${dir.bdj}/common/hdcookbook/bdjo.jar" fork="yes">
+    <java jar="${dir.bdj}/hdcookbook/bdjo.jar" fork="yes">
       <arg value="etc/bdjo.xml" />
       <arg value="00000.bdjo" />
     </java>
@@ -112,30 +102,16 @@
 
   <!-- run -->
   <target name="run" depends="" description="test">
-    <copy todir="${dir.build}">
-      <fileset dir="etc" >
-        <include name="config/**/*" />
-      </fileset>
-    </copy>
-
-    <copy toDir="${dir.bdj}/common">
-      <fileset dir="src/main/resources" />
-      <fileset dir="${dir.build}">
-        <include name="**/*.properties" />
-      </fileset>
-    </copy>
-
-    <java jar="${dir.bdj}/common/xletview.jar" fork="yes">
-<!--
-      <jvmarg value="-Xprof"/>
--->
-      <jvmarg value="-Djava.ext.dirs=${dir.bdj}/common"/>
+    <java classname="net.beiker.xletview.Main" fork="yes">
       <classpath>
-        <pathelement location="${dir.build}" />
-        <path refid="project.class.path" />
+        <pathelement location="${dir.runtime}" />
+        <pathelement location="${dir.xletview}/target/xletvew-0.3.6v-SNAPSHOT-jar-with-dependencies.jar" />
+        <pathelement location="/Users/nsano/src/vavi/vavi-commons/target/vavi-commons-1.1.6-SNAPSHOT.jar" />
       </classpath>
+      <jvmarg value="-Djava.util.logging.config.file=${dir.xletview}/src/test/resources/logging.properties"/>
       <arg line="-xletPath ${dir.build}" />
       <arg line="-xletClass vavi.apps.appleii.AppleIIApp" />
+      <arg line="-xletExtraPath ${dir.xletview}/target/xletvew-0.3.6v-SNAPSHOT-jar-only-dvd.jar" />
     </java>
   </target>
 
diff --git a/etc/config/settings.txt b/etc/config/settings.txt
deleted file mode 100644
index 42e42d9..0000000
--- a/etc/config/settings.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#Mind that paths can not contain backslash
-#Make sure there are no spaces after the values
-
-console.font=Helvetica
-console.fontsize=10
-console.height=200
-console.show=true
-console.width=500
-console.x=0
-console.y=0
-extra.classpath=
-file.applications=config/applications.xml
-file.defaultbg=config/defaultbg.jpg
-file.settings=config/settings.txt
-font.sizeoffset=-2
-path.config=config
-remote.show=true
-safearea.color=#ffee00
-safearea.height=556
-safearea.show=true
-safearea.width=700
-safearea.x=10
-safearea.y=10
-tv.center=true
-tv.screenheight=576
-tv.screenwidth=720
-tv.x=0
-tv.y=0
diff --git a/local.properties.sample b/local.properties.sample
new file mode 100644
index 0000000..2b28aba
--- /dev/null
+++ b/local.properties.sample
@@ -0,0 +1,4 @@
+dir.bdj=yourdir/bdj-toolchain
+dir.sign=${dir.bdj}/common/sig
+dir.xletview=yourdir/xletview
+dir.runtime=${dir.xletview}/src/main/runtime
diff --git a/src/main/java/vavi/apps/appleii/AppleIIApp.java b/src/main/java/vavi/apps/appleii/AppleIIApp.java
index 1945e10..63324e9 100644
--- a/src/main/java/vavi/apps/appleii/AppleIIApp.java
+++ b/src/main/java/vavi/apps/appleii/AppleIIApp.java
@@ -335,6 +335,7 @@ try {
                 });
 } catch (Throwable t) { // for xletview bug
  t.printStackTrace(System.err);
+ System.err.println("this is running on xletview!");
                 files = new File[] {
                     new File(file, "Lode Runner.dsk"),
                     new File(file, "Mystery House.dsk"),
@@ -1192,8 +1193,8 @@ try {
         private Properties props = new Properties();
 
         MyDao() throws IOException {
-            root = System.getProperty("bluray.vfs.root", "../tmp");
-//System.err.println("root: " + root);
+            root = System.getProperty("bluray.vfs.root", "");
+System.err.println("root: " + root);
             props.load(new FileInputStream(new File(root, "appleii.properties")));
         }
 
@@ -1236,6 +1237,7 @@ System.err.println("Illegal EOF: " + l + "/" + length);
                 }
             } catch (IOException e) {
 //e.printStackTrace(System.err);
+System.err.println("resource: " + resource);
               throw new IllegalStateException(e);
             }
         }
diff --git a/src/main/resources/appleii.properties b/src/main/resources/appleii.properties
new file mode 100644
index 0000000..88a934a
--- /dev/null
+++ b/src/main/resources/appleii.properties
@@ -0,0 +1,11 @@
+cpuRom=APPLE2E.ROM
+displayColorMode=1
+displayScale=2
+#cpuDebugEnabled=true
+#displayStatMode=true
+cpuSpeed=2000
+displayRefreshRate=10
+#cpuStepMode=true
+#diskDrive1=Mystery House.dsk
+#diskDrive1=Tetris II.dsk
+diskDrive1=/LodeRunner.dsk