Add standalone executable #250

ahcorde · 2021-07-08T15:59:50Z

Signed-off-by: ahcorde ahcorde@gmail.com

🎉 Enhancement

Summary

This PR improve support on Windows for the command line tool

Test it

ign gui
ign gui -l
ign gui -s TopicEcho
ign gui -h

Checklist

Signed all commits for DCO
codecheck passed (See contributing)
All tests passed (See test coverage)
While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge

codecov · 2021-07-08T16:08:26Z

Codecov Report

Merging #250 (fbee59a) into ign-gui5 (0361d32) will increase coverage by 0.23%.
The diff coverage is 75.00%.

@@             Coverage Diff              @@
##           ign-gui5     #250      +/-   ##
============================================
+ Coverage     66.10%   66.34%   +0.23%     
============================================
  Files            26       27       +1     
  Lines          3219     3268      +49     
============================================
+ Hits           2128     2168      +40     
- Misses         1091     1100       +9

Impacted Files	Coverage Δ
src/cmd/ign.cc	`40.54% <37.50%> (ø)`
src/cmd/gui_main.cc	`77.27% <77.27%> (ø)`
src/Application.cc	`84.74% <100.00%> (+0.15%)`	⬆️
src/MainWindow.cc	`96.94% <100.00%> (+0.01%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0361d32...fbee59a. Read the comment docs.

ahcorde · 2021-07-12T08:51:50Z

@osrf-jenkins retest this please

scpeters · 2021-07-12T18:42:52Z

src/Application.cc

@@ -598,8 +607,14 @@ std::vector<std::pair<std::string, std::vector<std::string>>>
      // All we verify is that the file starts with "lib", any further
      // checks would require loading the plugin.

+#ifndef _WIN32


nit: I would find it easier to read with reversed logic:

#ifdef _WIN32 if (plugin.find(".lib") != std::string::npos) #else if (plugin.find("lib") == 0) #endif

reversed in 3b0a96b

scpeters · 2021-07-12T18:43:42Z

src/cmd/ign.cc


 //////////////////////////////////////////////////
-extern "C" IGNITION_GUI_VISIBLE char *ignitionVersion()


I think the ABI checker is complaining that these symbols are now missing

I reverted the header file changes in 4e87255

Signed-off-by: ahcorde <ahcorde@gmail.com>

ahcorde · 2021-07-13T11:27:53Z

Requires at least this PR gazebo-tooling/release-tools#487

ahcorde · 2021-07-13T15:17:21Z

@osrf-jenkins retest this please

mjcarroll · 2021-07-13T20:27:16Z

src/cmd/ign_TEST.cc

+  std::string cmd = std::string("IGN_CONFIG_PATH=") + ignConfigPath +
+    " ign gui -l";
+#else
+  std::string ign = std::string(IGN_PATH) + "/ign.rb";


This should probably use path join

mjcarroll · 2021-07-13T20:27:29Z

src/cmd/ign_TEST.cc

+    " && " + ign + " gui -l";
+#endif
+  std::string output = custom_exec_str(cmd);
+  std::cerr << "output " << output << std::endl;


Is this output needed?

Nope this is for testing what is going on in the CI. I will remove it when the windows CI will be happy

Signed-off-by: ahcorde <ahcorde@gmail.com>

chapulina · 2021-07-20T04:45:57Z

CMakeLists.txt

  REQUIRED
-  PKGCONFIG "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets"
+  PKGCONFIG "Qt5Core Qt5Quick Qt5Qml Qt5QuickControls2 Qt5Widgets"


Just curious, why is this needed?

chapulina · 2021-07-20T04:50:24Z

src/Application.cc

@@ -598,8 +607,14 @@ std::vector<std::pair<std::string, std::vector<std::string>>>
      // All we verify is that the file starts with "lib", any further
      // checks would require loading the plugin.

+#ifdef _WIN32
+      if (plugin.find(".lib") != std::string::npos)


Just checking if you meant to use the .lib or if we should use the .dll

chapulina · 2021-07-20T04:52:03Z

src/cmd/cmdgui.rb.in


-# Copyright (C) 2017 Open Source Robotics Foundation
+# Copyright (C) 2014 Open Source Robotics Foundation


Going back in time?

chapulina · 2021-07-20T05:07:22Z

src/cmd/ign.hh

@@ -18,28 +18,30 @@
 #ifndef IGNITION_GUI_IGN_HH_
 #define IGNITION_GUI_IGN_HH_


ign.hh is installed, so we need to tick-tock it.

I reverted the changes to ign.hh in 4e87255

ahcorde · 2021-07-20T12:55:43Z

@osrf-jenkins retest this please

Signed-off-by: ahcorde <ahcorde@gmail.com>

ahcorde · 2021-07-21T18:14:35Z

@osrf-jenkins retest this please

Signed-off-by: ahcorde <ahcorde@gmail.com>

ahcorde · 2021-07-22T13:54:27Z

Windows IGN_TEST is still failing. The ign-gui.exe is working properly when I compiled and ran the ign command line tool on my local machine. But in the buildfarm I'm struggling a little bit. I will post what I have tested so far.

Update the PATH , otherwise is not able to find some .dll.
I launched the build without removing the ws with this branch of release-tools, I have connected to the machine to test the WS. The test and executable is working fine.
I have started to thing (because of the previous point) that it's something related with the displays, I have tried to run Qt in headless mode with the env vars QT_QPA_PLATFORM_PLUGIN_PATH and QT_QPA_PLATFORM. But still, it's not working.
I have also included some tests (which we should remove) to test the executable without the Ruby wrapper,
- when I used the flag --version is returning the right value, becauase this is not calling Qt
- When I tried to list the plugins -l I get a timeout

@j-rivero do you have any idea ?

Retain cmdVerbose in src/cmd/ign.hh Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

ahcorde · 2021-08-24T14:24:22Z

@osrf-jenkins retest this please

Signed-off-by: ahcorde <ahcorde@gmail.com>

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

scpeters · 2021-11-19T07:06:29Z

@osrf-jenkins run tests please

scpeters · 2021-11-19T07:07:52Z

@osrf-jenkins run tests please

chapulina · 2022-03-25T21:32:17Z

@ahcorde , are you still planning to go back to this PR? Edifice will EOL next week, how about retargeting to ign-gui6?

jennuine · 2023-11-03T17:55:03Z

@ahcorde do you plan to revisit this PR or should I close this out?

jennuine · 2023-12-11T19:36:30Z

Going to close this out due to lack of movement, feel free to re-open.

ahcorde added the enhancement New feature or request label Jul 8, 2021

ahcorde requested a review from jennuine as a code owner July 8, 2021 15:59

ahcorde self-assigned this Jul 8, 2021

github-actions bot added the 🏢 edifice Ignition Edifice label Jul 8, 2021

ahcorde requested a review from mjcarroll July 8, 2021 17:29

ahcorde force-pushed the ahcorde/5/standalone branch from cf0f3c3 to 3733562 Compare July 12, 2021 16:49

scpeters reviewed Jul 12, 2021

View reviewed changes

ahcorde mentioned this pull request Jul 13, 2021

Added qt5-winextras to ign-gui gazebo-tooling/release-tools#487

Merged

Add standalone executable

3c93e6c

Signed-off-by: ahcorde <ahcorde@gmail.com>

ahcorde force-pushed the ahcorde/5/standalone branch from 53b6c7b to 3c93e6c Compare July 13, 2021 11:27

This was referenced Jul 14, 2021

Added MFC compiler tools on Windows gazebo-tooling/release-tools#488

Closed

Snapshot 2021.05.12 for ignition vcpkg gazebo-tooling/release-tools#489

Closed

mjcarroll reviewed Jul 16, 2021

View reviewed changes

ahcorde added 2 commits July 16, 2021 23:16

improvements

4710cdb

Signed-off-by: ahcorde <ahcorde@gmail.com>

Fixed path windows

5be5998

Signed-off-by: ahcorde <ahcorde@gmail.com>

ahcorde force-pushed the ahcorde/5/standalone branch from 87301b3 to 5be5998 Compare July 19, 2021 12:21

ahcorde added 2 commits July 19, 2021 14:30

Fixed CMakelist.txt

c40195d

Signed-off-by: ahcorde <ahcorde@gmail.com>

Fixed CMakelist.txt

bce242e

Signed-off-by: ahcorde <ahcorde@gmail.com>

chapulina suggested changes Jul 20, 2021

View reviewed changes

ahcorde force-pushed the ahcorde/5/standalone branch 3 times, most recently from 14357a1 to 1df9740 Compare July 20, 2021 17:48

Fixed windows build!

246217e

Signed-off-by: ahcorde <ahcorde@gmail.com>

ahcorde added 2 commits July 21, 2021 15:40

QT_QPA_PLATFORM

17fb711

Signed-off-by: ahcorde <ahcorde@gmail.com>

standalone test

98ca47a

Signed-off-by: ahcorde <ahcorde@gmail.com>

ahcorde added 2 commits July 21, 2021 20:49

update

a9b4e26

Signed-off-by: ahcorde <ahcorde@gmail.com>

update

eb57c5f

Signed-off-by: ahcorde <ahcorde@gmail.com>

scpeters added 6 commits August 16, 2021 02:01

Revert changes to installed ign.hh

4e87255

Retain cmdVerbose in src/cmd/ign.hh Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Reverse logic for env delimiter

3b0a96b

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Merge branch 'ign-gui5' into ahcorde/5/standalone

e1a1db3

gui_main: include both ign.hh headers

c06f27c

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

src/CMakeLists.txt: extensions for test sources

f2906b4

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

ign.cc: fix includes

ced10f4

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

ahcorde added 2 commits August 24, 2021 17:05

Fixed Windows build

1081654

Signed-off-by: ahcorde <ahcorde@gmail.com>

Fixed build

be6873d

Signed-off-by: ahcorde <ahcorde@gmail.com>

chapulina mentioned this pull request Sep 2, 2021

Consider binaries to implement the functionality offered by gz gazebosim/gz-tools#7

Open

scpeters added 2 commits November 18, 2021 22:29

Refactor cmake code, run test without install

93d3067

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Merge remote-tracking branch 'origin/ign-gui5' into ahcorde/5/standalone

fbee59a

azeey added beta Targeting beta release of upcoming collection and removed beta Targeting beta release of upcoming collection labels Jul 31, 2023

jennuine closed this Dec 11, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add standalone executable #250

Add standalone executable #250

ahcorde commented Jul 8, 2021

codecov bot commented Jul 8, 2021 •

edited

Loading

ahcorde commented Jul 12, 2021

scpeters Jul 12, 2021

scpeters Aug 16, 2021

scpeters Jul 12, 2021

scpeters Aug 16, 2021

ahcorde commented Jul 13, 2021

ahcorde commented Jul 13, 2021

mjcarroll Jul 13, 2021

mjcarroll Jul 13, 2021

ahcorde Jul 16, 2021

chapulina Jul 20, 2021

chapulina Jul 20, 2021

chapulina Jul 20, 2021

chapulina Jul 20, 2021

scpeters Aug 16, 2021

ahcorde commented Jul 20, 2021

ahcorde commented Jul 21, 2021

ahcorde commented Jul 22, 2021

ahcorde commented Aug 24, 2021

scpeters commented Nov 19, 2021

scpeters commented Nov 19, 2021

chapulina commented Mar 25, 2022

jennuine commented Nov 3, 2023

jennuine commented Dec 11, 2023


		//////////////////////////////////////////////////
		extern "C" IGNITION_GUI_VISIBLE char *ignitionVersion()


		# Copyright (C) 2017 Open Source Robotics Foundation
		# Copyright (C) 2014 Open Source Robotics Foundation

		@@ -18,28 +18,30 @@
		#ifndef IGNITION_GUI_IGN_HH_
		#define IGNITION_GUI_IGN_HH_

Add standalone executable #250

Add standalone executable #250

Conversation

ahcorde commented Jul 8, 2021

🎉 Enhancement

Summary

Test it

Checklist

codecov bot commented Jul 8, 2021 • edited Loading

Codecov Report

ahcorde commented Jul 12, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ahcorde commented Jul 13, 2021

ahcorde commented Jul 13, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ahcorde commented Jul 20, 2021

ahcorde commented Jul 21, 2021

ahcorde commented Jul 22, 2021

ahcorde commented Aug 24, 2021

scpeters commented Nov 19, 2021

scpeters commented Nov 19, 2021

chapulina commented Mar 25, 2022

jennuine commented Nov 3, 2023

jennuine commented Dec 11, 2023

codecov bot commented Jul 8, 2021 •

edited

Loading