Skip to content

Commit 71eef05

Browse files
committed
U move deb generator creation to general context (non-depending on building tool)
1 parent f743219 commit 71eef05

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
99
import io.github.fvarrui.javapackager.packagers.Context;
10-
import io.github.fvarrui.javapackager.packagers.GenerateDeb;
1110
import io.github.fvarrui.javapackager.packagers.Packager;
1211

1312
/**
@@ -24,7 +23,6 @@ public GradleContext(Project project) {
2423
this.project = project;
2524

2625
// gradle dependant generators
27-
this.getLinuxInstallerGenerators().add(new GenerateDeb());
2826
this.getLinuxInstallerGenerators().add(new GenerateRpm());
2927

3028
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.twdata.maven.mojoexecutor.MojoExecutor.ExecutionEnvironment;
77

88
import io.github.fvarrui.javapackager.packagers.Context;
9-
import io.github.fvarrui.javapackager.packagers.GenerateDeb;
109
import io.github.fvarrui.javapackager.packagers.Packager;
1110

1211
/**
@@ -24,7 +23,6 @@ public MavenContext(ExecutionEnvironment env, Log logger) {
2423
this.logger = logger;
2524

2625
// maven dependant generators
27-
this.getLinuxInstallerGenerators().add(new GenerateDeb());
2826
this.getLinuxInstallerGenerators().add(new GenerateRpm());
2927

3028
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ public Context() {
1616
super();
1717

1818
// building tool independent generators
19+
linuxInstallerGenerators.add(new GenerateDeb());
1920
macInstallerGenerators.add(new GenerateDmg());
2021
macInstallerGenerators.add(new GeneratePkg());
2122
windowsInstallerGenerators.add(new GenerateSetup());
2223
windowsInstallerGenerators.add(new GenerateMsm());
23-
windowsInstallerGenerators.add(new GenerateMsi());
24+
windowsInstallerGenerators.add(new GenerateMsi());
2425

2526
}
2627

0 commit comments

Comments
 (0)