Merge branch 'master' into slim

FreeCol · May 5, 2020 · d03ce42 · d03ce42
2 parents 29e8433 + a2fe018
commit d03ce42
Show file tree

Hide file tree

Showing 17 changed files with 600 additions and 10 deletions.
diff --git a/build.xml b/build.xml
@@ -21,6 +21,7 @@
     <property name="freecol.doc.dir" value="${basedir}/doc"/>
     <property name="freecol.javadoc.dir" value="${freecol.doc.dir}/javadoc"/>
     <property name="freecol.jar.file" value="${basedir}/FreeCol.jar"/>
+    <property name="freecol.main.class" value="net.sf.freecol.FreeCol"/>
     <property name="freecol.metaserver.jar.file"
               value="${basedir}/FreeCol-metaserver.jar"/>
     <property name="freecol.overview.file"
@@ -170,7 +171,7 @@
         </manifestclasspath>
         <manifest file="${basedir}/src/MANIFEST.MF">
             <attribute name="Created-By" value="FreeCol Team"/>
-            <attribute name="Main-Class" value="net.sf.freecol.FreeCol"/>
+            <attribute name="Main-Class" value="${freecol.main.class}"/>
             <attribute name="Class-Path" value="${jar.classpath}"/>
             <attribute name="Product-Name" value="FreeCol"/>
             <attribute name="Package-Title" value="FreeCol"/>
@@ -526,7 +527,7 @@
                  classpath="${freecol.build.dir}/jars/jarbundler-core-3.3.0.jar"/>
         <jarbundler dir="${freecol.release.dir}"
                     name="FreeCol"
-                    mainclass="net.sf.freecol.freecol"
+                    mainclass="${freecol.main.class}"
                     version="${freecol.version}"
                     vmoptions="-Xmx1G -Dapple.awt.fakefullscreen=true"
                     jvmversion="1.8+"

diff --git a/build/skeletons/FreeCol b/build/skeletons/FreeCol