From de46ac67ae7821bc4e9d17cedf021768461fb9cd Mon Sep 17 00:00:00 2001 From: opty Date: Sun, 29 Sep 2019 17:16:33 +0200 Subject: [PATCH] Fixes for packaging --- JRomManager/build.gradle | 4 ++++ JRomManager/src-cli/jrm/CLIMessages.java | 2 +- .../CLIMessages.properties} | 0 .../CLIMessages_fr.properties} | 0 JRomManager/src-cli/jrm/resources/package-info.java | 1 + README.md | 12 ++++++------ 6 files changed, 12 insertions(+), 7 deletions(-) rename JRomManager/src-cli/jrm/{cli-messages.properties => resources/CLIMessages.properties} (100%) rename JRomManager/src-cli/jrm/{cli-messages_fr.properties => resources/CLIMessages_fr.properties} (100%) create mode 100644 JRomManager/src-cli/jrm/resources/package-info.java diff --git a/JRomManager/build.gradle b/JRomManager/build.gradle index b929265a..901e2525 100644 --- a/JRomManager/build.gradle +++ b/JRomManager/build.gradle @@ -287,6 +287,9 @@ project(':JRomManager:jrmcli') { java { srcDirs = ["../src-cli"] } + resources { + srcDirs = ["../src-cli"] + } } } dependencies { @@ -426,6 +429,7 @@ task cliFatJar(type: Jar) { } baseName = 'JRomManagerCLI' from(project(':JRomManager:jrmcli').sourceSets.main.output.classesDirs) + from(project(':JRomManager:jrmcli').sourceSets.main.resources) from { project(':JRomManager:jrmcli').configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } } diff --git a/JRomManager/src-cli/jrm/CLIMessages.java b/JRomManager/src-cli/jrm/CLIMessages.java index aae2b779..fe0ae284 100644 --- a/JRomManager/src-cli/jrm/CLIMessages.java +++ b/JRomManager/src-cli/jrm/CLIMessages.java @@ -5,7 +5,7 @@ public class CLIMessages { - private static final String BUNDLE_NAME = "jrm.cli-messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "jrm.resources.CLIMessages"; //$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); diff --git a/JRomManager/src-cli/jrm/cli-messages.properties b/JRomManager/src-cli/jrm/resources/CLIMessages.properties similarity index 100% rename from JRomManager/src-cli/jrm/cli-messages.properties rename to JRomManager/src-cli/jrm/resources/CLIMessages.properties diff --git a/JRomManager/src-cli/jrm/cli-messages_fr.properties b/JRomManager/src-cli/jrm/resources/CLIMessages_fr.properties similarity index 100% rename from JRomManager/src-cli/jrm/cli-messages_fr.properties rename to JRomManager/src-cli/jrm/resources/CLIMessages_fr.properties diff --git a/JRomManager/src-cli/jrm/resources/package-info.java b/JRomManager/src-cli/jrm/resources/package-info.java new file mode 100644 index 00000000..86d02b0c --- /dev/null +++ b/JRomManager/src-cli/jrm/resources/package-info.java @@ -0,0 +1 @@ +package jrm.resources; diff --git a/README.md b/README.md index 2797d29f..2b2fb60a 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ A Rom Manager entirely written in Java and released under GPL-2 - **Apache 2.0** : [StreamEx](https://github.com/amaembo/streamex) (by Tagir Valeev), [Gradle build tool](https://github.com/gradle/gradle), [Lombok Gradle plugin](https://github.com/franzbecker/gradle-lombok), [GWT SDK](http://www.gwtproject.org) (Google), [GWT WebSockets](https://github.com/sksamuel/gwt-websockets) (Stephen Samuel), and all the [Apache commons](https://commons.apache.org/) libraries ## Technical -_Minimal developement requirements_: +_Minimal development requirements_: - Eclipse Oxygen for Java with WindowBuilder feature and Gradle Buildship - Java 8 - Gradle dependencies (via Maven repositories) @@ -65,7 +65,7 @@ If you just want to recompile sources without using an IDE (Eclipse), here are t - CHD support - Software List support - Per profile settings (what to fix, how to scan, ...) -- MultiThreading support (at least for archive manipulation and checksum calculation, fast disks required) +- MultiThreading support (at least for archive manipulation and checksum calculation, **fast disks required**) - MD5 support (for old dats) - 7z support via SevenZipJBinding + 7z command line as functional backup - TorrentZip support using [Jtrrntzip](https://github.com/optyfr/Jtrrntzip) @@ -73,12 +73,12 @@ If you just want to recompile sources without using an IDE (Eclipse), here are t - Multiple Source Dir - Dat parsing caching via Java Serialization - Optimized to permit scan over shared network -- Dir scan caching via Java Serialization based on FileMDate+FileSize, one cache file per romdir, reusable between different Dat Scans if same dir used +- Dir scan caching via Java Serialization based on FileMDate+FileSize, one cache file per romdir, reusable between different Dat Scans if same dir is used - Enhanced Gui with Report -- Translated to English and French -- Filtering functionalities (clone, chds, systems list, display mode, cabinet type, driver status, ...) +- Translated to English and French (volunteers needed for other languages) +- Filtering functionalities (clone, CHDs, systems list, display mode, cabinet type, driver status, ...) - Optional Separate Dest dir between Roms, CHDs, Software Roms, Software CHDs -- Drag & Drop on src/dest dirs controls +- Drag&Drop on src/dest dirs controls - Double click on game name in profile viewer will launch game if (Mame is linked with profile and item is green) - Double click on software name in profile viewer will launch software with a valid machine (if Mame is linked with profile and item is green) - Double click on cloneof or romof item in profile viewer will jump to that item definition