Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"

[mm0359]

win32/avidemux_2.6.18_r170322_win32.exe

admlog.txt header has been broken for a few releases (iirc):

Avidemux vADM_VERSION (ADM_SUBVERSION) .

Would be nice to unbreak it...

Fwiw,
ADM_VERSION search
And possibly sync main.cpp to be (more) like Q_about.cpp.

[eumagga0x2a]

I've noticed this too, but would like to investigate and hopefully solve the issue that my own Avidemux builds for windows currently don't run at all (access violation somewhere in Qt).

[eumagga0x2a]

[main] Fix version string generation would fix this, but not sure if it passes below the closed toll bar.

[mm0359]

I checked ADD_SOURCE_CFLAGS search.

It looks like 3 lines were missed in [build/vs] Change how the strings are passed from cmake to compiler.
Or were they left as is on purpose?

cli/CMakeLists.txt

Code Select Expand


ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")


gtk/CMakeLists.txt

Code Select Expand


ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION='\"${ADM_SUBVERSION}\"'")
ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")


[eumagga0x2a]

It looks like 3 lines were missed in [build/vs] Change how the strings are passed from cmake to compiler.
Or were they left as is on purpose?

No, thank you for pointing out. The GTK part is not built, so it doesn't matter there.

[mm0359]

[main] Fix version string generation would fix this

Commited as [cmake/qt/cli] Unset ADM_SUBVERSION for releases, fix version string generation for jobs
then [cmake] Revert unsetting ADM_SUBVERSION.

Don't we miss a few more IF (ADM_SUBVERSION)? (See ADM_SUBVERSION search.)
In
avidemux_core/corePackageTarGz.cmake (PS: Ah, it seems unused since v2.6.0!?)
avidemux/gtk/ADM_userInterfaces/ADM_dialog/CMakeLists.txt
avidemux/gtk/gtkPackageRpm.cmake
avidemux/gtk/CMakeLists.txt

[mm0359]

No, thank you for pointing out.

cli/CMakeLists.txt fixed by [build/cli] Fix the version string.

The GTK part is not built, so it doesn't matter there.

Hum, alright.

[mm0359]

ADM_VERSION search
And possibly sync main.cpp to be (more) like Q_about.cpp.

Could you remove the extra ending " ." in main.cpp?
And maybe the starting "  " too in main.cpp and ADM_jobs.cpp?

Moreover, could the latters use the same pattern(s) as Q_about.cpp?
Maybe all 3 like "vADM_VERSION (rADM_SUBVERSION, fflibs ADM_FFMPEG_VERSION)"?
(And "vADM_VERSION (Release, fflibs ADM_FFMPEG_VERSION)",
or even "vADM_VERSION - Release (rADM_SUBVERSION, fflibs ADM_FFMPEG_VERSION)".)

[eumagga0x2a]

This all is possible, but I don't dive into such style questions because they don't improve the substance of the application while binding ressources and it was not me who put the period here.

[mm0359]

I don't dive into such style questions

Noted.
Ftr, the data I miss most is ADM_FFMPEG_VERSION in log file.