diff --git a/.gitignore b/.gitignore index 6a3e68da15877a8e092804b0413c24b39bda11c0..8b8c0bcf06554df92e8d74e0a265520fcd641fd0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -**/.DS_Store \ No newline at end of file +**/.DS_Store +/out/ diff --git a/.idea/artifacts/PlayWall_jar.xml b/.idea/artifacts/PlayWall_jar.xml new file mode 100644 index 0000000000000000000000000000000000000000..02789ba42d6c35d24313608c2b50e615c70f8547 --- /dev/null +++ b/.idea/artifacts/PlayWall_jar.xml @@ -0,0 +1,32 @@ +<component name="ArtifactManager"> + <artifact type="jar" name="PlayWall:jar"> + <output-path>$PROJECT_DIR$/out/artifacts/PlayWall_jar</output-path> + <root id="archive" name="PlayWall.jar"> + <element id="module-output" name="PlayWall" /> + <element id="module-output" name="PlayWallCore" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/XML/dom4j-1.6.1.jar" path-in-jar="/" /> + <element id="extracted-dir" path="/usr/local/Cellar/scala/2.12.1/idea/lib/scala-library.jar" path-in-jar="/" /> + <element id="extracted-dir" path="/usr/local/Cellar/scala/2.12.1/idea/lib/scala-parser-combinators_2.12-1.0.4.jar" path-in-jar="/" /> + <element id="extracted-dir" path="/usr/local/Cellar/scala/2.12.1/idea/lib/scala-reflect.jar" path-in-jar="/" /> + <element id="extracted-dir" path="/usr/local/Cellar/scala/2.12.1/idea/lib/scala-swing_2.12-2.0.0-M2.jar" path-in-jar="/" /> + <element id="extracted-dir" path="/usr/local/Cellar/scala/2.12.1/idea/lib/scala-xml_2.12-1.0.6.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/jspf/dist/jspf.core-1.0.2.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/Json/json-smart-1.2.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/junit-4.12.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JavaFX/controlsfx-8/controlsfx-8.40.11.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JNA/jna-4.1.0.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JNA/jna-platform-4.1.0.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/HTML/gagawa-1.0.1.jar" path-in-jar="/" /> + <element id="library" level="application" name="libUtils" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/JLayer1.0.1/jl1.0.1.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/tinysound-1.1.1.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/jorbis-0.0.17.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/tritonus_share.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/tinysound/lib/vorbisspi1.0.3.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/guava-15.0.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/snakeyaml-1.11.jar" path-in-jar="/" /> + <element id="extracted-dir" path="$PROJECT_DIR$/../../Libraries/File Parser/YAML/YAMLStorage.jar" path-in-jar="/" /> + <element id="library" level="application" name="Updater" /> + </root> + </artifact> +</component> \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9cf18a447cb98b5bdd1d8ff046fa0a6df375aff5..5e3b38ee5ece1521a828011fad7efd5bde3b6350 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,12 @@ <project version="4"> <component name="ArtifactsWorkspaceSettings"> <artifacts-to-build> - <artifact name="PlayWall" /> + <artifact name="PlayWall:jar" /> </artifacts-to-build> </component> <component name="ChangeListManager"> <list default="true" id="79f1c12d-cb47-4c05-a8f3-d2eb3588d81c" name="Default" comment=""> - <change type="DELETED" beforePath="$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/view/PadView.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PlayWall/src/META-INF/MANIFEST.MF" /> </list> <ignored path="$PROJECT_DIR$/PlayWall/bin/" /> <ignored path="$PROJECT_DIR$/PlayWallCore/bin/" /> @@ -505,7 +505,7 @@ <state key="ArtifactsStructureConfigurable.UI"> <settings> <artifact-editor /> - <last-edited>PlayWall</last-edited> + <last-edited>PlayWall:jar</last-edited> <splitter-proportions> <option name="proportions"> <list> diff --git a/PlayWall/src/META-INF/MANIFEST.MF b/PlayWall/src/META-INF/MANIFEST.MF new file mode 100644 index 0000000000000000000000000000000000000000..75a7c8d35b13336ce56a28f7f86a0cc156215937 --- /dev/null +++ b/PlayWall/src/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: de.tobias.playpad.PlayPadMain +