New files missing from 1.1.0-RC1 after merge

#1 · January 17, 2024, 10:47 pm

In this merge (https://bazaar.launchpad.net/~arcachofo/simulide/1.1.0/revision/1910)
this original commit (https://bazaar.launchpad.net/~arcachofo/simulide/trunk/revision/2084)
only got partially merged: the new icon files weren't added, only the old ones were removed.

I wonder what went wrong with the merge.

I tried building with 1.1.0 rev 1910, and got an error saying linker.h does not exist.
Everything went fine on trunk rev 2162

The most probably thing is that new files weren't merged.

#2 · January 17, 2024, 11:32 pm

Yes, you are right, something went wrong here.

I will have a look, thanks for reporting.

#3 · January 22, 2024, 10:33 am

Thanks for the fix. However it looks like there were some lines missed regarding icons in non-linux platforms:

Here's the diff

diff -r a/SimulIDE.pro b/SimulIDE.pro
2,3c2,3
< VERSION = "1.1.0"
< RELEASE = "-RC1"
---
> VERSION = ""
> RELEASE = ""
92c92
<     RC_ICONS += ../resources/icons/simulide.ico
---
>     RC_ICONS += ../src/icons/simulide.ico
101c101
<     ICON = ../resources/icons/simulide.icns
---
>     ICON = ../src/icons/simulide.icns
110a111,112
>
> DEFINES += MAINMODULE_EXPORT=

Just thought I should put this here

#4 · January 22, 2024, 12:05 pm

Thank you.

Solved at Rev 1912.