Skip to content

Commit

Permalink
bump version to 5.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinawalsh committed Aug 3, 2023
1 parent 63ae3a3 commit c6de52a
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 69 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ 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.0/Logisim-Evolution-5.0.0hc.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.0/Logisim-Evolution-5.0.0-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.0/logisim-evolution-5.0.0hc.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.1/Logisim-Evolution-5.0.1hc.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.1/Logisim-Evolution-5.0.1-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.1/logisim-evolution-5.0.1hc.jar)

**MAC Security Warning**: On some recent MacOS versions, the OS security
gatekeeper may prevent you from opening the PKG file above directly. Instead,
Expand All @@ -14,7 +14,7 @@ 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.0/Logisim-Evolution-5.0.0hc-windows.zip) is
An alternative [ZIP format version for Windows](https://github.com/kevinawalsh/logisim-evolution/releases/download/v5.0.1/Logisim-Evolution-5.0.1hc-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 @@ -23,10 +23,10 @@ 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.0hc.jar` from within the
prompt) and type `java -jar logisim-evolution-5.0.1hc.jar` from within the
directory where you have downloaded the JAR file.

## What's new in version 5.0.0
## What's new in version 5.x.x

* Mac releases are compiled for Apple M1 and M2 processors, so should perform
much better.
Expand Down
6 changes: 4 additions & 2 deletions 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.0" # must be numerical x.y.z
VERSION="5.0.1" # 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 Expand Up @@ -149,6 +149,7 @@ ${PACKAGER} \
--name "Logisim-Evolution" \
--main-class com.cburch.logisim.Main \
--main-jar "${JAR}" \
--java-options "--add-opens=java.desktop/com.apple.eawt.event=ALL-UNNAMED" \
--app-version "${VERSION}" \
--copyright "(c) 2023 Kevin Walsh" \
--description "Digital logic designer and simulator." \
Expand All @@ -169,7 +170,7 @@ rm -rf mac-staging
rm -rf mac-resources
mv "Logisim-Evolution-${VERSION}.pkg" "Logisim-Evolution-${VERSION}-HC.pkg"

cat <<END
cat <<ENDNOTE
# To notarize, run this command:
Expand All @@ -193,3 +194,4 @@ cat mac-notarize.log
# Check for warnings and errors, then finally:
xcrun stapler staple Logisim-Evolution-${VERSION}-HC.pkg
ENDNOTE
22 changes: 11 additions & 11 deletions build-win-release-package.bat
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,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.0
rem set VERSION=5.0.1
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 +119,18 @@ echo Creating executable wrapper...
%LAUNCH4J% logisim-l4j.xml || goto :error

echo Creating ZIP package for distribution...
IF EXIST Logisim-Evolution-5.0.0hc-windows.zip del Logisim-Evolution-5.0.0hc-windows.zip || goto :error
IF EXIST Logisim-Evolution-5.0.0hc rmdir /S /Q Logisim-Evolution-5.0.0hc || goto :error
mkdir Logisim-Evolution-5.0.0hc || goto :error
copy LICENSE Logisim-Evolution-5.0.0hc\LICENSE.txt || goto :error
copy logisim-evolution-5.0.0hc.exe Logisim-Evolution-5.0.0hc || goto :error
xcopy /s logisim-evolution-runtime Logisim-Evolution-5.0.0hc\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.0hc', 'Logisim-Evolution-5.0.0hc-windows.zip'); }" || goto :error
IF EXIST logisim-evolution-5.0.0hc.exe del logisim-evolution-5.0.0hc.exe || goto :error
rmdir /S /Q Logisim-Evolution-5.0.0hc || goto :error
IF EXIST Logisim-Evolution-5.0.1hc-windows.zip del Logisim-Evolution-5.0.1hc-windows.zip || goto :error
IF EXIST Logisim-Evolution-5.0.1hc rmdir /S /Q Logisim-Evolution-5.0.1hc || goto :error
mkdir Logisim-Evolution-5.0.1hc || goto :error
copy LICENSE Logisim-Evolution-5.0.1hc\LICENSE.txt || goto :error
copy logisim-evolution-5.0.1hc.exe Logisim-Evolution-5.0.1hc || goto :error
xcopy /s logisim-evolution-runtime Logisim-Evolution-5.0.1hc\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.1hc', 'Logisim-Evolution-5.0.1hc-windows.zip'); }" || goto :error
IF EXIST logisim-evolution-5.0.1hc.exe del logisim-evolution-5.0.1hc.exe || goto :error
rmdir /S /Q Logisim-Evolution-5.0.1hc || goto :error

echo Creating self-contained executable...
copy logisim-evolution.jar logisim-evolution-5.0.0hc.jar || goto :error
copy logisim-evolution.jar logisim-evolution-5.0.1hc.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.0hc.exe</outfile>
<outfile>C:\Users\kwalsh\Downloads\logisim-evolution\logisim-evolution-5.0.1hc.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.0hc.exe"
OutFile "Logisim-Evolution-5.0.1hc.exe"
Icon "logisim.ico"
VIProductVersion 5.0.0.00000
VIAddVersionKey ProductName "Logisim-Evolution-5.0.0hc"
VIProductVersion 5.0.1.00000
VIAddVersionKey ProductName "Logisim-Evolution-5.0.1hc"
VIAddVersionKey LegalCopyright "Copyright (c) 2023 Kevin Walsh"
VIAddVersionKey FileDescription "Digital logic designer and simulator"
VIAddVersionKey FileVersion 5.0.0.00000
VIAddVersionKey ProductVersion "5.0.0hc / Adoptium OpenJDK Temurin-17.0.7_7 (x64)"
VIAddVersionKey FileVersion 5.0.1.00000
VIAddVersionKey ProductVersion "5.0.1hc / Adoptium OpenJDK Temurin-17.0.7_7 (x64)"
VIAddVersionKey InternalName "Logisim-Evolution-HC"
VIAddVersionKey OriginalFilename "Logisim-Evolution-5.0.0hc.exe"
VIAddVersionKey OriginalFilename "Logisim-Evolution-5.0.1hc.exe"

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

InitPluginsDir
SetOutPath $PluginsDir
File "logisim-evolution-5.0.0hc.jar"
File "logisim-evolution-5.0.1hc.jar"
SetOutPath $TEMP
${GetParameters} $R0
nsExec::Exec '"$TEMP\logisim-evolution-runtime\bin\javaw.exe" -jar $PluginsDir\logisim-evolution-5.0.0hc.jar $R0'
nsExec::Exec '"$TEMP\logisim-evolution-runtime\bin\javaw.exe" -jar $PluginsDir\logisim-evolution-5.0.1hc.jar $R0'
RMDir /r $PluginsDir
SectionEnd
Loading

0 comments on commit c6de52a

Please sign in to comment.