From a2a9bd16faf7f0f9a2a1cd25238ab29c33bb0336 Mon Sep 17 00:00:00 2001 From: Albert Liu <45282415+ggrtk@users.noreply.github.com> Date: Mon, 13 Apr 2020 21:22:32 -0700 Subject: [PATCH 1/5] AppImage: Add script for generating AppImages with desktop integration --- appimage/duckstation-qt.desktop | 10 +++ appimage/duckstation-sdl.desktop | 10 +++ appimage/generate-appimages.sh | 63 ++++++++++++++++++ appimage/icon-16px.png | Bin 0 -> 643 bytes appimage/icon-32px.png | Bin 0 -> 1389 bytes .../{duckstation-icon.png => icon-48px.png} | Bin appimage/icon-64px.png | Bin 0 -> 3115 bytes 7 files changed, 83 insertions(+) create mode 100644 appimage/duckstation-qt.desktop create mode 100644 appimage/duckstation-sdl.desktop create mode 100755 appimage/generate-appimages.sh create mode 100644 appimage/icon-16px.png create mode 100644 appimage/icon-32px.png rename appimage/{duckstation-icon.png => icon-48px.png} (100%) create mode 100644 appimage/icon-64px.png diff --git a/appimage/duckstation-qt.desktop b/appimage/duckstation-qt.desktop new file mode 100644 index 000000000..e1dfea5f3 --- /dev/null +++ b/appimage/duckstation-qt.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=DuckStation Qt +GenericName=PlayStation 1 Emulator +Comment=Fast-ish PlayStation 1 emulator +Icon=duckstation-qt +TryExec=duckstation-qt +Exec=duckstation-qt %f +Terminal=true +Categories=Game;Emulator;Qt; diff --git a/appimage/duckstation-sdl.desktop b/appimage/duckstation-sdl.desktop new file mode 100644 index 000000000..6c5983bd4 --- /dev/null +++ b/appimage/duckstation-sdl.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=DuckStation SDL +GenericName=PlayStation 1 Emulator +Comment=Fast-ish PlayStation 1 emulator +Icon=duckstation-sdl +TryExec=duckstation-sdl +Exec=duckstation-sdl %f +Terminal=true +Categories=Game;Emulator; diff --git a/appimage/generate-appimages.sh b/appimage/generate-appimages.sh new file mode 100755 index 000000000..d3cfc31fa --- /dev/null +++ b/appimage/generate-appimages.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +function get_tools_and_plugins() { + wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage + chmod a+x linuxdeploy-x86_64.AppImage + wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage + chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage +} + +# NOTE: Keep this script in the same directory as resources for AppImage creation +APPIMAGE_RESOURCES_DIR=$(dirname $(readlink -f $0)) +echo "APPIMAGE_RESOURCES_DIR set to ${APPIMAGE_RESOURCES_DIR}" + +if [[ "$#" -ne 1 ]]; then + echo "Wrong number of arguments (\$# = $# args) provided." + echo "Usage: create-appimage.sh " + exit 1 +else + BUILD_DIR=$1 + echo "BUILD_DIR set to ${BUILD_DIR}" +fi + +# Acquire linuxdeploy and linuxdeploy-plugin-qt +get_tools_and_plugins + +# Copy icons into the /. directory structure that linuxdeploy nominally expects, +# e.g. 16x16/duckstation-qt.png, 32x32/duckstation-qt.png, etc. +FRONTENDS=("qt" "sdl") +ICONS_QT=() +ICONS_SDL=() + +ICON_PNG_RESOLUTIONS=($(seq 16 16 64)) # 16, 32, 48, 64 +for res in ${ICON_PNG_RESOLUTIONS[@]}; do + mkdir -p ${BUILD_DIR}/AppImage-icons/${res}x${res} + for frontend in ${FRONTENDS[@]}; do + # Copy icon to proper directory + cp ${APPIMAGE_RESOURCES_DIR}/icon-${res}px.png ${BUILD_DIR}/AppImage-icons/${res}x${res}/duckstation-${frontend}.png + # Append icon filepath to array that will later be passed to linuxdeploy + eval "ICONS_${frontend^^}+=(${BUILD_DIR}/AppImage-icons/${res}x${res}/duckstation-${frontend}.png)" + done +done + +# Outputted file from linuxdeploy is named based on the .desktop file Name key; +# We rename it to something generic that buildbot or CI scripts can modify +# as they wish outside of this script, e.g. to distinguish between Release or +# Debug builds, since we don't have awareness of that inside this script + +./linuxdeploy-x86_64.AppImage --appdir=./AppDir-duckstation-qt \ + --executable=${BUILD_DIR}/src/duckstation-qt/duckstation-qt \ + --desktop-file=${APPIMAGE_RESOURCES_DIR}/duckstation-qt.desktop \ + ${ICONS_QT[@]/#/--icon-file=} \ + --plugin=qt \ + --output=appimage \ + && mv DuckStation_Qt*.AppImage duckstation-qt-x64.AppImage + +./linuxdeploy-x86_64.AppImage --appdir=./AppDir-duckstation-sdl \ + --executable=${BUILD_DIR}/src/duckstation-sdl/duckstation-sdl \ + --desktop-file=${APPIMAGE_RESOURCES_DIR}/duckstation-sdl.desktop \ + ${ICONS_SDL[@]/#/--icon-file=} \ + --output=appimage \ + && mv DuckStation_SDL*.AppImage duckstation-sdl-x64.AppImage + +# Resulting AppImage files will be located in the directory this script is called from diff --git a/appimage/icon-16px.png b/appimage/icon-16px.png new file mode 100644 index 0000000000000000000000000000000000000000..628d7afb186531bcb05e475f5a281589fa831215 GIT binary patch literal 643 zcmV-}0(||6P)o7fp;4 z660VP*l=e&!L5W0B+E5g$NT9TN?V~*Cd%X_O0;Oj<_nhDT z&ON^?*c0*tM@1Ja<#PlVDnoz|hf#46i;7T6i9JCSlO-8p6hOYE7nRSz6W}2#arvHG zl>kvnj6p1|6H{;FM_~?23)6?(?eC}yIJ^*77&!2PT9pw@R)MgZ;?loKgp&gbz!u<; zBZFX*;9jN+V10yorH8A!N;4KH0=#)xd;|VQINSze9p6k!!PYc4Z0`5KlOddma!zK+ zu`|{00=Ix{5?24fw`Gm!f{yMkI#o^dtm64OfzODMN1+H1(zbiAXAfa+s0<%jrzKJ7 zltXkK0MsZ@tHRnWp5Jj4yAjh<1G)k?+bsgq7WO9~Mu05ON4DQ(qOP$;E} zekfKcS`BTrg`!juv5HzKRuQp_f?pKHY8%@R8l@&_W1uZ!*U%+o(lwdMIy0GO)_46d znK+YW@)G)o3-4XdJ?F={=bZQ8E=V@9P`0paHfNP7oi?*dHc>E5V5e+h7b<5Ew8-Ne zl`T}v1VBu1+R6iH>;awzh7jx`kIzIE(J>o|LMtyI*$otpa}hzmVFbX$AXavZWqbl4Pp|^X=Rox|zHcMg$x^-%0&Oaz30I(;#c}-z##n%U3`8;D z!p6|>I}~e;v=OC=7}dmJnpH-W{rtr_*@#;=fKer3NkDHC7UGz20s@ouL3RdCP$z?c z-W4Ls0Q0#s0|4L$myv{`pkW6Tx*28%HeSo|g69wfu1;|>C4ofXrxz0mtSCfu1BiWW zRl%KGz$NBzgAk=iN&w6X*i`5{4_yrq=^y7o04jclfIb`;fSfF#fMNWGY^96@n=FDF zViN)L3=m3y7Kd9cV75c)W1!>!0bm5jn6U*SaWEUF2FM5y`GDu;FztkSl@Sz1U~G*h z(V&1M4LcHqt|O4RHflGjKmyi(WoFl}&a4^805Emq^fq9N_2SP6o(2HmG=e&zfiu-L zENJtT;Id`6%S^FEIufWi{=ngDBO&GFgG2$G<1bG_!x@Dw2c2Ms0+-;xMjvlHIWz+R zV2%P76^46IJ%_RTFLMW#*m%2K6^!EwaNEzhbPTz`0%fYk6T>5L0=P)6ZUBIMBZ$!y z_g}=)br@qbKrp>zg-8};x?Zf)IQa54xD2!b13(D4#%5X1pK>Erx&VvakT)`x3 z0atP_KP?L};Ou2+>jD1&5Ewuz1q$*agJ6%3DpQki@PFxsH@J$_L&R>duB74K6! zS#X#p0|0hIa;in9`l1_vDTdAC?Hr?>W7+&?%|J?dS!Vg@=X%!41km^%!A>BYzMUFQ z6J!D`6L#YW4xsUk9)L;NCHJ{@(c*H)wznF=J%XOW_W?@sO@=g%~bCBD|{S63GRgyRIycS;=HggHd}fz$izWA-IWN^%T^*UxpkPxj0W-S*7!4c$^! z==BLY=0HlmNTOLv<`YH>#fl;YYN)eg?e=1;*TaIwy=XoC)}BP%8n!u$p-(r!WX(0H z))(@MG#Kp0no6}uy-`u=``gy1mNQto2ygW&6ro&-qkg#j_s-3_qcejHxC#mjMR0I# z$MFt)?uRJ!b(3T8K-t4rQN;GAzWDLzOaiB*y9V6Ny>+2`7i}rdbA)A=7hi9Hg!fi+ vaKN>A!@6~|3O;MKu37kP)0&!d5SB-`@Ly!U?ZJHPq8-#g%c9Pw=%kV3Xo2RsPO!Qd{jn2krH z-EUn0DN$I*wMd=bY>xO z=BOn>1s&o7&dhdON(AfpA(E$oX~mlh6d<@Al)MjgP`&qU9C|+kBq8HRVE~DPDyp)T zm+P2IJL{0VM(LeT*?b)a+hjZU$}e-g7@L*l#39ftlZdYOsp)CMFik?%4I*e5B&flI zKtoS2C)Y7Wwy_+OPk?huF>)O0kUT+v4%xks%GWA4>(cpNeDA=n5k0&pu(sY0|DcE1UO+ikUG z55WKdR04PrKt=IY5k3r@VL0|#{^x`6%rK=uFp3d1C1pwq4YEf8<;Fm6NV%RIE2&mN{n9RHv>W0u8 zF!5CIw!(;83#^YRfI^a*aV^j4cZHGH1EfTe?Ocya=Wq^RaOPFx04>Lx>irz{ybXE? zt7BoH2P@MYkKy6wjlbjKi`_BK-j03-vT?SkT#IshwD zJRw%{#CQ+bo(!d^(O}Skq>XG~{|;Q522-aKQ@U|sW(r>Kg#GdCVN#(f zzX0mcnZ@^Dd;toMoC5F_AX_pCySL*u=OLLwhR@|nj)W7!1Mqntd=!SL-4x72gjN#F zVFFdTy}YQQqe=x=fp0{*uyz3Fk+F)Lb%aTu>q`hnVSNBT*R4@8D=rcoON?Wwq!}kR zMw+4*lj@7zj_?5sfZ2@9=QBna0k~n}$Ok=(}QRkwrn$z#z>y@!+Nj z>*JPe!C+}FbBY$AG(AJd3{z?;CP@B)UTnoYxtT6sAFWwy}B9Z zJ^;O+LFY=$p@5}T(x58nME58NT)-5P2v(r;fVhudJ0_GQfJ3odcd)eih}F^4pk^AF zUM%m(5@RNw4)rq$eQ-06BYB9_lBgSKpbaN?h&$O*NYf>+)Z5AHZ6QF+1hs{n*@@yr zUbKZL(P;tJAvnZjt{1;zaiN`u5Wf+Q zOy6Mr7RW7t;5MuoxGmfYcnWc44YD7s83#!xf@=yWk(b=7!oTG+v7GaO%Yj{XDy-KE zc%gN6ALJ0Q6gRWQ>HNcXDI3`O1jKUQ#luWsDdb)VbtvGq;{|T)?CYDrpMVp^9G(<2 zN#rX~D21OCy^SVJ9!GHPc;yX-SB}zhwhT}H_oV2L=Rd}ji)QFQo` zH*+Qm%Yd`9-S5{&?+A|)pc00USY`!!m| zj<6W{oh9j!ItK3pj{_eUzTZ$RB@KfDq*%^Mq8yLlVbb<>#qi0p5#+D{UPdQ95_&#` zu1DC+`=qwSkJ`Xk)`sLQv_vA}!^$c-aw4=l4sjEjF9x+5(wD^|`-ptCl5qbvCQtX! z-crRvJbXz55|!O({7k&So^skama-;7;zf4s+^($c-KC)qS-l*!BV0|Y^ZWG>OFnvl z%KmNm1guvph%k+{G;uO2vw-iCn#heX@{t&T)+ zpK@M2QGPp9l)N4=7AcT{gh4Wu1QU==ftM zgSts%pWnS9JmL5gOyhX4cB6(&X+LKykg_YQOW6}lWM8<}wTg-re|~wHp%`0$i+ko? z#)g}JO?UGdG`KaID>W+A!*O{)H`x_QGKgzNx$R6*_F4E96J!$-A6Ba4JhqaUs-T9Z zP1-4^C>J};p|g6ut%?*@(^63ho-m&St@Ekbx0NYo1OLIipgwl{t>$;&d(@c*ZB#}>t1Cr zX%1*pTP|Jj>Zc!-+s1Ut9s@j@;)^Ctq+~KM`Lk#>C!&m+^%_#4Y4dyRz9dtC;ED6s z49qxd$qiRu-2s7eo0mb^1*menXE(?M{A%3YBRd4Yw*lN`jwlXX{=cjxC)CX`-7W zfii;RVUmeiHy-8A!x8X+3t!(n0G!%>#q9asLp^_Q)`Am4x=ByWI$Uf5eKCW6Jqhr- zRF%7Ky6UQ~a@%2-BR=U^f5q(kC-m%i*l8rx-imrcy$4Y>r^zub&n$jt>pe%h{d^pi zS(m)>O7+v|zgL-|{>2HGXH#Wx()n{YZ!UE!<^Pm}{{jZ~+TobFczgf=002ovPDHLk FV1laW%?SVi literal 0 HcmV?d00001 From ccddb4456b595901cab83813c5ce86016ba62b4a Mon Sep 17 00:00:00 2001 From: Albert Liu <45282415+ggrtk@users.noreply.github.com> Date: Mon, 13 Apr 2020 21:36:39 -0700 Subject: [PATCH 2/5] CI: Use AppImage generation script for Linux build --- appveyor.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 31f169005..d9dd7e694 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -54,25 +54,23 @@ build_script: ninja - wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage + ../appimage/generate-appimages.sh $(pwd) - wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage + if [ $? -eq 0 ]; then - chmod +x linuxdeploy-x86_64.AppImage + mv duckstation-qt-x64.AppImage duckstation-qt-x64-release.AppImage - chmod +x linuxdeploy-plugin-qt-x86_64.AppImage + mv duckstation-sdl-x64.AppImage duckstation-sdl-x64-release.AppImage - cp ../appimage/duckstation-icon.png ../appimage/duckstation-qt.png + 7za a -r duckstation-linux-x64-release.7z duckstation-*.AppImage - cp ../appimage/duckstation-icon.png ../appimage/duckstation-sdl.png + appveyor PushArtifact duckstation-linux-x64-release.7z - ./linuxdeploy-x86_64.AppImage --appdir=./AppDir-duckstation-qt --executable=./src/duckstation-qt/duckstation-qt --create-desktop-file --icon-file=../appimage/duckstation-qt.png --plugin=qt --output=appimage + else - ./linuxdeploy-x86_64.AppImage --appdir=./AppDir-duckstation-sdl --executable=./src/duckstation-sdl/duckstation-sdl --create-desktop-file --icon-file=../appimage/duckstation-sdl.png --output=appimage + echo "Failed to create AppImages, no AppImage artifact will be pushed" - 7za a -r duckstation-linux-x64-release.7z duckstation-*.AppImage - - appveyor PushArtifact duckstation-linux-x64-release.7z + fi elif [ "$APPVEYOR_BUILD_WORKER_IMAGE" == "macOS" ]; then From f265ce281536dee637bc01979121c7aa3d453b62 Mon Sep 17 00:00:00 2001 From: Albert Liu <45282415+ggrtk@users.noreply.github.com> Date: Mon, 13 Apr 2020 22:12:42 -0700 Subject: [PATCH 3/5] gitignore: Update build folder ignores Might as well include the build folder naming pattern used by the README --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 75cb0886b..e39a3bd3d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /bin/ /Build/ /build/ +/build-*/ # vs stuff .vs From a8e224d504fcbf2cd699af9aa21e127759ae0bac Mon Sep 17 00:00:00 2001 From: Albert Liu <45282415+ggrtk@users.noreply.github.com> Date: Tue, 14 Apr 2020 20:53:12 -0700 Subject: [PATCH 4/5] AppImage: Use timestamping to prevent wget duplicates --- appimage/generate-appimages.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/appimage/generate-appimages.sh b/appimage/generate-appimages.sh index d3cfc31fa..d43810539 100755 --- a/appimage/generate-appimages.sh +++ b/appimage/generate-appimages.sh @@ -1,12 +1,5 @@ #!/bin/bash -function get_tools_and_plugins() { - wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage - chmod a+x linuxdeploy-x86_64.AppImage - wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage - chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage -} - # NOTE: Keep this script in the same directory as resources for AppImage creation APPIMAGE_RESOURCES_DIR=$(dirname $(readlink -f $0)) echo "APPIMAGE_RESOURCES_DIR set to ${APPIMAGE_RESOURCES_DIR}" @@ -21,7 +14,10 @@ else fi # Acquire linuxdeploy and linuxdeploy-plugin-qt -get_tools_and_plugins +wget -N https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage +chmod a+x linuxdeploy-x86_64.AppImage +wget -N https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage +chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage # Copy icons into the /. directory structure that linuxdeploy nominally expects, # e.g. 16x16/duckstation-qt.png, 32x32/duckstation-qt.png, etc. From 0d84b5b9a267737944819f3feb5a71b5795db6a1 Mon Sep 17 00:00:00 2001 From: Albert Liu <45282415+ggrtk@users.noreply.github.com> Date: Tue, 14 Apr 2020 21:12:13 -0700 Subject: [PATCH 5/5] AppImage: Use user-specified build directory for linuxdeploy --- appimage/generate-appimages.sh | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/appimage/generate-appimages.sh b/appimage/generate-appimages.sh index d43810539..8c0e92a39 100755 --- a/appimage/generate-appimages.sh +++ b/appimage/generate-appimages.sh @@ -9,15 +9,18 @@ if [[ "$#" -ne 1 ]]; then echo "Usage: create-appimage.sh " exit 1 else - BUILD_DIR=$1 + BUILD_DIR=$(readlink -f $1) echo "BUILD_DIR set to ${BUILD_DIR}" fi # Acquire linuxdeploy and linuxdeploy-plugin-qt -wget -N https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -chmod a+x linuxdeploy-x86_64.AppImage -wget -N https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage -chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage +wget --timestamping --directory-prefix=${BUILD_DIR} \ + https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage +chmod a+x ${BUILD_DIR}/linuxdeploy-x86_64.AppImage + +wget --timestamping --directory-prefix=${BUILD_DIR} \ + https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage +chmod a+x ${BUILD_DIR}/linuxdeploy-plugin-qt-x86_64.AppImage # Copy icons into the /. directory structure that linuxdeploy nominally expects, # e.g. 16x16/duckstation-qt.png, 32x32/duckstation-qt.png, etc. @@ -41,19 +44,22 @@ done # as they wish outside of this script, e.g. to distinguish between Release or # Debug builds, since we don't have awareness of that inside this script -./linuxdeploy-x86_64.AppImage --appdir=./AppDir-duckstation-qt \ +${BUILD_DIR}/linuxdeploy-x86_64.AppImage \ + --appdir=${BUILD_DIR}/AppDir-duckstation-qt \ --executable=${BUILD_DIR}/src/duckstation-qt/duckstation-qt \ --desktop-file=${APPIMAGE_RESOURCES_DIR}/duckstation-qt.desktop \ ${ICONS_QT[@]/#/--icon-file=} \ --plugin=qt \ --output=appimage \ - && mv DuckStation_Qt*.AppImage duckstation-qt-x64.AppImage + && mv DuckStation_Qt*.AppImage ${BUILD_DIR}/duckstation-qt-x64.AppImage -./linuxdeploy-x86_64.AppImage --appdir=./AppDir-duckstation-sdl \ +${BUILD_DIR}/linuxdeploy-x86_64.AppImage \ + --appdir=${BUILD_DIR}/AppDir-duckstation-sdl \ --executable=${BUILD_DIR}/src/duckstation-sdl/duckstation-sdl \ --desktop-file=${APPIMAGE_RESOURCES_DIR}/duckstation-sdl.desktop \ ${ICONS_SDL[@]/#/--icon-file=} \ --output=appimage \ - && mv DuckStation_SDL*.AppImage duckstation-sdl-x64.AppImage + && mv DuckStation_SDL*.AppImage ${BUILD_DIR}/duckstation-sdl-x64.AppImage -# Resulting AppImage files will be located in the directory this script is called from +# Resulting AppImages will be created in the directory this script is called from; +# move them into the user's specified build directory