Skip to content

Commit d2d2caa

Browse files
Ho-RoHo-Ro
committed
provide setup and build scripts (for linux)
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
1 parent 995ae1a commit d2d2caa

12 files changed

+189
-134
lines changed

‎LinuxBuild

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/sh
2+
3+
# execute this script (as user) after cloning the project or pulling changes from github.com
4+
5+
if [ $(id -u) == 0 ]; then
6+
echo "This script must not be executed as root"
7+
fi
8+
9+
# prepare the build environment ..
10+
# && build the binary ..
11+
# && build packages (deb, rpm, tgz) ..
12+
# && show the results
13+
#
14+
mkdir -p build && cd build && cmake .. \
15+
&& make -j4 \
16+
&& rm -f packages/* && fakeroot make -j4 package && cd .. \
17+
&& echo && echo "Packages are available in build/packages:" && ls build/packages/openhantek*

‎LinuxSetup_AsRoot

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/sh
2+
3+
# execute this script as root to install the build dependencies
4+
5+
if [ $(id -u) != 0 ]; then
6+
echo "This script must be executed as root"
7+
exit 1
8+
fi
9+
10+
# find the appropriate package management tool and install some packages
11+
#
12+
if [ $(which apt) ]; then # install deb dependencies for Debian (as well as Ubuntu) based systems
13+
apt install g++ make cmake fakeroot qttools5-dev libfftw3-dev binutils-dev \
14+
libusb-1.0-0-dev libqt5opengl5-dev mesa-common-dev libgl1-mesa-dev libgles2-mesa-dev
15+
elif [ $(which dnf) ]; then # install rpm dependencies for Fedora based systems
16+
dnf install make cmake fakeroot gcc-c++ qt5-qtbase-gui qt5-qttools-devel qt5-qttranslations \
17+
fftw-devel binutils-devel libusb-devel mesa-libGL-devel mesa-libGLES-devel
18+
elif [ $(which zypper) ]; then # install rpm dependencies for OpenSUSE based systems
19+
zypper install make cmake fakeroot gcc-c++ libqt5-qtbase libqt5-qttools libqt5-qttranslations \
20+
libusb-1_0 Mesa-libGL1 Mesa-libGLESv2 fftw3
21+
else
22+
echo "No package management tool found, cannot install build requirements automatically"
23+
exit 1
24+
fi
25+

‎docs/build.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,18 @@ For distributions using dnf package manager (Fedora 21+) use this command:
88
For OpenSUSE and related distributions use this command
99
> zypper install make cmake fakeroot gcc-c++ libqt5-qtbase libqt5-qttools libqt5-qttranslations libusb-1_0 Mesa-libGL1 Mesa-libGLESv2 fftw3
1010
11+
The script [`LinuxSetup_AsRoot`](../LinuxSetup_AsRoot) installs all build requirements automatically.
12+
1113
After you've installed the requirements run the following commands inside the directory of this package:
1214

1315
mkdir build
1416
cd build
1517
cmake ..
1618
make -j4
1719

20+
or execute the script [`LinuxBuild`](../LinuxBuild) that configures the build, builds the binary and finally creates the packages (deb, rpm and tgz) that can be installed as described in the next paragraphs.
21+
If you make small changes to the local source code, it is sufficient to call `make -j4` or `make -j4 package` in the `build` directory.
22+
1823
After success you can test the newly built program `openhantek/OpenHantek`.
1924
Due to the included debug information this file is quite big (~20 MB), but the size can be reduced with `strip openhantek/OpenHantek` if you want to put it into a user directory.
2025
If you do not install the program, you need to copy the file `utils/udev_rules/60-hantek.rules` to `/lib/udev/rules.d/` yourself,
@@ -24,7 +29,7 @@ You can install the program with `sudo make install`, but it is highly recommend
2429
which allows a clear installation and removal of the package:
2530

2631
rm -f packages/*
27-
fakeroot make package
32+
fakeroot make -j4 package
2833
sudo apt install packages/openhantek_*_amd64.deb
2934

3035
If you detect that icons are not displayed correctly, please check if the Qt SVG library is installed on your system.

‎openhantek/src/OH_BUILD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Do not edit, will be re-created at each commit!
2-
#define OH_BUILD "20201205 build 779"
2+
#define OH_BUILD "20201208 build 780"

‎openhantek/src/dsowidget.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ DsoWidget::DsoWidget( DsoSettingsScope *scope, DsoSettingsView *view, const Dso:
268268
++row; // end 5x4 box
269269
// Separator and embedded measurementLayout
270270
++row;
271+
// display channel measurements on bottom of scope
271272
mainLayout->addLayout( measurementLayout, row, 1, 1, 5 );
272273

273274
updateCursorGrid( view->cursorsVisible );

‎openhantek/translations/openhantek_de.ts

+21-21
Original file line numberDiff line numberDiff line change
@@ -529,12 +529,12 @@
529529
<context>
530530
<name>DsoWidget</name>
531531
<message>
532-
<location filename="../src/dsowidget.cpp" line="584"/>
533-
<location filename="../src/dsowidget.cpp" line="586"/>
534-
<location filename="../src/dsowidget.cpp" line="617"/>
535-
<location filename="../src/dsowidget.cpp" line="662"/>
536-
<location filename="../src/dsowidget.cpp" line="671"/>
537-
<location filename="../src/dsowidget.cpp" line="692"/>
532+
<location filename="../src/dsowidget.cpp" line="585"/>
533+
<location filename="../src/dsowidget.cpp" line="587"/>
534+
<location filename="../src/dsowidget.cpp" line="618"/>
535+
<location filename="../src/dsowidget.cpp" line="663"/>
536+
<location filename="../src/dsowidget.cpp" line="672"/>
537+
<location filename="../src/dsowidget.cpp" line="693"/>
538538
<source>/div</source>
539539
<translation>/div</translation>
540540
</message>
@@ -549,69 +549,69 @@
549549
<translation>Marker</translation>
550550
</message>
551551
<message>
552-
<location filename="../src/dsowidget.cpp" line="536"/>
553-
<location filename="../src/dsowidget.cpp" line="552"/>
552+
<location filename="../src/dsowidget.cpp" line="537"/>
553+
<location filename="../src/dsowidget.cpp" line="553"/>
554554
<source>ON</source>
555555
<translation>EIN</translation>
556556
</message>
557557
<message>
558-
<location filename="../src/dsowidget.cpp" line="537"/>
559-
<location filename="../src/dsowidget.cpp" line="552"/>
558+
<location filename="../src/dsowidget.cpp" line="538"/>
559+
<location filename="../src/dsowidget.cpp" line="553"/>
560560
<source>OFF</source>
561561
<translation>AUS</translation>
562562
</message>
563563
<message>
564-
<location filename="../src/dsowidget.cpp" line="574"/>
564+
<location filename="../src/dsowidget.cpp" line="575"/>
565565
<source>Markers </source>
566566
<translation>Merker </translation>
567567
</message>
568568
<message>
569-
<location filename="../src/dsowidget.cpp" line="575"/>
569+
<location filename="../src/dsowidget.cpp" line="576"/>
570570
<source>Time: </source>
571571
<translation>Zeit: </translation>
572572
</message>
573573
<message>
574-
<location filename="../src/dsowidget.cpp" line="576"/>
574+
<location filename="../src/dsowidget.cpp" line="577"/>
575575
<source>Frequency: </source>
576576
<translation>Frequenz: </translation>
577577
</message>
578578
<message>
579-
<location filename="../src/dsowidget.cpp" line="579"/>
579+
<location filename="../src/dsowidget.cpp" line="580"/>
580580
<source>Zoom x%L1 </source>
581581
<translation>Zoom x%L1 </translation>
582582
</message>
583583
<message>
584-
<location filename="../src/dsowidget.cpp" line="581"/>
584+
<location filename="../src/dsowidget.cpp" line="582"/>
585585
<source>Zoom --- </source>
586586
<translation>Zoom --- </translation>
587587
</message>
588588
<message>
589-
<location filename="../src/dsowidget.cpp" line="630"/>
589+
<location filename="../src/dsowidget.cpp" line="631"/>
590590
<source>%L1%</source>
591591
<translation>%L1%</translation>
592592
</message>
593593
<message>
594-
<location filename="../src/dsowidget.cpp" line="644"/>
594+
<location filename="../src/dsowidget.cpp" line="645"/>
595595
<source>%1 %2 %3 %4 %5</source>
596596
<translation>%1 %2 %3 %4 %5</translation>
597597
</message>
598598
<message>
599-
<location filename="../src/dsowidget.cpp" line="682"/>
599+
<location filename="../src/dsowidget.cpp" line="683"/>
600600
<source>/s</source>
601601
<translation>/s</translation>
602602
</message>
603603
<message>
604-
<location filename="../src/dsowidget.cpp" line="796"/>
604+
<location filename="../src/dsowidget.cpp" line="797"/>
605605
<source> on screen</source>
606606
<translation> angezeigt</translation>
607607
</message>
608608
<message>
609-
<location filename="../src/dsowidget.cpp" line="841"/>
609+
<location filename="../src/dsowidget.cpp" line="842"/>
610610
<source>pp</source>
611611
<translation>pp</translation>
612612
</message>
613613
<message>
614-
<location filename="../src/dsowidget.cpp" line="848"/>
614+
<location filename="../src/dsowidget.cpp" line="849"/>
615615
<source>rms</source>
616616
<translation>rms</translation>
617617
</message>

‎openhantek/translations/openhantek_es.ts

+21-21
Original file line numberDiff line numberDiff line change
@@ -479,79 +479,79 @@
479479
<translation>Marcadores</translation>
480480
</message>
481481
<message>
482-
<location filename="../src/dsowidget.cpp" line="536"/>
483-
<location filename="../src/dsowidget.cpp" line="552"/>
482+
<location filename="../src/dsowidget.cpp" line="537"/>
483+
<location filename="../src/dsowidget.cpp" line="553"/>
484484
<source>ON</source>
485485
<translation></translation>
486486
</message>
487487
<message>
488-
<location filename="../src/dsowidget.cpp" line="537"/>
489-
<location filename="../src/dsowidget.cpp" line="552"/>
488+
<location filename="../src/dsowidget.cpp" line="538"/>
489+
<location filename="../src/dsowidget.cpp" line="553"/>
490490
<source>OFF</source>
491491
<translation></translation>
492492
</message>
493493
<message>
494-
<location filename="../src/dsowidget.cpp" line="574"/>
494+
<location filename="../src/dsowidget.cpp" line="575"/>
495495
<source>Markers </source>
496496
<translation>Marcadores </translation>
497497
</message>
498498
<message>
499-
<location filename="../src/dsowidget.cpp" line="575"/>
499+
<location filename="../src/dsowidget.cpp" line="576"/>
500500
<source>Time: </source>
501501
<translation>Tiempo: </translation>
502502
</message>
503503
<message>
504-
<location filename="../src/dsowidget.cpp" line="576"/>
504+
<location filename="../src/dsowidget.cpp" line="577"/>
505505
<source>Frequency: </source>
506506
<translation>Frecuencia: </translation>
507507
</message>
508508
<message>
509-
<location filename="../src/dsowidget.cpp" line="579"/>
509+
<location filename="../src/dsowidget.cpp" line="580"/>
510510
<source>Zoom x%L1 </source>
511511
<translation></translation>
512512
</message>
513513
<message>
514-
<location filename="../src/dsowidget.cpp" line="581"/>
514+
<location filename="../src/dsowidget.cpp" line="582"/>
515515
<source>Zoom --- </source>
516516
<translation></translation>
517517
</message>
518518
<message>
519-
<location filename="../src/dsowidget.cpp" line="584"/>
520-
<location filename="../src/dsowidget.cpp" line="586"/>
521-
<location filename="../src/dsowidget.cpp" line="617"/>
522-
<location filename="../src/dsowidget.cpp" line="662"/>
523-
<location filename="../src/dsowidget.cpp" line="671"/>
524-
<location filename="../src/dsowidget.cpp" line="692"/>
519+
<location filename="../src/dsowidget.cpp" line="585"/>
520+
<location filename="../src/dsowidget.cpp" line="587"/>
521+
<location filename="../src/dsowidget.cpp" line="618"/>
522+
<location filename="../src/dsowidget.cpp" line="663"/>
523+
<location filename="../src/dsowidget.cpp" line="672"/>
524+
<location filename="../src/dsowidget.cpp" line="693"/>
525525
<source>/div</source>
526526
<translation></translation>
527527
</message>
528528
<message>
529-
<location filename="../src/dsowidget.cpp" line="630"/>
529+
<location filename="../src/dsowidget.cpp" line="631"/>
530530
<source>%L1%</source>
531531
<translation></translation>
532532
</message>
533533
<message>
534-
<location filename="../src/dsowidget.cpp" line="644"/>
534+
<location filename="../src/dsowidget.cpp" line="645"/>
535535
<source>%1 %2 %3 %4 %5</source>
536536
<translation></translation>
537537
</message>
538538
<message>
539-
<location filename="../src/dsowidget.cpp" line="682"/>
539+
<location filename="../src/dsowidget.cpp" line="683"/>
540540
<source>/s</source>
541541
<translation></translation>
542542
</message>
543543
<message>
544-
<location filename="../src/dsowidget.cpp" line="796"/>
544+
<location filename="../src/dsowidget.cpp" line="797"/>
545545
<source> on screen</source>
546546
<translation> en pantalla</translation>
547547
</message>
548548
<message>
549-
<location filename="../src/dsowidget.cpp" line="841"/>
549+
<location filename="../src/dsowidget.cpp" line="842"/>
550550
<source>pp</source>
551551
<translation>pp</translation>
552552
</message>
553553
<message>
554-
<location filename="../src/dsowidget.cpp" line="848"/>
554+
<location filename="../src/dsowidget.cpp" line="849"/>
555555
<source>rms</source>
556556
<translation>rms</translation>
557557
</message>

‎openhantek/translations/openhantek_fr.ts

+21-21
Original file line numberDiff line numberDiff line change
@@ -531,79 +531,79 @@
531531
<translation>Repères</translation>
532532
</message>
533533
<message>
534-
<location filename="../src/dsowidget.cpp" line="584"/>
535-
<location filename="../src/dsowidget.cpp" line="586"/>
536-
<location filename="../src/dsowidget.cpp" line="617"/>
537-
<location filename="../src/dsowidget.cpp" line="662"/>
538-
<location filename="../src/dsowidget.cpp" line="671"/>
539-
<location filename="../src/dsowidget.cpp" line="692"/>
534+
<location filename="../src/dsowidget.cpp" line="585"/>
535+
<location filename="../src/dsowidget.cpp" line="587"/>
536+
<location filename="../src/dsowidget.cpp" line="618"/>
537+
<location filename="../src/dsowidget.cpp" line="663"/>
538+
<location filename="../src/dsowidget.cpp" line="672"/>
539+
<location filename="../src/dsowidget.cpp" line="693"/>
540540
<source>/div</source>
541541
<translation>/div</translation>
542542
</message>
543543
<message>
544-
<location filename="../src/dsowidget.cpp" line="536"/>
545-
<location filename="../src/dsowidget.cpp" line="552"/>
544+
<location filename="../src/dsowidget.cpp" line="537"/>
545+
<location filename="../src/dsowidget.cpp" line="553"/>
546546
<source>ON</source>
547547
<translation></translation>
548548
</message>
549549
<message>
550-
<location filename="../src/dsowidget.cpp" line="537"/>
551-
<location filename="../src/dsowidget.cpp" line="552"/>
550+
<location filename="../src/dsowidget.cpp" line="538"/>
551+
<location filename="../src/dsowidget.cpp" line="553"/>
552552
<source>OFF</source>
553553
<translation></translation>
554554
</message>
555555
<message>
556-
<location filename="../src/dsowidget.cpp" line="574"/>
556+
<location filename="../src/dsowidget.cpp" line="575"/>
557557
<source>Markers </source>
558558
<translation>Repères </translation>
559559
</message>
560560
<message>
561-
<location filename="../src/dsowidget.cpp" line="575"/>
561+
<location filename="../src/dsowidget.cpp" line="576"/>
562562
<source>Time: </source>
563563
<translation>Temps : </translation>
564564
</message>
565565
<message>
566-
<location filename="../src/dsowidget.cpp" line="576"/>
566+
<location filename="../src/dsowidget.cpp" line="577"/>
567567
<source>Frequency: </source>
568568
<translation>Fréquence : </translation>
569569
</message>
570570
<message>
571-
<location filename="../src/dsowidget.cpp" line="579"/>
571+
<location filename="../src/dsowidget.cpp" line="580"/>
572572
<source>Zoom x%L1 </source>
573573
<translation></translation>
574574
</message>
575575
<message>
576-
<location filename="../src/dsowidget.cpp" line="581"/>
576+
<location filename="../src/dsowidget.cpp" line="582"/>
577577
<source>Zoom --- </source>
578578
<translation></translation>
579579
</message>
580580
<message>
581-
<location filename="../src/dsowidget.cpp" line="630"/>
581+
<location filename="../src/dsowidget.cpp" line="631"/>
582582
<source>%L1%</source>
583583
<translation></translation>
584584
</message>
585585
<message>
586-
<location filename="../src/dsowidget.cpp" line="644"/>
586+
<location filename="../src/dsowidget.cpp" line="645"/>
587587
<source>%1 %2 %3 %4 %5</source>
588588
<translation></translation>
589589
</message>
590590
<message>
591-
<location filename="../src/dsowidget.cpp" line="682"/>
591+
<location filename="../src/dsowidget.cpp" line="683"/>
592592
<source>/s</source>
593593
<translation>/s</translation>
594594
</message>
595595
<message>
596-
<location filename="../src/dsowidget.cpp" line="796"/>
596+
<location filename="../src/dsowidget.cpp" line="797"/>
597597
<source> on screen</source>
598598
<translation> à l&apos;écran</translation>
599599
</message>
600600
<message>
601-
<location filename="../src/dsowidget.cpp" line="841"/>
601+
<location filename="../src/dsowidget.cpp" line="842"/>
602602
<source>pp</source>
603603
<translation>pp</translation>
604604
</message>
605605
<message>
606-
<location filename="../src/dsowidget.cpp" line="848"/>
606+
<location filename="../src/dsowidget.cpp" line="849"/>
607607
<source>rms</source>
608608
<translation>rms</translation>
609609
</message>

0 commit comments

Comments
 (0)