Skip to content

Commit

Permalink
#134: sets version to 23.2.1 in various files, renames windows build …
Browse files Browse the repository at this point in the history 
…script
  • Loading branch information
@rladstaetter
rladstaetter committed Aug 19, 2023
1 parent 0564d8a commit 167bda0
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 43 deletions.
2 changes: 1 addition & 1 deletion BuildInstructions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ For the brave, there are build scripts in the main directory for each OS:
build-linux-aarch64.sh
build-linux-amd64.sh
build-mac.sh
build-win-x64.bat
build-win.bat

After configuring the project once properly, you can use those build scripts (which are trivial but handy) to
build `LogoRRR`.
Expand Down
2 changes: 1 addition & 1 deletion build-linux-aarch64.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mvn clean install -T1C; sudo apt install ./dist/dist-linux/installer-linux/target/installer/logorrr_23.2.0_arm64.deb; /opt/logorrr/bin/LogoRRR
mvn clean install -T1C; sudo apt install ./dist/dist-linux/installer-linux/target/installer/logorrr_23.2.1_arm64.deb; /opt/logorrr/bin/LogoRRR
2 changes: 1 addition & 1 deletion build-linux-amd64.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mvn clean install -T1C; sudo apt install ./dist/dist-linux/installer-linux/target/installer/logorrr_23.2.0_amd64.deb; /opt/logorrr/bin/LogoRRR
mvn clean install -T1C; sudo apt install ./dist/dist-linux/installer-linux/target/installer/logorrr_23.2.1_amd64.deb; /opt/logorrr/bin/LogoRRR
2 changes: 1 addition & 1 deletion build-mac.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mvn clean install -T1C; open ./dist/dist-osx/installer-osx/target/installer/LogoRRR-23.2.0.pkg
mvn clean install -T1C; open ./dist/dist-osx/installer-osx/target/installer/LogoRRR-23.2.1.pkg
2 changes: 1 addition & 1 deletion build-win-x64.bat → build-win.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
ECHO Building LogoRRR
cmd /C mvn clean package -q -T1C
ECHO Installing LogoRRR
cmd /C .\dist\dist-win\installer-win-jre\target\installer\LogoRRR-23.2.0-installer-jre.exe
cmd /C .\dist\dist-win\installer-win-jre\target\installer\LogoRRR-23.2.1-installer-jre.exe
46 changes: 23 additions & 23 deletions dist/dist-win/installer-win-jre/src/main/ai/logorrr-installer-jre.aip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<ROW Component="APPDIR" ComponentId="{99BCDB82-5F09-421C-A976-F47DD72C83E1}" Directory_="APPDIR" Attributes="0"/>
<ROW Component="LogoRRR.exe" ComponentId="{5C3E2C2D-8ABA-4AF6-8D16-21634C619EE5}" Directory_="APPDIR" Attributes="0" KeyPath="LogoRRR.exe"/>
<ROW Component="ProductInformation" ComponentId="{C27207B5-935E-4050-A66D-1654F364C41C}" Directory_="APPDIR" Attributes="260" KeyPath="Version"/>
<ROW Component="app.logorrr.app23.2.0SNAPSHOT.jar" ComponentId="{A6188203-4548-421B-AC90-11D613580D8C}" Directory_="APPDIR" Attributes="0" KeyPath="app.logorrr.app23.2.0SNAPSHOT.jar" Type="0"/>
<ROW Component="app.logorrr.app23.2.1SNAPSHOT.jar" ComponentId="{A6188203-4548-421B-AC90-11D613580D8C}" Directory_="APPDIR" Attributes="0" KeyPath="app.logorrr.app23.2.1SNAPSHOT.jar" Type="0"/>
<ROW Component="jre64" ComponentId="{3816678E-07F0-40C8-BBD2-D66C4681C0FE}" Directory_="jre64_Dir" Attributes="0"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
Expand All @@ -56,27 +56,27 @@
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
<ROW File="LogoRRR.exe" Component_="LogoRRR.exe" FileName="LogoRRR.exe" Attributes="0" SourcePath="&lt;AI_STUBS_64&gt;aijclw.exe" SelfReg="false" DigSign="true"/>
<ROW File="app.logorrr.app23.2.0SNAPSHOT.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="APPLOG~1.JAR|app.logorrr.app-23.2.0-SNAPSHOT.jar" Attributes="0" SourcePath="programfiles\app.logorrr.app-23.2.0-SNAPSHOT.jar" SelfReg="false"/>
<ROW File="app.logorrr.build23.2.0SNAPSHOT.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="APPLOG~2.JAR|app.logorrr.build-23.2.0-SNAPSHOT.jar" Attributes="0" SourcePath="programfiles\app.logorrr.build-23.2.0-SNAPSHOT.jar" SelfReg="false"/>
<ROW File="app.logorrr.core23.2.0SNAPSHOT.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="APPLOG~3.JAR|app.logorrr.core-23.2.0-SNAPSHOT.jar" Attributes="0" SourcePath="programfiles\app.logorrr.core-23.2.0-SNAPSHOT.jar" SelfReg="false"/>
<ROW File="com.chuusai.shapeless_2.132.3.7.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="COMCHU~1.JAR|com.chuusai.shapeless_2.13-2.3.7.jar" Attributes="0" SourcePath="programfiles\com.chuusai.shapeless_2.13-2.3.7.jar" SelfReg="false"/>
<ROW File="com.github.pureconfig.pureconfigcore_2.130.17.1.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="COMGIT~1.JAR|com.github.pureconfig.pureconfig-core_2.13-0.17.1.jar" Attributes="0" SourcePath="programfiles\com.github.pureconfig.pureconfig-core_2.13-0.17.1.jar" SelfReg="false"/>
<ROW File="com.github.pureconfig.pureconfiggenericbase_2.130.17.1.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="COMGIT~2.JAR|com.github.pureconfig.pureconfig-generic-base_2.13-0.17.1.jar" Attributes="0" SourcePath="programfiles\com.github.pureconfig.pureconfig-generic-base_2.13-0.17.1.jar" SelfReg="false"/>
<ROW File="com.github.pureconfig.pureconfiggeneric_2.130.17.1.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="COMGIT~3.JAR|com.github.pureconfig.pureconfig-generic_2.13-0.17.1.jar" Attributes="0" SourcePath="programfiles\com.github.pureconfig.pureconfig-generic_2.13-0.17.1.jar" SelfReg="false"/>
<ROW File="com.github.pureconfig.pureconfig_2.130.17.1.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="COMGIT~4.JAR|com.github.pureconfig.pureconfig_2.13-0.17.1.jar" Attributes="0" SourcePath="programfiles\com.github.pureconfig.pureconfig_2.13-0.17.1.jar" SelfReg="false"/>
<ROW File="com.typesafe.config1.4.1.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="COMTYP~1.JAR|com.typesafe.config-1.4.1.jar" Attributes="0" SourcePath="programfiles\com.typesafe.config-1.4.1.jar" SelfReg="false"/>
<ROW File="commonsio.commonsio2.8.0.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="COMMON~1.JAR|commons-io.commons-io-2.8.0.jar" Attributes="0" SourcePath="programfiles\commons-io.commons-io-2.8.0.jar" SelfReg="false"/>
<ROW File="io.github.mkpaz.atlantafxbase1.0.0.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="IOGITH~1.JAR|io.github.mkpaz.atlantafx-base-1.0.0.jar" Attributes="0" SourcePath="programfiles\io.github.mkpaz.atlantafx-base-1.0.0.jar" SelfReg="false"/>
<ROW File="org.kordamp.ikonli.ikonlicore12.3.1.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGKOR~1.JAR|org.kordamp.ikonli.ikonli-core-12.3.1.jar" Attributes="0" SourcePath="programfiles\org.kordamp.ikonli.ikonli-core-12.3.1.jar" SelfReg="false"/>
<ROW File="org.kordamp.ikonli.ikonlifontawesome5pack12.3.1.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGKOR~2.JAR|org.kordamp.ikonli.ikonli-fontawesome5-pack-12.3.1.jar" Attributes="0" SourcePath="programfiles\org.kordamp.ikonli.ikonli-fontawesome5-pack-12.3.1.jar" SelfReg="false"/>
<ROW File="org.kordamp.ikonli.ikonlijavafx12.3.1.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGKOR~3.JAR|org.kordamp.ikonli.ikonli-javafx-12.3.1.jar" Attributes="0" SourcePath="programfiles\org.kordamp.ikonli.ikonli-javafx-12.3.1.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxbase19win.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGOPE~1.JAR|org.openjfx.javafx-base-19-win.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-base-19-win.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxbase19.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGOPE~2.JAR|org.openjfx.javafx-base-19.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-base-19.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxcontrols19win.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGOPE~3.JAR|org.openjfx.javafx-controls-19-win.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-controls-19-win.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxcontrols19.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGOPE~4.JAR|org.openjfx.javafx-controls-19.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-controls-19.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxgraphics19win.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGOPE~5.JAR|org.openjfx.javafx-graphics-19-win.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-graphics-19-win.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxgraphics19.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGOPE~6.JAR|org.openjfx.javafx-graphics-19.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-graphics-19.jar" SelfReg="false"/>
<ROW File="org.scalalang.scalalibrary2.13.9.jar" Component_="app.logorrr.app23.2.0SNAPSHOT.jar" FileName="ORGSCA~1.JAR|org.scala-lang.scala-library-2.13.9.jar" Attributes="0" SourcePath="programfiles\org.scala-lang.scala-library-2.13.9.jar" SelfReg="false"/>
<ROW File="app.logorrr.app23.2.1SNAPSHOT.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="APPLOG~1.JAR|app.logorrr.app-23.2.1-SNAPSHOT.jar" Attributes="0" SourcePath="programfiles\app.logorrr.app-23.2.1-SNAPSHOT.jar" SelfReg="false"/>
<ROW File="app.logorrr.build23.2.1SNAPSHOT.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="APPLOG~2.JAR|app.logorrr.build-23.2.1-SNAPSHOT.jar" Attributes="0" SourcePath="programfiles\app.logorrr.build-23.2.1-SNAPSHOT.jar" SelfReg="false"/>
<ROW File="app.logorrr.core23.2.1SNAPSHOT.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="APPLOG~3.JAR|app.logorrr.core-23.2.1-SNAPSHOT.jar" Attributes="0" SourcePath="programfiles\app.logorrr.core-23.2.1-SNAPSHOT.jar" SelfReg="false"/>
<ROW File="com.chuusai.shapeless_2.132.3.7.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="COMCHU~1.JAR|com.chuusai.shapeless_2.13-2.3.7.jar" Attributes="0" SourcePath="programfiles\com.chuusai.shapeless_2.13-2.3.7.jar" SelfReg="false"/>
<ROW File="com.github.pureconfig.pureconfigcore_2.130.17.1.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="COMGIT~1.JAR|com.github.pureconfig.pureconfig-core_2.13-0.17.1.jar" Attributes="0" SourcePath="programfiles\com.github.pureconfig.pureconfig-core_2.13-0.17.1.jar" SelfReg="false"/>
<ROW File="com.github.pureconfig.pureconfiggenericbase_2.130.17.1.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="COMGIT~2.JAR|com.github.pureconfig.pureconfig-generic-base_2.13-0.17.1.jar" Attributes="0" SourcePath="programfiles\com.github.pureconfig.pureconfig-generic-base_2.13-0.17.1.jar" SelfReg="false"/>
<ROW File="com.github.pureconfig.pureconfiggeneric_2.130.17.1.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="COMGIT~3.JAR|com.github.pureconfig.pureconfig-generic_2.13-0.17.1.jar" Attributes="0" SourcePath="programfiles\com.github.pureconfig.pureconfig-generic_2.13-0.17.1.jar" SelfReg="false"/>
<ROW File="com.github.pureconfig.pureconfig_2.130.17.1.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="COMGIT~4.JAR|com.github.pureconfig.pureconfig_2.13-0.17.1.jar" Attributes="0" SourcePath="programfiles\com.github.pureconfig.pureconfig_2.13-0.17.1.jar" SelfReg="false"/>
<ROW File="com.typesafe.config1.4.1.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="COMTYP~1.JAR|com.typesafe.config-1.4.1.jar" Attributes="0" SourcePath="programfiles\com.typesafe.config-1.4.1.jar" SelfReg="false"/>
<ROW File="commonsio.commonsio2.8.0.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="COMMON~1.JAR|commons-io.commons-io-2.8.0.jar" Attributes="0" SourcePath="programfiles\commons-io.commons-io-2.8.0.jar" SelfReg="false"/>
<ROW File="io.github.mkpaz.atlantafxbase1.0.0.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="IOGITH~1.JAR|io.github.mkpaz.atlantafx-base-1.0.0.jar" Attributes="0" SourcePath="programfiles\io.github.mkpaz.atlantafx-base-1.0.0.jar" SelfReg="false"/>
<ROW File="org.kordamp.ikonli.ikonlicore12.3.1.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGKOR~1.JAR|org.kordamp.ikonli.ikonli-core-12.3.1.jar" Attributes="0" SourcePath="programfiles\org.kordamp.ikonli.ikonli-core-12.3.1.jar" SelfReg="false"/>
<ROW File="org.kordamp.ikonli.ikonlifontawesome5pack12.3.1.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGKOR~2.JAR|org.kordamp.ikonli.ikonli-fontawesome5-pack-12.3.1.jar" Attributes="0" SourcePath="programfiles\org.kordamp.ikonli.ikonli-fontawesome5-pack-12.3.1.jar" SelfReg="false"/>
<ROW File="org.kordamp.ikonli.ikonlijavafx12.3.1.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGKOR~3.JAR|org.kordamp.ikonli.ikonli-javafx-12.3.1.jar" Attributes="0" SourcePath="programfiles\org.kordamp.ikonli.ikonli-javafx-12.3.1.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxbase19win.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGOPE~1.JAR|org.openjfx.javafx-base-19-win.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-base-19-win.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxbase19.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGOPE~2.JAR|org.openjfx.javafx-base-19.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-base-19.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxcontrols19win.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGOPE~3.JAR|org.openjfx.javafx-controls-19-win.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-controls-19-win.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxcontrols19.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGOPE~4.JAR|org.openjfx.javafx-controls-19.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-controls-19.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxgraphics19win.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGOPE~5.JAR|org.openjfx.javafx-graphics-19-win.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-graphics-19-win.jar" SelfReg="false"/>
<ROW File="org.openjfx.javafxgraphics19.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGOPE~6.JAR|org.openjfx.javafx-graphics-19.jar" Attributes="0" SourcePath="programfiles\org.openjfx.javafx-graphics-19.jar" SelfReg="false"/>
<ROW File="org.scalalang.scalalibrary2.13.9.jar" Component_="app.logorrr.app23.2.1SNAPSHOT.jar" FileName="ORGSCA~1.JAR|org.scala-lang.scala-library-2.13.9.jar" Attributes="0" SourcePath="programfiles\org.scala-lang.scala-library-2.13.9.jar" SelfReg="false"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.AiPersistentPropComponent">
<ROW Property="AI_INSTALLPERUSER" Registry="AI_INSTALLPERUSER" HklmSearch="AI_INSTALLPERUSER" HkcuSearch="AI_INSTALLPERUSER_1" Hklm64Search="AI_INSTALLPERUSER_2" Hkcu64Search="AI_INSTALLPERUSER_3"/>
Expand Down Expand Up @@ -192,7 +192,7 @@
<ROW Feature_="MainFeature" Component_="APPDIR"/>
<ROW Feature_="MainFeature" Component_="ProductInformation"/>
<ROW Feature_="MainFeature" Component_="jre64"/>
<ROW Feature_="MainFeature" Component_="app.logorrr.app23.2.0SNAPSHOT.jar"/>
<ROW Feature_="MainFeature" Component_="app.logorrr.app23.2.1SNAPSHOT.jar"/>
<ROW Feature_="MainFeature" Component_="AI_ExePath"/>
<ROW Feature_="MainFeature" Component_="LogoRRR.exe"/>
<ROW Feature_="MainFeature" Component_="AI_INSTALLPERUSER"/>
Expand Down
4 changes: 2 additions & 2 deletions dist/dist-win/installer-win/src/main/ai/logorrr-installer.aip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ROW Property="ProductCode" Value="1033:{aaaaaaaa-bbbb-cccc-dddd-ffffffffffff} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="LogoRRR"/>
<ROW Property="ProductVersion" Value="23.2.0"/>
<ROW Property="ProductVersion" Value="23.2.1"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
<ROW Property="UpgradeCode" Value="{F1B5A00B-1BA8-4E26-883D-04A6429DCAAA}"/>
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
Expand Down Expand Up @@ -66,7 +66,7 @@
<ROW Action="AI_DetectSoftware" Sequence="151"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
<ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="." Languages="en" InstallationType="2" CabsLocation="1" CompressCabs="false" UseLzma="true" LzmaMethod="2" LzmaCompressionLevel="2" PackageType="1" FilesInsideExe="true" ExeIconPath="logorrr-icon-128.ico" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" Options="8" UseLargeSchema="true" ExeName="LogoRRR-23.2.0-installer" MsiPackageType="x64"/>
<ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="." Languages="en" InstallationType="2" CabsLocation="1" CompressCabs="false" UseLzma="true" LzmaMethod="2" LzmaCompressionLevel="2" PackageType="1" FilesInsideExe="true" ExeIconPath="logorrr-icon-128.ico" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" Options="8" UseLargeSchema="true" ExeName="LogoRRR-23.2.1-installer" MsiPackageType="x64"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
<ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
Expand Down

0 comments on commit 167bda0

Please sign in to comment.