From 43a44d11ba7bf5136f2491597b2f7f2c08a7350c Mon Sep 17 00:00:00 2001 From: Michel Mastriani Date: Mon, 13 May 2019 22:27:52 -0300 Subject: [PATCH 1/2] linux bench --- archive/build_linux.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/archive/build_linux.sh b/archive/build_linux.sh index 3ed93fe..b2185ea 100755 --- a/archive/build_linux.sh +++ b/archive/build_linux.sh @@ -11,7 +11,7 @@ FRACTORIUM_PACKAGE=$BUILD_PATH/../Bin/Fractorium FRACTORIUM_RPM_PACKAGE=$BUILD_PATH/../Bin/rpmbuild EXTRA_LIBS=/usr/lib/x86_64-linux-gnu -# replace 5.12.2 by your QT version, and check if the bin path is the same +# replace 5.11.2 by your QT version, and check if the instation path is the same QT_PATH=/home/$USER/Dev/Qt/5.11.2/gcc_64/bin LINUX_DEPLOY_QT=/home/$USER/Dev/linuxdeployqt-6-x86_64.AppImage @@ -127,7 +127,7 @@ mkdir Fractorium mkdir -p Fractorium/DEBIAN mkdir -p Fractorium/usr/bin mkdir -p Fractorium/usr/share/applications -mkdir -p Fractorium/usr/share/fractorium +mkdir -p Fractorium/usr/share/fractorium/bench cp Fractorium-x86_64.AppImage Fractorium/usr/bin @@ -137,6 +137,8 @@ cp $ICON_PATH/Fractorium.png Fractorium/usr/share/fractorium/fractorium.png cp $DATA_PATH/control.package Fractorium/DEBIAN/control +cp $DATA_PATH/Bench/* Fractorium/usr/share/fractorium/bench + #creating symbolic links cd ./Fractorium/usr/bin @@ -197,6 +199,10 @@ cd Fractorium create_symlinks +mkdir bench + +cp $DATA_PATH/Bench/* bench + cd ../ tar -czvf Fractorium-$emberVersion.x86_64.AppImage.tar.gz Fractorium @@ -206,4 +212,3 @@ rm -rf Fractorium rm -rf Fractorium.AppDir rm -rf rpmbuild rm -rf Fractorium-x86_64.AppImage - From 833f98366b2608706691a2305a634adafd51ef5d Mon Sep 17 00:00:00 2001 From: Michel Mastriani Date: Mon, 13 May 2019 22:30:07 -0300 Subject: [PATCH 2/2] linux bench --- Data/Fractorium.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Data/Fractorium.spec b/Data/Fractorium.spec index e2ca1a8..155b515 100644 --- a/Data/Fractorium.spec +++ b/Data/Fractorium.spec @@ -37,5 +37,13 @@ http://mfeemster.deviantart.com/ %attr(0644, root, root) "/usr/share/applications/fractorium.desktop" %attr(0644, root, root) "/usr/share/fractorium/fractorium.png" +#bench files +%attr(0644, root, root) "/usr/share/fractorium/bench/EmberBench.ps1" +%attr(0644, root, root) "/usr/share/fractorium/bench/golubaja_rippingfrominside_complexcode.flame" +%attr(0644, root, root) "/usr/share/fractorium/bench/mfeemster_basicmemory.flame" +%attr(0644, root, root) "/usr/share/fractorium/bench/tatasz_springcrown_manysimplexforms.flame" +%attr(0644, root, root) "/usr/share/fractorium/bench/tyrantwave_flippeddisc_normal.flame" +%attr(0644, root, root) "/usr/share/fractorium/bench/zy0rg_six_bigcomplexcode.flame" + %changelog