From 2ca578b7077d69ce9617aefed06949b0f509debe Mon Sep 17 00:00:00 2001 From: Bane Stojkovic Date: Thu, 27 Mar 2025 18:20:46 +0100 Subject: [PATCH 1/4] update win exes --- diylc/diylc-swing/deploy/win/diylc-x64.exe | Bin 120832 -> 120832 bytes diylc/diylc-swing/deploy/win/diylc-x86.exe | Bin 120832 -> 120832 bytes diylc/diylc-swing/deploy/win/launch4j-x64.xml | 5 ++--- diylc/diylc-swing/deploy/win/launch4j-x86.xml | 7 +++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/diylc/diylc-swing/deploy/win/diylc-x64.exe b/diylc/diylc-swing/deploy/win/diylc-x64.exe index bed47d6fd597469c8c063db7c4b667982e9a5657..3443d89d7f08bd379b1a252d5f95e951b7b60755 100644 GIT binary patch delta 950 zcmZvaKS%;m9LIn6tQ3oCNHRolC~(tE!!@TM14ozsETuuw(qItW4G~5|+6}oiw797` zz$91%fzHMYO^2(0p>boO>i+Lwo)YpalRPKnk0yCV$p1|8x{&)?gZ? zux{W19uWPg&yV2&;rR-DQSb&lB)InmUqJ8-JSzBU`LJzyzf@|H$2#v11QFd{*Q7P3 HHkkh(aT2C- delta 995 zcmZ{iKS)AR6vofHuTn}0;PC^8YE=5G8LQ&9C5xh4<2rY?0Z80;Mw2)-TLYW6p=_}pbDD7OV9#lz;D7 zo$CTF=YBr^B}z%8@ujDr7u3N~FbDd;DmVr{gOgw#^n--{r-1+%1S8-fm;{fALUe!! zexh?w0W%=bK5)_W$DIu>^)=WTMAFV1>aRcOT&D>2;()p?)ISE)3qpOY*}wmjP+uKT zuM72)X7AwnfbZ>d_xxZlesbVNqRTx#l}_Yhj0&@sVVEiSxa|#vk%Dzrq>dTQty@N< z6`4vywv%3D)a|dGy@q!$O4~E=H1Dz-trDYQOF(y-(UjmJxVT>!&ToMgE9HGg9?QT@ xyde5EJSNmN_@dxdctY?7oZlWRQkCV_#QW`TO$y7=NNfT5yR({f!;A)t`~ilspb7v0 delta 947 zcmZ{ize_?<6vxlKuhM={K}m%~1_f@RWw=&LLy<#+Q-x3|6f`tA1n*5HL{vEBpWx;z zhZ=%vi>3wzA%bdZD?!Dv@74EsSKsTv{&tE3?bD z055!{KlyBafvJoY@=tuJEC!@qmGRzZP8uPEo~eYq;I7a_jHrXC&YMd3xr)c;k1CeG zS@o#x^TU>J)Ey9&X^W92N+&@#cmei-S+E~`1P8zpI0*iN!=M}c^?*Kb3=D%_FamB9 zO;H>_J4m3qCRWUVaZm?=#zD`k_Jc&Njiw(Q{G{anIQSXKpQzdE-%0+OgI|(-wPwG_ zy5+Yt$c-i$=W5B1{*(7RM+UMk7G+i_!$EnMbbO&vmuaUjasho_L*GN2Kz^>S)5&mmVJ*EKXphqOV z0xhji5omdVb!hQ?%s6Npe<&t&nl5+*9h9^VJum5R=#Zp+H@E>wr}EwPp?7635xeph P*`yK*1aFs$?2P{bKxUFN diff --git a/diylc/diylc-swing/deploy/win/launch4j-x64.xml b/diylc/diylc-swing/deploy/win/launch4j-x64.xml index d2740d62..fdd4169a 100644 --- a/diylc/diylc-swing/deploy/win/launch4j-x64.xml +++ b/diylc/diylc-swing/deploy/win/launch4j-x64.xml @@ -3,7 +3,7 @@ true gui diylc.jar - C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\deploy\diylc-x64.exe + C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\deploy\win\diylc-x64.exe . @@ -13,10 +13,9 @@ false false - C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\icons\diylc.ico + C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\src\main\resources\icons\diylc.ico org.diylc.DIYLCStarter - lib jre17 diff --git a/diylc/diylc-swing/deploy/win/launch4j-x86.xml b/diylc/diylc-swing/deploy/win/launch4j-x86.xml index 243dcffa..c6bba702 100644 --- a/diylc/diylc-swing/deploy/win/launch4j-x86.xml +++ b/diylc/diylc-swing/deploy/win/launch4j-x86.xml @@ -3,7 +3,7 @@ true gui diylc.jar - C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\deploy\diylc-x86.exe + C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\deploy\win\diylc-x86.exe . @@ -13,10 +13,9 @@ false false - C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\icons\diylc.ico + C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc\diylc-swing\src\main\resources\icons\diylc.ico org.diylc.DIYLCStarter - lib jre17 @@ -24,7 +23,7 @@ false 17 - 512 + 1024 2048 -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 From 8de5b24809fa2ea27bf3e4f75279b05b3a8797e5 Mon Sep 17 00:00:00 2001 From: Bane Stojkovic Date: Thu, 27 Mar 2025 18:26:52 +0100 Subject: [PATCH 2/4] fix exes --- diylc/diylc-swing/deploy/win/diylc-x64.exe | Bin 120832 -> 120832 bytes diylc/diylc-swing/deploy/win/diylc-x86.exe | Bin 120832 -> 120832 bytes diylc/diylc-swing/deploy/win/launch4j-x64.xml | 1 - diylc/diylc-swing/deploy/win/launch4j-x86.xml | 1 - 4 files changed, 2 deletions(-) diff --git a/diylc/diylc-swing/deploy/win/diylc-x64.exe b/diylc/diylc-swing/deploy/win/diylc-x64.exe index 3443d89d7f08bd379b1a252d5f95e951b7b60755..8e123968cbaca709e85e26706c857dc5b27eb6cf 100644 GIT binary patch delta 614 zcmZqJz}~QdeL@G5RoBEWKjuj<87JO0WIFI@@3uPivg&%8&Hx6C3=Av`3_qA4JfL*l7cmTJ31+zTIxNx_2PQNMV3yBNGD`j02=4fP8Tzz5$RAbplw_1jv^}k`Dm#S&{e=X#4~;e#S;7I|d^p v4Re4B%#iq3fP7OVKF=m5h72Tr$!5zRJ8y3nxWXvGxLxfk<1MDi3XC!U0L5;D delta 639 zcmZqJz}~QdeL@G*q>hPQe$1D+m?qvfWV-Wc@3uPin$+<$odFCO85md?7=AE8ctGj8FJc(d63lSvby%b=5YqR)v|;G>KuFhp#WXwv zA-xWZbO%EE9v0~p2x-1=n1-J~NZVnNeu0qA!y?TA3>pvs2FpAw(i#ZqbKk^3Vf*ac zwEA>lkivk*MkWR>7zaq30Qurbd>IAT80FW<8`m?7~$0Qsg!e2q;^3>irL37ai{?7S_Ll~|UTn4X$fVwIDbq@R^oq??nUn37tg T2V`#laG6nxaXZgd#v4ok^yGr| diff --git a/diylc/diylc-swing/deploy/win/diylc-x86.exe b/diylc/diylc-swing/deploy/win/diylc-x86.exe index 011599abca094ad8c4b38f391a1823db866fde3d..de79e9b4c5dd68b03e4c7446d3e44c1731a0cd09 100644 GIT binary patch delta 574 zcmZqJz}~QdeL@FQNY}(JKjuI887JO0Wa@Y{`5}|>W=F<)M#hfK2br8dG6i={X8WQB zqV&F)Nd%y8ZJzSM#2i2I6Zhy_Ab z9~S8dg!Dcv(iI5lcUYunAf)BKVcNX|A?=4n`UXO}4vX{;g!H;^Vj%w=`!=oK6Bu+b zaAyM(0~d?~q+bB};z)dkjZ6$sL%^aeK)xiByaJHVip1AI;~N0^Mo9808=3SN%#Z}; n02P=b@vi{+8AyDa&741W-roM;GNT0J_HS1hxtJ#_FvW=F<)M#d$Z4>CD_1j3vwFD-hD}ut?89NXvc0w0j3a+7FBL4TN+Z7U>@d>2=@4K>j=SZCZUgFz8_5 z#|9<_E*J+$vutEy5J%$60Qpcuz@iF3z9f>o4Uo@@#CJjC`vCbyNb(IEne-UUkOX!B z6__INKLGg|Nc@P+oIiHnmdQ#iOH52p%`36W$xPDEN-WaN$xlp4Ez$!rw;#C7D8;z_ J&J{)uW&ndXgVq25 diff --git a/diylc/diylc-swing/deploy/win/launch4j-x64.xml b/diylc/diylc-swing/deploy/win/launch4j-x64.xml index fdd4169a..3449463d 100644 --- a/diylc/diylc-swing/deploy/win/launch4j-x64.xml +++ b/diylc/diylc-swing/deploy/win/launch4j-x64.xml @@ -27,7 +27,6 @@ 4096 -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 - -javaagent:lib/jar-loader.jar --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED diff --git a/diylc/diylc-swing/deploy/win/launch4j-x86.xml b/diylc/diylc-swing/deploy/win/launch4j-x86.xml index c6bba702..8689e2b4 100644 --- a/diylc/diylc-swing/deploy/win/launch4j-x86.xml +++ b/diylc/diylc-swing/deploy/win/launch4j-x86.xml @@ -27,7 +27,6 @@ 2048 -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 - -javaagent:lib/jar-loader.jar --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED From 0fb0502dea974ad7e14872f281f9d64f0520ac51 Mon Sep 17 00:00:00 2001 From: Bane Stojkovic Date: Wed, 26 Mar 2025 18:03:06 +0100 Subject: [PATCH 3/4] build updates --- diylc/diylc-swing/deploy/universal-zip.xml | 7 ++ diylc/diylc-swing/pom.xml | 93 ++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/diylc/diylc-swing/deploy/universal-zip.xml b/diylc/diylc-swing/deploy/universal-zip.xml index 4fe6f068..dea53d69 100644 --- a/diylc/diylc-swing/deploy/universal-zip.xml +++ b/diylc/diylc-swing/deploy/universal-zip.xml @@ -29,5 +29,12 @@ 755 + + ${project.basedir}/src/main/resources + / + + icons/** + + diff --git a/diylc/diylc-swing/pom.xml b/diylc/diylc-swing/pom.xml index ec9dac10..38942838 100644 --- a/diylc/diylc-swing/pom.xml +++ b/diylc/diylc-swing/pom.xml @@ -586,6 +586,99 @@ + + win64-zip + + 17.0.14+7 + 17.0.14_7 + OpenJDK17U-jre_x64_windows_hotspot_${jdk.version.file}.zip + https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${jdk.version}/${jdk.archive.win64} + ${project.build.directory}/jre_win + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + download-extract-jre + package + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + create-zip-package + package + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mac-x86 From e3ff80532d06e451f03389732ea93c1753d2cd47 Mon Sep 17 00:00:00 2001 From: Bane Stojkovic Date: Thu, 27 Mar 2025 19:25:32 +0100 Subject: [PATCH 4/4] fix windows --- diylc/diylc-core/pom.xml | 2 +- .../diylc-core/src/main/resources/update.xml | 20 +++++++++++++++++++ diylc/diylc-library/pom.xml | 2 +- diylc/diylc-swing/pom.xml | 2 +- diylc/pom.xml | 2 +- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/diylc/diylc-core/pom.xml b/diylc/diylc-core/pom.xml index 77b60fe1..05628b21 100644 --- a/diylc/diylc-core/pom.xml +++ b/diylc/diylc-core/pom.xml @@ -7,7 +7,7 @@ org.diylc diylc-parent - 5.1.0 + 5.1.1 diylc-core diff --git a/diylc/diylc-core/src/main/resources/update.xml b/diylc/diylc-core/src/main/resources/update.xml index f92802c0..52d8b0a9 100644 --- a/diylc/diylc-core/src/main/resources/update.xml +++ b/diylc/diylc-core/src/main/resources/update.xml @@ -296,5 +296,25 @@ https://github.com/bancika/diy-layout-creator/releases + + + 5 + 1 + 1 + + 2025-03-27 00:00:00.000 CET + + + + IMPROVEMENT + Include windows ZIP package + + + BUG_FIX + Windows version doesn't start in some cases + + + https://github.com/bancika/diy-layout-creator/releases + diff --git a/diylc/diylc-library/pom.xml b/diylc/diylc-library/pom.xml index 02add0dc..2abd9148 100644 --- a/diylc/diylc-library/pom.xml +++ b/diylc/diylc-library/pom.xml @@ -7,7 +7,7 @@ org.diylc diylc-parent - 5.1.0 + 5.1.1 diylc-library diff --git a/diylc/diylc-swing/pom.xml b/diylc/diylc-swing/pom.xml index 38942838..9b8dfd5f 100644 --- a/diylc/diylc-swing/pom.xml +++ b/diylc/diylc-swing/pom.xml @@ -7,7 +7,7 @@ org.diylc diylc-parent - 5.1.0 + 5.1.1 diylc-swing diff --git a/diylc/pom.xml b/diylc/pom.xml index 8f852003..7a9f9312 100644 --- a/diylc/pom.xml +++ b/diylc/pom.xml @@ -6,7 +6,7 @@ org.diylc diylc-parent - 5.1.0 + 5.1.1 pom DIY Layout Creator