Skip to content

Commit 0b0b6cb

Browse files
committed
R maven specific rpm generator
1 parent 042fb00 commit 0b0b6cb

File tree

5 files changed

+3
-162
lines changed

5 files changed

+3
-162
lines changed

src/main/java/io/github/fvarrui/javapackager/gradle/GradleContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
1515
import io.github.fvarrui.javapackager.packagers.Context;
16+
import io.github.fvarrui.javapackager.packagers.GenerateRpm;
1617
import io.github.fvarrui.javapackager.packagers.Packager;
1718

1819
/**

src/main/java/io/github/fvarrui/javapackager/maven/GenerateRpm.java

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

src/main/java/io/github/fvarrui/javapackager/maven/MavenContext.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ public MavenContext(ExecutionEnvironment env, Log logger) {
2222
this.env = env;
2323
this.logger = logger;
2424

25-
// maven dependant generators
26-
this.getLinuxInstallerGenerators().add(new GenerateRpm());
27-
2825
}
2926

3027
public ExecutionEnvironment getEnv() {

src/main/java/io/github/fvarrui/javapackager/packagers/Context.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public Context() {
1717

1818
// building tool independent generators
1919
linuxInstallerGenerators.add(new GenerateDeb());
20+
linuxInstallerGenerators.add(new GenerateRpm());
2021
macInstallerGenerators.add(new GenerateDmg());
2122
macInstallerGenerators.add(new GeneratePkg());
2223
windowsInstallerGenerators.add(new GenerateSetup());

src/main/java/io/github/fvarrui/javapackager/gradle/GenerateRpm.java renamed to src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.fvarrui.javapackager.gradle;
1+
package io.github.fvarrui.javapackager.packagers;
22

33
import java.io.File;
44
import java.io.IOException;
@@ -11,9 +11,6 @@
1111
import org.redline_rpm.header.Os;
1212
import org.redline_rpm.header.RpmType;
1313

14-
import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
15-
import io.github.fvarrui.javapackager.packagers.LinuxPackager;
16-
import io.github.fvarrui.javapackager.packagers.Packager;
1714
import io.github.fvarrui.javapackager.utils.FileUtils;
1815
import io.github.fvarrui.javapackager.utils.Logger;
1916
import io.github.fvarrui.javapackager.utils.VelocityUtils;

0 commit comments

Comments
 (0)