Skip to content

Commit fa028e8

Browse files
committed
define version number in build script, add it to manifest and file name,
remove xtend debug info workaround.
1 parent 746b7ed commit fa028e8

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ xtend-gen/
88
*.settings
99
.DS_Store
1010

11-
/.README.md.html
12-
/make_exe.sh
13-
/wallet-key-tool.exe
14-
/wallet-key-tool.jar
11+
.README.md.html
12+
make_exe.sh
13+
*.exe
14+
*.jar

build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,22 @@ buildscript {
88
}
99
}
1010

11+
version = "1.4.2"
12+
ext {
13+
mainClassName = "prof7bit.bitcoin.wallettool.core.Main"
14+
}
15+
1116
apply plugin: 'xtend'
1217
apply plugin: 'java'
1318
apply plugin: 'eclipse'
1419
apply plugin: 'launch4j'
1520

1621
launch4j {
1722
// for this task to work launch4j needs to be installed and on the PATH.
18-
mainClassName = "prof7bit.bitcoin.wallettool.core.Main"
23+
mainClassName = project.mainClassName
24+
outfile = project.name + "-" + project.version + ".exe"
1925
}
2026

21-
project.ext.mainClassName = "prof7bit.bitcoin.wallettool.core.Main"
22-
2327
repositories {
2428
mavenCentral()
2529
maven { url "https://raw.githubusercontent.com/bitcoin-solutions/mbhd-maven/master/releases" }
@@ -47,6 +51,7 @@ jar {
4751

4852
manifest {
4953
attributes 'Main-Class': project.mainClassName
54+
attributes 'Version': project.version
5055
}
5156
}
5257

@@ -55,7 +60,3 @@ xtend {
5560
xtendAsPrimaryDebugSource = false
5661
hideSyntheticVariables = false
5762
}
58-
59-
// disable xtend debug info entirely
60-
tasks.installMainXtendDebugInfo.enabled = false
61-
compileJava.destinationDir = sourceSets.main.output.classesDir

0 commit comments

Comments
 (0)