Skip to content

Commit 5c258f0

Browse files
guFalconguFalcon
committed
Merge branch 'develop'
2 parents af4b9e8 + 241246a commit 5c258f0

30 files changed

+807
-619
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ target/
77
.metadata/
88
database/dbdoc/
99
*.orig
10-
generated-sources/
10+
generated-sources/
11+
*.iml

‎.travis.yml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
########################
2+
### VARIABLES NEEDED ###
3+
########################
4+
# RELEASE Set to true to release a ZIP-file on github (there has to be a
5+
# target/ directory for that)
6+
#
7+
### Deploy
8+
# GITHUB_API_KEY The api-key of github used to push a release-file
9+
# GPG_EXECUTABLE should be 'gpg2'
10+
# GPG_OWNERTRUST The 'ownertrust' export from the key-file used to sign (base64 encoded)
11+
# GPG_SECRET_KEYS The 'secret-key' export from the key-file used to sign (base64 encoded)
12+
# GPG_PASSPHRASE The passphrase used when generating the GPG-key you're now importing
13+
# MAVEN_CENTRAL 'true' if you want to deploy to maven-central; 'false' or undefined if not
14+
# SONATYPE_PASSWORD The password of your sonatype-account used to push to maven-central
15+
# SONATYPE_USERNAME The userName of your sonatype-account used to push to maven-central
16+
#
17+
####################
18+
### GENERAL INFO ###
19+
####################
20+
# - The 'deploy' step in Travis isn't the same process as the rest. So you have to re-source
21+
# the functions into that process. More than that it isn't a full sh process like with the
22+
# script-phase. So you cannot even source from there directly. That's why the source
23+
# command is IN the deploy.sh script.
24+
25+
language: java
26+
jdk:
27+
- openjdk14
28+
before_install:
29+
- git clone https://github.com/UnterrainerInformatik/Travis-Scripts.git travis
30+
- source travis/functions.Java.sh
31+
- tr_setProjectSubdir Java
32+
- source $TRAVIS/before_install.sh
33+
install:
34+
- source $TRAVIS/install.sh
35+
before_script:
36+
- source $TRAVIS/before_script.sh
37+
script:
38+
- source $TRAVIS/script.sh
39+
40+
before_deploy: ./$TRAVIS/before_deploy.sh
41+
deploy:
42+
- provider: script
43+
skip_cleanup: true
44+
script: ./$TRAVIS/deploy.sh
45+
on:
46+
branch: master
47+
- provider: releases
48+
skip_cleanup: true
49+
overwrite: true
50+
api_key:
51+
secure: $GITHUB_API_KEY
52+
file: $ARTIFACT_ID.$POM_VERSION.zip
53+
on:
54+
tags: true
55+
branch: master

‎Information.template‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package @package@;
2+
3+
public class Information {
4+
public static final String name = "@name@";
5+
public static final String buildTime = "@buildTime@";
6+
public static final String pomVersion = "@pomVersion@";
7+
}

‎pom.xml‎

Lines changed: 52 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,42 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34

5+
<parent>
6+
<groupId>info.unterrainer.commons</groupId>
7+
<artifactId>parent-pom</artifactId>
8+
<version>0.1.3</version>
9+
</parent>
10+
11+
<properties>
12+
<mainclass>info.unterrainer.java.tools.scripting.bulkmakemkv.BulkMakeMkv</mainclass>
13+
</properties>
14+
415
<modelVersion>4.0.0</modelVersion>
516
<groupId>info.unterrainer.java.tools.scripting</groupId>
617
<artifactId>bulk-makemkv</artifactId>
7-
<version>0.2</version>
18+
<version>0.1.0</version>
819
<name>BulkMakeMkv</name>
920
<packaging>jar</packaging>
1021
<description>Using this tool you may convert multiple ISO-files containing blue-ray or DVD images to MKVs utilizing the MakeMKV library.</description>
11-
<url>https://www.unterrainer.info:8443/projects/JAV/repos/bulkmakemkv/browse</url>
12-
13-
<properties>
14-
<javaVersion>1.8</javaVersion>
15-
<project.compile.sourceEncoding>UTF-8</project.compile.sourceEncoding>
16-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
</properties>
19-
20-
<developers>
21-
<developer>
22-
<name>Gerald Unterrainer</name>
23-
<email>psilo@unterrainer.info</email>
24-
<organization>Unterrainer Informatik OG</organization>
25-
<organizationUrl>http://www.unterrainer.info</organizationUrl>
26-
</developer>
27-
</developers>
28-
29-
<distributionManagement>
30-
<site>
31-
<id>github-project-site</id>
32-
<name>GitHub Project Pages</name>
33-
<url>gitsite:https://github.com/UnterrainerInformatik/bulkmakemkv</url>
34-
</site>
35-
</distributionManagement>
36-
37-
<scm>
38-
<connection>scm:git:https://github.com/UnterrainerInformatik/bulkmakemkv</connection>
39-
<developerConnection>scm:git:https://guFalcon@github.com/UnterrainerInformatik/bulkmakemkv</developerConnection>
40-
<url>https://github.com/UnterrainerInformatik/bulkmakemkv</url>
41-
</scm>
42-
43-
<build>
44-
<sourceDirectory>${project.basedir}\src</sourceDirectory>
45-
<outputDirectory>${project.basedir}\target\classes</outputDirectory>
46-
<testSourceDirectory>${project.basedir}\test</testSourceDirectory>
47-
<testOutputDirectory>${project.basedir}\target\test-classes</testOutputDirectory>
48-
<plugins>
49-
<plugin>
50-
<artifactId>maven-compiler-plugin</artifactId>
51-
<version>3.3</version>
52-
<configuration>
53-
<source>${javaVersion}</source>
54-
<target>${javaVersion}</target>
55-
</configuration>
56-
</plugin>
57-
<plugin>
58-
<groupId>org.apache.maven.plugins</groupId>
59-
<artifactId>maven-source-plugin</artifactId>
60-
<executions>
61-
<execution>
62-
<id>attach-sources</id>
63-
<goals>
64-
<goal>jar</goal>
65-
</goals>
66-
</execution>
67-
</executions>
68-
</plugin>
69-
<plugin>
70-
<groupId>org.apache.maven.plugins</groupId>
71-
<artifactId>maven-javadoc-plugin</artifactId>
72-
<configuration>
73-
<useStandardDocletOptions>false</useStandardDocletOptions>
74-
<additionalparam>-Xdoclint:none</additionalparam>
75-
</configuration>
76-
<executions>
77-
<execution>
78-
<id>attach-javadocs</id>
79-
<goals>
80-
<goal>jar</goal>
81-
</goals>
82-
</execution>
83-
</executions>
84-
</plugin>
85-
<plugin>
86-
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-gpg-plugin</artifactId>
88-
<version>1.5</version>
89-
<executions>
90-
<execution>
91-
<id>sign-artifacts</id>
92-
<phase>verify</phase>
93-
<goals>
94-
<goal>sign</goal>
95-
</goals>
96-
</execution>
97-
</executions>
98-
</plugin>
99-
</plugins>
100-
</build>
101-
102-
<licenses>
103-
<license>
104-
<name>Microsoft Public License</name>
105-
<url>http://opensource.org/licenses/MS-PL</url>
106-
<distribution>repo</distribution>
107-
</license>
108-
</licenses>
109-
110-
<organization>
111-
<name>Unterrainer Informatik OG</name>
112-
<url>http://www.unterrainer.info</url>
113-
</organization>
114-
22+
<url>https://github.com/UnterrainerInformatik/bulkmakemkv</url>
23+
11524
<dependencies>
11625
<dependency>
11726
<groupId>info.unterrainer.java.tools</groupId>
118-
<artifactId>nullannotations</artifactId>
27+
<artifactId>data-structures</artifactId>
11928
<version>0.2</version>
120-
<optional>true</optional>
121-
<!-- for annotations only -->
12229
</dependency>
12330
<dependency>
12431
<groupId>info.unterrainer.java.tools</groupId>
12532
<artifactId>utils</artifactId>
126-
<version>0.2</version>
33+
<version>0.3</version>
12734
</dependency>
12835
<dependency>
12936
<groupId>info.unterrainer.java.tools.reporting</groupId>
13037
<artifactId>console-progressbar</artifactId>
13138
<version>0.2</version>
13239
</dependency>
133-
<dependency>
134-
<groupId>commons-collections</groupId>
135-
<artifactId>commons-collections</artifactId>
136-
<version>3.2.1</version>
137-
</dependency>
13840
<dependency>
13941
<groupId>commons-configuration</groupId>
14042
<artifactId>commons-configuration</artifactId>
@@ -145,27 +47,45 @@
14547
<artifactId>commons-lang</artifactId>
14648
<version>2.6</version>
14749
</dependency>
148-
<dependency>
149-
<groupId>commons-logging</groupId>
150-
<artifactId>commons-logging</artifactId>
151-
<version>1.1.1</version>
152-
</dependency>
15350
<dependency>
15451
<groupId>org.projectlombok</groupId>
15552
<artifactId>lombok</artifactId>
156-
<version>1.16.4</version>
53+
<version>1.18.16</version>
15754
</dependency>
15855
</dependencies>
15956

160-
<profiles>
161-
<profile>
162-
<repositories>
163-
<repository>
164-
<id>mvnrepository</id>
165-
<name>mvnrepository</name>
166-
<url>http://www.mvnrepository.com</url>
167-
</repository>
168-
</repositories>
169-
</profile>
170-
</profiles>
57+
<build>
58+
<plugins>
59+
<plugin>
60+
<groupId>org.apache.maven.plugins</groupId>
61+
<artifactId>maven-shade-plugin</artifactId>
62+
<executions>
63+
<execution>
64+
<goals>
65+
<goal>shade</goal>
66+
</goals>
67+
<configuration>
68+
<shadedArtifactAttached>true</shadedArtifactAttached>
69+
<transformers>
70+
<transformer
71+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
72+
<mainClass>info.unterrainer.java.tools.scripting.bulkmakemkv.BulkMakeMkv</mainClass>
73+
</transformer>
74+
</transformers>
75+
<filters>
76+
<filter>
77+
<artifact>*:*</artifact>
78+
<excludes>
79+
<exclude>META-INF/*.SF</exclude>
80+
<exclude>META-INF/*.DSA</exclude>
81+
<exclude>META-INF/*.RSA</exclude>
82+
</excludes>
83+
</filter>
84+
</filters>
85+
</configuration>
86+
</execution>
87+
</executions>
88+
</plugin>
89+
</plugins>
90+
</build>
17191
</project>

‎readme.md‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
*
1818
***************************************************************************/
1919
```
20-
20+
[![Travis branch](https://img.shields.io/travis/UnterrainerInformatik/bulkmakemkv/develop.svg?maxAge=2592000)]()
21+
22+
2123
# Disclaimer
2224

2325
This section of our GIT repository is free. You may copy, use or rewrite every single one of its contained projects to your hearts content.
@@ -30,7 +32,7 @@ All of our projects facilitate the [Project Lombok][lombok]. So please download
3032

3133
**Beware:** Project Lombok currently doesn't play well with Eclipse Mars (4.5). You'll get build-errors using the extension methods as of now.
3234

33-
# BulkMakeMKV
35+
# ![BulkMakeMKV Icon](http://unterrainer.info/logos/bulkmakemkv128.png) BulkMakeMKV
3436

3537
MakeMKV is a program that extracts MKV-files from DVD/BR-rips that are saved as an image (ISO) or a DVD/BR in general (a mounted one, preferably).
3638

@@ -44,11 +46,11 @@ Make sure that java.exe is on your path, or start the following commands with th
4446

4547
Start the program, as you would start any jar by typing:
4648
```
47-
java -jar bulkMakeMkv.jar
49+
java -jar bulk-makemkv-0.2-jar-with-dependencies.jar
4850
```
4951
or put these lines in a batch-file (should be more convenient):
5052
```
51-
java -jar bulkMakeMkv.jar
53+
java -jar bulk-makemkv-0.2-jar-with-dependencies.jar
5254
pause
5355
```
5456

@@ -87,6 +89,9 @@ os = windows
8789
#
8890
# If you want to specify more than one, just add another isoDirs-parameter
8991
# (same name) below the current one.
92+
# try:
93+
# isoDirs = /path to dir
94+
# for absolute paths on linux based systems like mac.
9095
isoDirs = //computername/f$
9196

9297
# This is the temporary directory which is used when makeMKV is working.
@@ -194,6 +199,11 @@ Sometimes, when dealing with series, makeMKV sometimes does a 'catch-all' track
194199
*Resulting target-folder / file-name:*
195200
`/Avatar - The Last Airbender - s01e14/Avatar - The Last Airbender - s01e014.mkv`
196201

202+
---
203+
This program is brought to you by [Unterrainer Informatik][homepage]
204+
Project lead is [Gerald Unterrainer][geraldmail]
205+
206+
[geraldmail]: mailto:gerald@unterrainer.info
197207
[homepage]: http://www.unterrainer.info
198208
[coding]: http://www.unterrainer.info/Home/Coding
199209
[makemkv]: http://www.makemkv.com/

‎src/info/unterrainer/java/tools/scripting/bulkmakemkv/filevisitors/package-info.java‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/info/unterrainer/java/tools/scripting/bulkmakemkv/package-info.java‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/info/unterrainer/java/tools/scripting/bulkmakemkv/syscommandexecutor/package-info.java‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)