Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinawalsh committed Jan 23, 2024
1 parent 1d127cf commit e2866e3
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 31 deletions.
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,23 @@ Logisim-Evolution (Holy Cross Edition)

You can get the latest *stable version* of Logisim-Evolution (Holy Cross Edition) here:

[![Download for Windows](https://raw.githubusercontent.com/kevinawalsh/logisim-evolution/holycross/images/download-windows.jpg)](https://github.com/kevinawalsh/logisim-evolution/releases/download/v5.0.2/Logisim-Evolution-5.0.2hc.exe)
[![Download for Mac](https://raw.githubusercontent.com/kevinawalsh/logisim-evolution/holycross/images/download-mac.jpg)](https://github.com/kevinawalsh/logisim-evolution/releases/download/v5.0.2/Logisim-Evolution-5.0.2-HC.pkg)
[![Download for Linux](https://raw.githubusercontent.com/kevinawalsh/logisim-evolution/holycross/images/download-linux.jpg)](https://github.com/kevinawalsh/logisim-evolution/releases/download/v5.0.2/logisim-evolution-5.0.2hc.jar)
[![Download for Windows](https://raw.githubusercontent.com/kevinawalsh/logisim-evolution/holycross/images/download-windows.jpg)](https://github.com/kevinawalsh/logisim-evolution/releases/download/v5.0.3/Logisim-Evolution-5.0.3hc.exe)
[![Download for Mac](https://raw.githubusercontent.com/kevinawalsh/logisim-evolution/holycross/images/download-mac.jpg)](https://github.com/kevinawalsh/logisim-evolution/releases/download/v5.0.3/Logisim-Evolution-5.0.3-HC.pkg)
[![Download for Linux](https://raw.githubusercontent.com/kevinawalsh/logisim-evolution/holycross/images/download-linux.jpg)](https://github.com/kevinawalsh/logisim-evolution/releases/download/v5.0.3/logisim-evolution-5.0.3hc.jar)

**Older Mac Notice**: On older intel-based Macs, please use
[Mac OS Version 4.0.4-HC](https://mathcs.holycross.edu/~kwalsh/Logisim-Evolution-4.0.4-HC.pkg),
a slightly older version of the package. The newer 5.x version is not yet
compiled in a format usable by older Macs.

the 5.x version of Logisim will

**Mac Security Warning**: On some recent MacOS versions, the OS security
gatekeeper may prevent you from opening the PKG file above directly. Instead,
right-click and "Save As..." to save the PKG file to your download folder. Then
go to your download folder in the finder, right click the PKG file and "Open
with... Installer (Default)". When given a security warning, click "Open". This
should install the program.

An alternative [ZIP format version for Windows](https://github.com/kevinawalsh/logisim-evolution/releases/download/v5.0.2/Logisim-Evolution-5.0.2hc-windows.zip) is
An alternative [ZIP format version for Windows](https://github.com/kevinawalsh/logisim-evolution/releases/download/v5.0.3/Logisim-Evolution-5.0.3hc-windows.zip) is
also available. After downloading it, extract the compressed contents to a directory of your choice and run the
extracted exe file.

Expand All @@ -30,7 +28,7 @@ platform, but requires that Java version 11 or above be installed separately
(Java version 17 is recommended; the Adoptium project's Temurin OpenJDK 17
available [here](https://adoptium.net/) is one possible choice).
To run the JAR file, open a command line (or Mac Terminal or Windows CMD.exe
prompt) and type `java -jar logisim-evolution-5.0.2hc.jar` from within the
prompt) and type `java -jar logisim-evolution-5.0.3hc.jar` from within the
directory where you have downloaded the JAR file.

## What's new in version 5.x.x
Expand Down
2 changes: 1 addition & 1 deletion build-mac-release-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ fi
INSTALLER_TYPE="pkg" # Options: dmg or pkg
OUTPUT="."
JAR="logisim-evolution.jar"
VERSION="5.0.2" # must be numerical x.y.z
VERSION="5.0.3" # must be numerical x.y.z
FILE_ASSOCIATIONS="file-associations.properties"
APP_ICON="logisim.icns"
JAVA_APP_IDENTIFIER="edu.holycross.cs.kwalsh.logisim"
Expand Down
23 changes: 11 additions & 12 deletions build-win-release-package.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ rem Workaround 1: Use Launch4j to build an EXE that references a jlink-produce
rem runtime in the same directory, then distribute that EXE with the runtime as a ZIP
rem file. Users can unzip, put wherever they like, then click the exe. As long as
rem the JRE stays in the same directory, should work fine.
rem - Actually, Launch4j doesn't
rem
rem Workaround 2: Use NSIS, as described here:
rem https://netnix.org/2018/07/19/windows-exe-bundled-with-openjdk/
Expand Down Expand Up @@ -69,7 +68,7 @@ rem rem installer type can be exe or msi, but exe does not seem to work
rem set INSTALLER_TYPE="msi"
rem set OUTPUT=.
rem set JAR=logisim-evolution.jar
rem set VERSION=5.0.2
rem set VERSION=5.0.3
rem rem FILE_ASSOCIATIONS="file-associations.properties"
rem set APP_ICON="logisim.ico"
rem rem JAVA_APP_IDENTIFIER="edu.holycross.cs.kwalsh.logisim"
Expand Down Expand Up @@ -119,18 +118,18 @@ echo Creating executable wrapper...
%LAUNCH4J% logisim-l4j.xml || goto :error

echo Creating ZIP package for distribution...
IF EXIST Logisim-Evolution-5.0.2hc-windows.zip del Logisim-Evolution-5.0.2hc-windows.zip || goto :error
IF EXIST Logisim-Evolution-5.0.2hc rmdir /S /Q Logisim-Evolution-5.0.2hc || goto :error
mkdir Logisim-Evolution-5.0.2hc || goto :error
copy LICENSE Logisim-Evolution-5.0.2hc\LICENSE.txt || goto :error
copy logisim-evolution-5.0.2hc.exe Logisim-Evolution-5.0.2hc || goto :error
xcopy /s logisim-evolution-runtime Logisim-Evolution-5.0.2hc\logisim-evolution-runtime\ || goto :error
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('Logisim-Evolution-5.0.2hc', 'Logisim-Evolution-5.0.2hc-windows.zip'); }" || goto :error
IF EXIST logisim-evolution-5.0.2hc.exe del logisim-evolution-5.0.2hc.exe || goto :error
rmdir /S /Q Logisim-Evolution-5.0.2hc || goto :error
IF EXIST Logisim-Evolution-5.0.3hc-windows.zip del Logisim-Evolution-5.0.3hc-windows.zip || goto :error
IF EXIST Logisim-Evolution-5.0.3hc rmdir /S /Q Logisim-Evolution-5.0.3hc || goto :error
mkdir Logisim-Evolution-5.0.3hc || goto :error
copy LICENSE Logisim-Evolution-5.0.3hc\LICENSE.txt || goto :error
copy logisim-evolution-5.0.3hc.exe Logisim-Evolution-5.0.3hc || goto :error
xcopy /s logisim-evolution-runtime Logisim-Evolution-5.0.3hc\logisim-evolution-runtime\ || goto :error
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('Logisim-Evolution-5.0.3hc', 'Logisim-Evolution-5.0.3hc-windows.zip'); }" || goto :error
IF EXIST logisim-evolution-5.0.3hc.exe del logisim-evolution-5.0.3hc.exe || goto :error
rmdir /S /Q Logisim-Evolution-5.0.3hc || goto :error

echo Creating self-contained executable...
copy logisim-evolution.jar logisim-evolution-5.0.2hc.jar || goto :error
copy logisim-evolution.jar logisim-evolution-5.0.3hc.jar || goto :error
%NSIS% logisim-win-install.nsi || goto :error

echo =======================================
Expand Down
2 changes: 1 addition & 1 deletion logisim-l4j.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dontWrapJar>false</dontWrapJar>
<headerType>gui</headerType>
<jar>C:\Users\kwalsh\Downloads\logisim-evolution\logisim-evolution.jar</jar>
<outfile>C:\Users\kwalsh\Downloads\logisim-evolution\logisim-evolution-5.0.2hc.exe</outfile>
<outfile>C:\Users\kwalsh\Downloads\logisim-evolution\logisim-evolution-5.0.3hc.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>
<chdir>.</chdir>
Expand Down
16 changes: 8 additions & 8 deletions logisim-win-install.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ SilentInstall silent
RequestExecutionLevel user
ShowInstDetails hide

OutFile "Logisim-Evolution-5.0.2hc.exe"
OutFile "Logisim-Evolution-5.0.3hc.exe"
Icon "logisim.ico"
VIProductVersion 5.0.2.00000
VIAddVersionKey ProductName "Logisim-Evolution-5.0.2hc"
VIProductVersion 5.0.3.00000
VIAddVersionKey ProductName "Logisim-Evolution-5.0.3hc"
VIAddVersionKey LegalCopyright "Copyright (c) 2023 Kevin Walsh"
VIAddVersionKey FileDescription "Digital logic designer and simulator"
VIAddVersionKey FileVersion 5.0.2.00000
VIAddVersionKey ProductVersion "5.0.2hc / Adoptium OpenJDK Temurin-17.0.7_7 (x64)"
VIAddVersionKey FileVersion 5.0.3.00000
VIAddVersionKey ProductVersion "5.0.3hc / Adoptium OpenJDK Temurin-17.0.7_7 (x64)"
VIAddVersionKey InternalName "Logisim-Evolution-HC"
VIAddVersionKey OriginalFilename "Logisim-Evolution-5.0.2hc.exe"
VIAddVersionKey OriginalFilename "Logisim-Evolution-5.0.3hc.exe"

Section
SetOverwrite off
Expand All @@ -24,9 +24,9 @@ Section

InitPluginsDir
SetOutPath $PluginsDir
File "logisim-evolution-5.0.2hc.jar"
File "logisim-evolution-5.0.3hc.jar"
SetOutPath $TEMP
${GetParameters} $R0
nsExec::Exec '"$TEMP\logisim-evolution-runtime\bin\javaw.exe" -jar $PluginsDir\logisim-evolution-5.0.2hc.jar $R0'
nsExec::Exec '"$TEMP\logisim-evolution-runtime\bin\javaw.exe" -jar $PluginsDir\logisim-evolution-5.0.3hc.jar $R0'
RMDir /r $PluginsDir
SectionEnd
4 changes: 2 additions & 2 deletions src/com/cburch/logisim/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static void setSuddenTerminationAllowed(boolean allow) {
}
}

public static final LogisimVersion VERSION = LogisimVersion.get(5, 0, 2, "HC");
public static final LogisimVersion VERSION = LogisimVersion.get(5, 0, 3, "HC");
public static final String VERSION_NAME = VERSION.toString();
public static final int COPYRIGHT_YEAR = 2023;
public static final int COPYRIGHT_YEAR = 2024;
}

0 comments on commit e2866e3

Please sign in to comment.