Skip to content

Commit 556b380

Browse files
authored
Merge pull request #331 from orange-guo/topic/xcg/fix_deb_generation
fix(gradle-default-package-task): Set arch field for deb control file rendering
2 parents 01f680f + 4110d77 commit 556b380

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ By default it will generate next artifacts in `${outputDirectory} ` folder:
145145
| `additionalModulePaths` | :x: | `[]` | Additional module paths for `jdeps`. |
146146
| `additionalModules` | :x: | `[]` | Additional modules to the ones identified by `jdeps` or the specified with `modules` property. |
147147
| `additionalResources` | :x: | `[]` | Additional files and folders to include in the bundled app. |
148+
| `arch` | :x: | `${os.arch}` | The dependency of some ArtifactGenerator objects in the process of making packages, such as GenerateDeb |
148149
| `administratorRequired` | :x: | `false` | App will run as administrator (with elevated privileges). |
149150
| `assetsDir` | :x: | `${basedir}/assets` or `${projectdir}/assets` | Assets location (icons and custom Velocity templates). |
150151
| `bundleJre` | :x: | `false` | Embeds a customized JRE with the app. |

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ protected Packager createPackager() throws Exception {
2323
.additionalModulePaths(extension.getAdditionalModulePaths())
2424
.additionalResources(extension.getAdditionalResources())
2525
.administratorRequired(extension.getAdministratorRequired())
26+
.arch(extension.getArch())
2627
.assetsDir(extension.getAssetsDir())
2728
.bundleJre(extension.getBundleJre())
2829
.classpath(extension.getClasspath())
@@ -62,5 +63,5 @@ protected Packager createPackager() throws Exception {
6263
.winConfig(extension.getWinConfig());
6364

6465
}
65-
66+
6667
}

0 commit comments

Comments
 (0)