Skip to content

Commit

Permalink
Clean up launcher directory and 'build.gradle'
Browse files Browse the repository at this point in the history
Leftover files for the launcher were removed.  The gradle
build file had references to 'mt.cfg' replaced with 'launch.properties'.
The jwrapper template was updated with another variable (mainClassName).
The launch.properties template was cleaned up and had a newline added
to the last line.
  • Loading branch information
Azhrei committed Aug 26, 2016
1 parent d01b87f commit f438311
Show file tree
Hide file tree
Showing 14 changed files with 106 additions and 511 deletions.
6 changes: 3 additions & 3 deletions build-resources/jWrapper/jwrapper-template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<App>
<Name>MapTool Launcher</Name>
<LogoPNG>@jWrapperDir@/MapTool_Launcher.png</LogoPNG>
<MainClass>net.rptools.maptool.launcher.MapToolLauncher</MainClass>
<MainClass>@mainClass@</MainClass>
<Param>-force_prompt</Param>
</App>
<App>
<Name>MapTool</Name>
<LogoPNG>@jWrapperDir@/MapTool.png</LogoPNG>
<MainClass>net.rptools.maptool.launcher.MapToolLauncher</MainClass>
<MainClass>@mainClass@</MainClass>
<Param>-skip_prompt</Param>
</App>
<SupportedLanguages>en</SupportedLanguages>
Expand All @@ -27,9 +27,9 @@
<WindowsElevationUiAccess>true</WindowsElevationUiAccess>
<File classpath='yes'>@rootDir@/launcher/build/libs/MapTool-Launcher-@buildVersion@-fat.jar</File>
<File classpath='yes'>@rootDir@/maptool/build/libs/MapTool-@buildVersion@-fat.jar</File>
<!-- Can we just use .../src/dist and figure it'll get everything? -->
<File>@rootDir@/launcher/src/dist/doc</File>
<File>@rootDir@/launcher/src/dist/logging</File>
<File>@rootDir@/jWrapper/mt.cfg</File>
<!--
<JvmOptions>
<JvmOption>-Dsun.java2d.d3d=false</JvmOption>
Expand Down
16 changes: 9 additions & 7 deletions build-resources/jWrapper/launch-template.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
# Auto-built via template on: @buildDate@
#
# Lines that start with '#' and blank lines are comments and are ignored.
# The fields below may appear in any order.
# Field names are not case-sensitive but will always be written in uppercase.
# Leading and trailing spaces around field names or their values are ignored.
# Lines that start with '#' and blank lines are comments and are
# ignored. The fields below may appear in any order. Field names are
# not case-sensitive but will always be written in uppercase. Leading
# and trailing spaces around field names or their values are ignored.
# Spaces inside a value are preserved (useful for directory names).
#
# Limited to approximately 1500MB on 32-bit systems; unlimited on 64-bit.
MAXMEM=1024
# Simply a starting point for memory allocation. The default is fine.
MINMEM=64
# Any value larger than 8-10MB is likely to cause memory problems for MapTool.
# Any value larger than 8-10MB is likely to cause memory problems for
# MapTool.
STACKSIZE=2
CONSOLE=false
PROMPT=true
RELATIVE_PATHS=false
# Directory where the MapTool .jar file is stored. (Also see EXECUTABLE.)
MAPTOOL_DIRECTORY=.
# Version of MapTool this configuration file is for; must exist in the MAPTOOL_DIRECTORY directory.
# Version of MapTool this configuration file is for; must exist in the
# MAPTOOL_DIRECTORY directory.
EXECUTABLE=MapTool-@buildVersion@-fat.jar
# MapTool Version
MAPTOOL_VERSION=@buildVersion@
MAPTOOL_VERSION=@buildVersion@
Loading

0 comments on commit f438311

Please sign in to comment.