Skip to content

Commit

Permalink
Merge branch 'dev' into javadoc-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
charlestian23 authored Feb 23, 2024
2 parents e0f8913 + 176e3ad commit b85532e
Show file tree
Hide file tree
Showing 31 changed files with 0 additions and 909 deletions.
34 changes: 0 additions & 34 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -104,40 +104,6 @@ jar {
archiveFileName = 'Legup.jar'
}

/*
* CREATES NATIVE WINDOWS EXECUTABLE
* Launches launch4j to create an executable (.exe) file wrapping the jar
* THIS IS NOT THE INSTALLER
* Add "icon = 'path/to/icon.ico'" to set an icon for the executable
*/
createExe() {
mainClassName = 'edu.rpi.legup.Legup'
outputDir = '../native/windows'
outfile = 'bin/Legup.exe'
bundledJrePath = 'jre'
bundledJre64Bit = true
jdkPreference = 'preferJre'
jreMinVersion = '21'
jreRuntimeBits = '64/32'
}

/*
* CREATES NATIVE WINDOWS INSTALLER -- ONLY RUNS ON WINDOWS
* Runs the shipped version of Inno Setup (6.2) to compile the installer
* Modify the setup settings in native/windows/legup_inno_setup.iss
*
* Modifications are likely required to run the setup script on your computer:
* Edit the "CHANGE ME" line in native/windows/legup_inno_setup.iss to reflect
* the path to the Java installation you want to ship inside the executable.
*/
task buildNativeWindows(type: Exec, dependsOn: 'createExe') {
jar
createExe

workingDir = "${buildDir}/../native/windows"
commandLine 'cmd', '/c', 'make_windows_installer.bat'
}

repositories {
mavenCentral()
}
Expand Down
Empty file removed native/linux/.keep
Empty file.
Empty file removed native/macos/.keep
Empty file.
53 changes: 0 additions & 53 deletions native/windows/OLD_inno_setup.iss

This file was deleted.

Binary file removed native/windows/inno-setup/Compil32.exe
Binary file not shown.
384 changes: 0 additions & 384 deletions native/windows/inno-setup/Default.isl

This file was deleted.

Binary file removed native/windows/inno-setup/ISCC.exe
Binary file not shown.
Binary file removed native/windows/inno-setup/ISCmplr.dll
Binary file not shown.
Binary file removed native/windows/inno-setup/ISPP.chm
Binary file not shown.
Binary file removed native/windows/inno-setup/ISPP.dll
Binary file not shown.
Loading

0 comments on commit b85532e

Please sign in to comment.