From ef2f3707065ba1bc1b38d8237a73312bc3109eab Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Sat, 12 Sep 2026 13:43:21 +0200 Subject: [PATCH 1/2] Remove unused and outdated build scripts Signed-off-by: Maxime Gervais --- Project/GNU/GUI/AddThisToRoot_GUI_compile.sh | 54 ---- Project/GNU/GUI/Makefile.am | 89 ------ Project/GNU/GUI/autogen | 3 - Project/GNU/GUI/autogen.sh | 29 -- Project/GNU/GUI/configure.ac | 260 ------------------ Project/Mac/BR_extension_CLI.sh | 8 - Project/Mac/BR_extension_GUI.sh | 2 - Project/OBS/PKGBUILD | 10 +- Project/OBS/bwfmetaedit.spec | 12 +- .../CLI => Unix}/AddThisToRoot_CLI_compile.sh | 0 .../AddThisToRoot_GUI_compile.sh | 2 +- .../{GNU/GUI => Unix}/bwfmetaedit-gui.desktop | 0 .../GUI => Unix}/bwfmetaedit-gui.kde3.desktop | 0 .../GUI => Unix}/bwfmetaedit-gui.kde4.desktop | 0 .../GUI => Unix}/bwfmetaedit-gui.metainfo.xml | 0 Release/CleanUp.bat | 69 ----- Release/ReadMe_CLI_Linux.txt | 15 - Release/ReadMe_CLI_Mac.txt | 1 - Release/ReadMe_GUI_Linux.txt | 15 - Release/ReadMe_GUI_Mac.txt | 1 - Release/Release_All_GNU_FromSource.sh | 120 -------- Release/Release_CLI_GNU.sub | 38 --- Release/Release_CLI_Linux_IA64.sh | 9 - Release/Release_CLI_Linux_i386.sh | 9 - Release/Release_CLI_Linux_x64.sh | 9 - Release/Release_CLI_Mac_Intel.sh | 9 - Release/Release_CLI_Mac_PPC.sh | 9 - Release/Release_CLI_Mac_Universal.sh | 9 - Release/Release_GUI_GNU.sub | 38 --- Release/Release_GUI_Linux_i386.sh | 9 - Release/Release_GUI_Linux_x64.sh | 9 - Release/Release_GUI_Mac_Intel.sh | 9 - Release/Release_GUI_Mac_PPC.sh | 9 - Release/Release_GUI_Mac_Universal.sh | 9 - Release/Release_Source.sh | 10 +- Release/UpgradeVersion.sh | 4 +- debian/rules | 10 +- 37 files changed, 24 insertions(+), 865 deletions(-) delete mode 100644 Project/GNU/GUI/AddThisToRoot_GUI_compile.sh delete mode 100644 Project/GNU/GUI/Makefile.am delete mode 100644 Project/GNU/GUI/autogen delete mode 100755 Project/GNU/GUI/autogen.sh delete mode 100644 Project/GNU/GUI/configure.ac delete mode 100644 Project/Mac/BR_extension_CLI.sh delete mode 100644 Project/Mac/BR_extension_GUI.sh rename Project/{GNU/CLI => Unix}/AddThisToRoot_CLI_compile.sh (100%) rename Project/{QtCreator => Unix}/AddThisToRoot_GUI_compile.sh (99%) rename Project/{GNU/GUI => Unix}/bwfmetaedit-gui.desktop (100%) rename Project/{GNU/GUI => Unix}/bwfmetaedit-gui.kde3.desktop (100%) rename Project/{GNU/GUI => Unix}/bwfmetaedit-gui.kde4.desktop (100%) rename Project/{GNU/GUI => Unix}/bwfmetaedit-gui.metainfo.xml (100%) delete mode 100644 Release/CleanUp.bat delete mode 100644 Release/ReadMe_CLI_Linux.txt delete mode 100644 Release/ReadMe_CLI_Mac.txt delete mode 100644 Release/ReadMe_GUI_Linux.txt delete mode 100644 Release/ReadMe_GUI_Mac.txt delete mode 100644 Release/Release_All_GNU_FromSource.sh delete mode 100644 Release/Release_CLI_GNU.sub delete mode 100644 Release/Release_CLI_Linux_IA64.sh delete mode 100644 Release/Release_CLI_Linux_i386.sh delete mode 100644 Release/Release_CLI_Linux_x64.sh delete mode 100644 Release/Release_CLI_Mac_Intel.sh delete mode 100644 Release/Release_CLI_Mac_PPC.sh delete mode 100644 Release/Release_CLI_Mac_Universal.sh delete mode 100644 Release/Release_GUI_GNU.sub delete mode 100644 Release/Release_GUI_Linux_i386.sh delete mode 100644 Release/Release_GUI_Linux_x64.sh delete mode 100644 Release/Release_GUI_Mac_Intel.sh delete mode 100644 Release/Release_GUI_Mac_PPC.sh delete mode 100644 Release/Release_GUI_Mac_Universal.sh diff --git a/Project/GNU/GUI/AddThisToRoot_GUI_compile.sh b/Project/GNU/GUI/AddThisToRoot_GUI_compile.sh deleted file mode 100644 index bcb9f0dd..00000000 --- a/Project/GNU/GUI/AddThisToRoot_GUI_compile.sh +++ /dev/null @@ -1,54 +0,0 @@ -#! /bin/sh - -############################################################################# -# Configure -Home=`pwd` - -############################################################################# -# Setup for parallel builds -Zen_Make() -{ - if test -e /proc/stat; then - numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :` - if [ "$numprocs" = "0" ]; then - numprocs=1 - fi - make -s -j$numprocs - else - make - fi -} - -############################################################################# -# BWF_MetaEdit -if test -e Project/QtCreator/prepare; then - cd Project/QtCreator - test -e Makefile && rm Makefile - chmod u+x prepare - ./prepare $* - if test -e Makefile; then - make clean - Zen_Make - if test -e bwfmetaedit-gui; then - echo BWF_MetaEdit compiled - else - echo Problem while compiling BWF_MetaEdit - exit - fi - else - echo Problem while configuring BWF_MetaEdit - exit - fi -else - echo BWF_MetaEdit directory is not found - exit -fi -cd $Home - -############################################################################# -# Going home -cd $Home -echo "BWF MetaEdit (GUI) executable is in Project/QtCreator" -echo "For installing, cd Project/QtCreator && make install" - - diff --git a/Project/GNU/GUI/Makefile.am b/Project/GNU/GUI/Makefile.am deleted file mode 100644 index aaeecf34..00000000 --- a/Project/GNU/GUI/Makefile.am +++ /dev/null @@ -1,89 +0,0 @@ -AUTOMAKE_OPTIONS = foreign subdir-objects - -bin_PROGRAMS = bwfmetaedit-gui -bwfmetaedit_gui_SOURCES = \ - ../../../Source/Common/Common_About.cpp \ - ../../../Source/Common/Core.cpp \ - ../../../Source/GUI/Qt/App.cpp \ - ../../../Source/GUI/Qt/GUI_About.cpp \ - ../../../Source/GUI/Qt/GUI_Help.cpp \ - ../../../Source/GUI/Qt/GUI_Main.cpp \ - ../../../Source/GUI/Qt/GUI_Main_Core_Table.cpp \ - ../../../Source/GUI/Qt/GUI_Main_Core_Text.cpp \ - ../../../Source/GUI/Qt/GUI_Main_Menu.cpp \ - ../../../Source/GUI/Qt/GUI_Main_Output_Log.cpp \ - ../../../Source/GUI/Qt/GUI_Main_Output_stderr.cpp \ - ../../../Source/GUI/Qt/GUI_Main_Output_Trace.cpp \ - ../../../Source/GUI/Qt/GUI_Main_Technical_Table.cpp \ - ../../../Source/GUI/Qt/GUI_Main_Technical_Text.cpp \ - ../../../Source/GUI/Qt/GUI_Main_UndoDialog.cpp \ - ../../../Source/GUI/Qt/GUI_Main_xxxx__Common.cpp \ - ../../../Source/GUI/Qt/GUI_Main_xxxx_Bext.cpp \ - ../../../Source/GUI/Qt/GUI_Main_xxxx_CodingHistoryDialog.cpp \ - ../../../Source/GUI/Qt/GUI_Main_xxxx_DateDialog.cpp \ - ../../../Source/GUI/Qt/GUI_Main_xxxx_Loudness.cpp \ - ../../../Source/GUI/Qt/GUI_Main_xxxx_TextEditDialog.cpp \ - ../../../Source/GUI/Qt/GUI_Main_xxxx_TimeReferenceDialog.cpp \ - ../../../Source/GUI/Qt/GUI_Main_xxxx_UmidDialog.cpp \ - ../../../Source/GUI/Qt/GUI_Preferences.cpp \ - ../../../Source/MD5/md5.c \ - ../../../Source/Riff/Riff_Base.cpp \ - ../../../Source/Riff/Riff_Base_Streams.cpp \ - ../../../Source/Riff/Riff_Chunks_.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE__PMX.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_aXML.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_bext.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_data.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_ds64.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_FLLR.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_fmt_.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_INFO.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_INFO_xxxx.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_iXML.cpp \ - ../../../Source/Riff/Riff_Chunks_WAVE_MD5_.cpp \ - ../../../Source/Riff/Riff_Handler.cpp \ - ../../../Source/TinyXml2/tinyxml2.cpp \ - ../../../Source/ZenLib/Conf.cpp \ - ../../../Source/ZenLib/CriticalSection.cpp \ - ../../../Source/ZenLib/Dir.cpp \ - ../../../Source/ZenLib/File.cpp \ - ../../../Source/ZenLib/FileName.cpp \ - ../../../Source/ZenLib/InfoMap.cpp \ - ../../../Source/ZenLib/int128s.cpp \ - ../../../Source/ZenLib/int128u.cpp \ - ../../../Source/ZenLib/MemoryDebug.cpp \ - ../../../Source/ZenLib/OS_Utils.cpp \ - ../../../Source/ZenLib/Translation.cpp \ - ../../../Source/ZenLib/Thread.cpp \ - ../../../Source/ZenLib/Utils.cpp \ - ../../../Source/ZenLib/Ztring.cpp \ - ../../../Source/ZenLib/ZtringList.cpp \ - ../../../Source/ZenLib/ZtringListList.cpp \ - ../../../Source/ZenLib/ZtringListListF.cpp \ - _Automated/moc_GUI_About.cpp \ - _Automated/moc_GUI_Help.cpp \ - _Automated/moc_GUI_Main.cpp \ - _Automated/moc_GUI_Main_Technical_Table.cpp \ - _Automated/moc_GUI_Main_Technical_Text.cpp \ - _Automated/moc_GUI_Main_Core_Table.cpp \ - _Automated/moc_GUI_Main_Core_Text.cpp \ - _Automated/moc_GUI_Main_Output_Log.cpp \ - _Automated/moc_GUI_Main_Output_stderr.cpp \ - _Automated/moc_GUI_Main_Output_Trace.cpp \ - _Automated/moc_GUI_Main_UndoDialog.cpp \ - _Automated/moc_GUI_Main_xxxx__Common.cpp \ - _Automated/moc_GUI_Main_xxxx_CodingHistoryDialog.cpp \ - _Automated/moc_GUI_Main_xxxx_Bext.cpp \ - _Automated/moc_GUI_Main_xxxx_DateDialog.cpp \ - _Automated/moc_GUI_Main_xxxx_Loudness.cpp \ - _Automated/moc_GUI_Main_xxxx_TextEditDialog.cpp \ - _Automated/moc_GUI_Main_xxxx_TimeReferenceDialog.cpp \ - _Automated/moc_GUI_Main_xxxx_UmidDialog.cpp \ - _Automated/moc_GUI_Preferences.cpp \ - _Automated/qrc_GUI_Main.cpp - -#bwfmetaedit_gui_LDFLAGS = -no-undefined -version-info 0:0:0 -AM_CXXFLAGS = -std=c++11 - -AM_CPPFLAGS = -I../../../Source diff --git a/Project/GNU/GUI/autogen b/Project/GNU/GUI/autogen deleted file mode 100644 index a6d2e39c..00000000 --- a/Project/GNU/GUI/autogen +++ /dev/null @@ -1,3 +0,0 @@ -aclocal -automake -a -autoconf diff --git a/Project/GNU/GUI/autogen.sh b/Project/GNU/GUI/autogen.sh deleted file mode 100755 index d26ec012..00000000 --- a/Project/GNU/GUI/autogen.sh +++ /dev/null @@ -1,29 +0,0 @@ -#libtoolize -if test "$(uname)" = "Darwin" ; then - #Darwin based Systems like Mac OS X: libtoolize is called glibtoolize. - glibtoolize --automake -else - libtoolize --automake -fi - -#aclocal -if test -e /usr/bin/aclocal-1.11 ; then - #OpenSolaris: no aclocal - aclocal-1.11 -elif test -e /usr/bin/aclocal-1.10 ; then - aclocal-1.10 -else - aclocal -fi - -#automake -if test -e /usr/bin/automake-1.11 ; then - #OpenSolaris: no automake - automake-1.11 -a -elif test -e /usr/bin/automake-1.10 ; then - automake-1.10 -a -else - automake -a -fi - -autoreconf -fi \ No newline at end of file diff --git a/Project/GNU/GUI/configure.ac b/Project/GNU/GUI/configure.ac deleted file mode 100644 index 467696d9..00000000 --- a/Project/GNU/GUI/configure.ac +++ /dev/null @@ -1,260 +0,0 @@ -dnl ######################################################################### -dnl ### Init -dnl ######################################################################### - -dnl ------------------------------------------------------------------------- -dnl Test if we are at the good place -dnl -AC_INIT(../../../Source/GUI/Qt/GUI_Main.cpp) - -dnl ------------------------------------------------------------------------- -dnl sets build, host, target variables and the same with _alias -dnl -AC_CANONICAL_BUILD - -dnl ------------------------------------------------------------------------- -dnl Name and version -dnl -AM_INIT_AUTOMAKE(bwfmetaedit-gui,0) - -dnl ------------------------------------------------------------------------- -dnl Autotools init -dnl -CFLAGS="$CFLAGS" -CXXFLAGS="$CXXFLAGS" -AC_PROG_CC -AC_PROG_CXX -AC_PROG_INSTALL - -dnl ######################################################################### -dnl ### Configure -dnl ######################################################################### - -Home=`pwd` - -dnl ######################################################################### -dnl ### Options -dnl ######################################################################### - -dnl ------------------------------------------------------------------------- -dnl Arguments - Enable -dnl -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable full debug]), , enable_debug=no) -AC_ARG_ENABLE(gprof, AC_HELP_STRING([--enable-gprof], [Enable gprof log]), , enable_gprof=no) -AC_ARG_ENABLE(universal_binary, AC_HELP_STRING([--enable-universal_binary], [Create Mac x84_64/arm64 Universal binary]), , enable_universal_binary=no) -AC_ARG_ENABLE(arch-ppc, AC_HELP_STRING([--with-arch-ppc], [Create Mac PPC Universal binary]), , enable_arch_ppc=no) -AC_ARG_ENABLE(arch-i386, AC_HELP_STRING([--with-arch-i386], [Create Mac i386 Universal binary]), , enable_arch_i386=no) -AC_ARG_ENABLE(arch-x86_64, AC_HELP_STRING([--enable-arch-x86_64], [Create Mac x86_64 architecture]), , enable_arch_x86_64=no) -AC_ARG_ENABLE(arch-arm64, AC_HELP_STRING([--enable-arch-arm64], [Create Mac arm64 architecture]), , enable_arch_arm64=no) -AC_ARG_ENABLE(large_files, AC_HELP_STRING([--disable-large_files], [Disable large files support]), , enable_large_files=yes) - -dnl ------------------------------------------------------------------------- -dnl Arguments - With -dnl -AC_ARG_WITH(macosx-sdk, AC_HELP_STRING([--with-macosx-sdk], [Force the Mac SDK]), , with_macosx_sdk=no) -AC_ARG_WITH(macosx-version-min, AC_HELP_STRING([--with-macosx-version-min], [Force the Mac Version]), , with_macosx_version_min=no) - -dnl ######################################################################### -dnl ### Parsing options -dnl ######################################################################### - -dnl ######################################################################### -dnl ### Specific flags -dnl ######################################################################### - -dnl ------------------------------------------------------------------------- -dnl Use Qt (v2) -dnl -dnl if test "$with_qt" != "no"; then - if test -d ../../../qt/include; then - CFLAGS="$CFLAGS -I../../../qt/include" - CXXFLAGS="$CXXFLAGS -I../../../qt/include" - - MOC="../../../qt/bin/moc" - RCC="../../../qt/bin/rcc" - - case "${build}" in - *-*-darwin* ) - # Qt5 Don't support pkgconfig on MacOS - CFLAGS="$CFLAGS -I../../../qt/lib/QtCore.framework/Headers -I../../../qt/lib/QtGui.framework/Headers -I../../../qt/lib/QtWidgets.framework/Headers -F../../../qt/lib" - CXXFLAGS="$CXXFLAGS -I../../../qt/lib/QtCore.framework/Headers -I../../../qt/lib/QtGui.framework/Headers -I../../../qt/lib/QtWidgets.framework/Headers -F../../../qt/lib" - LIBS="$LIBS -framework Carbon -framework AppKit -framework ApplicationServices -framework QtCore -framework QtGui -framework QtWidgets" - break - ;; - *) - LIBS="$LIBS -L../../../qt/lib $LIBS -lQtCore -lQtGui -lQtWidgets -lz" - ;; - esac - with_qt="builtin" - - elif pkg-config --exists Qt5Widgets; then - CFLAGS="$CFLAGS $(pkg-config Qt5Widgets --cflags)" - CXXFLAGS="$CXXFLAGS $(pkg-config Qt5Widgets --cflags)" - LIBS="$LIBS $(pkg-config Qt5Widgets --libs)" - - MOC="$(pkg-config Qt5Gui --variable=prefix)/bin/moc" - RCC="$(pkg-config Qt5Gui --variable=prefix)/bin/rcc" - - with_qt="system (qt5)" - elif pkg-config --exists QtGui; then - CFLAGS="$CFLAGS $(pkg-config QtGui --cflags)" - CXXFLAGS="$CXXFLAGS $(pkg-config QtGui --cflags)" - LIBS="$LIBS $(pkg-config QtGui --libs)" - - MOC="$(pkg-config QtGui --variable=prefix)/bin/moc" - RCC="$(pkg-config QtGui --variable=prefix)/bin/rcc" - - with_qt="system (qt4)" - else - AC_MSG_ERROR([Qt configuration is not found]) - fi - - if test ! -x $MOC ; then - AC_MSG_ERROR([ - Qt MOC is not found on your qt directory - Have you compiled Qt? - ]) - fi - if test ! -x $RCC; then - AC_MSG_ERROR([ - Qt RCC is not found on your qt directory - Have you compiled Qt? - ]) - fi - - test -e _Automated || mkdir _Automated - - $MOC ../../../Source/GUI/Qt/GUI_About.h -o_Automated/moc_GUI_About.cpp - $MOC ../../../Source/GUI/Qt/GUI_Help.h -o_Automated/moc_GUI_Help.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main.h -o_Automated/moc_GUI_Main.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_Core_Table.h -o_Automated/moc_GUI_Main_Core_Table.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_Core_Text.h -o_Automated/moc_GUI_Main_Core_Text.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_Output_Log.h -o_Automated/moc_GUI_Main_Output_Log.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_Output_stderr.h -o_Automated/moc_GUI_Main_Output_stderr.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_Output_Trace.h -o_Automated/moc_GUI_Main_Output_Trace.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_Technical_Table.h -o_Automated/moc_GUI_Main_Technical_Table.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_Technical_Text.h -o_Automated/moc_GUI_Main_Technical_Text.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_UndoDialog.h -o_Automated/moc_GUI_Main_UndoDialog.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_xxxx__Common.h -o_Automated/moc_GUI_Main_xxxx__Common.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_xxxx_Bext.h -o_Automated/moc_GUI_Main_xxxx_Bext.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_xxxx_CodingHistoryDialog.h -o_Automated/moc_GUI_Main_xxxx_CodingHistoryDialog.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_xxxx_DateDialog.h -o_Automated/moc_GUI_Main_xxxx_DateDialog.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_xxxx_Loudness.h -o_Automated/moc_GUI_Main_xxxx_Loudness.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_xxxx_TextEditDialog.h -o_Automated/moc_GUI_Main_xxxx_TextEditDialog.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_xxxx_TimeReferenceDialog.h -o_Automated/moc_GUI_Main_xxxx_TimeReferenceDialog.cpp - $MOC ../../../Source/GUI/Qt/GUI_Main_xxxx_UmidDialog.h -o_Automated/moc_GUI_Main_xxxx_UmidDialog.cpp - $MOC ../../../Source/GUI/Qt/GUI_Preferences.h -o_Automated/moc_GUI_Preferences.cpp - - $RCC ../../../Source/Resource/GUI_Main.qrc -o _Automated/qrc_GUI_Main.cpp -dnl fi - -dnl ------------------------------------------------------------------------- -dnl Use TinyXML -dnl -CXXFLAGS="$CXXFLAGS -DTIXML_USE_STL" - -dnl ------------------------------------------------------------------------- -dnl Use ZenLib -dnl -CXXFLAGS="$CXXFLAGS -pthread -fPIC" -LDFLAGS="$LDFLAGS -lpthread -pthread" - -dnl ------------------------------------------------------------------------- -dnl Large files -dnl -if test "$enable_large_files" = "yes"; then - CXXFLAGS="$CXXFLAGS -D_LARGE_FILES -D_FILE_OFFSET_BITS=64" - ZenLib_LargeFiles="yes" -else - ZenLib_LargeFiles="no" -fi - -dnl ######################################################################### -dnl ### C/C++ compiler options used to compile -dnl ######################################################################### - -dnl ------------------------------------------------------------------------- -dnl GNU compiler -dnl -dnl C/C++ compiler options used to compile -if test "$GXX" = yes ; then - if test "$enable_debug" = "yes"; then - CFLAGS="$CFLAGS -O0 -g -Wall -Wundef" - CXXFLAGS="$CXXFLAGS -O0 -g -Wall -W -Wundef -Wcast-qual -Wno-ctor-dtor-privacy" - else - CFLAGS="$CFLAGS -O2" - CXXFLAGS="$CXXFLAGS -O2" - fi - if test "$enable_gprof" = "yes"; then - CFLAGS="$CFLAGS -pg -g" - CXXFLAGS="$CXXFLAGS -pg -g" - fi -fi - -dnl ######################################################################### -dnl ### Compiler specific -dnl ######################################################################### - -dnl ------------------------------------------------------------------------- -case "${build}" in - powerpc-montavista* ) - CFLAGS="$CFLAGS -D__MONTAVISTA__" - CXXFLAGS="$CXXFLAGS -D__MONTAVISTA__" - ;; -esac - -dnl ------------------------------------------------------------------------- -dnl Mac Architecture and SDK -dnl -if test "$enable_universal_binary" = "yes"; then - enable_arch_x86_64=yes - enable_arch_arm64=yes -fi -if test "$enable_arch_ppc" = "yes"; then - CXXFLAGS="$CXXFLAGS -arch ppc" - CFLAGS="$CFLAGS -arch ppc" - LDFLAGS="$LDFLAGS -arch ppc" -fi -if test "$enable_arch_i386" = "yes"; then - CXXFLAGS="$CXXFLAGS -arch i386" - CFLAGS="$CFLAGS -arch i386" - LDFLAGS="$LDFLAGS -arch i386" -fi -if test "$enable_arch_x86_64" = "yes"; then - CXXFLAGS="$CXXFLAGS -arch x86_64" - CFLAGS="$CFLAGS -arch x86_64" - LDFLAGS="$LDFLAGS -arch x86_64" -fi -if test "$enable_arch_arm64" = "yes"; then - CXXFLAGS="$CXXFLAGS -arch arm64" - CFLAGS="$CFLAGS -arch arm64" - LDFLAGS="$LDFLAGS -arch arm64" -fi -if test "x$with_macosx_sdk" != xno ; then - CXXFLAGS="-isysroot $with_macosx_sdk $CXXFLAGS" - CFLAGS="-isysroot $with_macosx_sdk $CFLAGS" - LDFLAGS="-isysroot $with_macosx_sdk $LDFLAGS" -fi -if test "x$with_macosx_version_min" != xno ; then - CXXFLAGS="-mmacosx-version-min=$with_macosx_version_min $CXXFLAGS" - CFLAGS="-mmacosx-version-min=$with_macosx_version_min $CFLAGS" - LDFLAGS="-mmacosx-version-min=$with_macosx_version_min $LDFLAGS" -fi - -dnl ######################################################################### -dnl ### Output -dnl ######################################################################### - -AC_OUTPUT(Makefile) - -dnl ######################################################################### -dnl ### Report how we have been configured -dnl ######################################################################### - -echo "" -echo "Configured BWF MetaEdit for '$build'" -echo "" -echo " Using Qt? $with_qt" -echo "" -echo " CXXFLAGS: $CXXFLAGS" -echo " LIBS: $LIBS" diff --git a/Project/Mac/BR_extension_CLI.sh b/Project/Mac/BR_extension_CLI.sh deleted file mode 100644 index 05935dca..00000000 --- a/Project/Mac/BR_extension_CLI.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh - -# Because of the autotools bug -cd Project/GNU/CLI -./autogen.sh -cd ../../.. - -./CLI_Compile.sh --enable-arch-x86_64 --enable-arch-arm64 --with-macosx-version-min=10.9 diff --git a/Project/Mac/BR_extension_GUI.sh b/Project/Mac/BR_extension_GUI.sh deleted file mode 100644 index 8032796d..00000000 --- a/Project/Mac/BR_extension_GUI.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -./GUI_Compile.sh diff --git a/Project/OBS/PKGBUILD b/Project/OBS/PKGBUILD index a732138c..cf9bde20 100644 --- a/Project/OBS/PKGBUILD +++ b/Project/OBS/PKGBUILD @@ -74,9 +74,9 @@ package_bwfmetaedit-gui() { install -D -m 0644 "${srcdir}"/bwfmetaedit/Source/Resource/Image/Logo/Logo128.png "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/bwfmetaedit-gui.png install -D -m 0644 "${srcdir}"/bwfmetaedit/Source/Resource/Image/Logo/Logo128.png "${pkgdir}"/usr/share/pixmaps/bwfmetaedit-gui.png - install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/GNU/GUI/bwfmetaedit-gui.desktop "${pkgdir}"/usr/share/applications/bwfmetaedit-gui.desktop - install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/GNU/GUI/bwfmetaedit-gui.metainfo.xml "${pkgdir}"/usr/share/metainfo/bwfmetaedit-gui.metainfo.xml - install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/GNU/GUI/bwfmetaedit-gui.kde3.desktop "${pkgdir}"/usr/share/apps/konqueror/servicemenus/bwfmetaedit-gui.desktop - install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/GNU/GUI/bwfmetaedit-gui.kde4.desktop "${pkgdir}"/usr/share/kde4/services/ServiceMenus/bwfmetaedit-gui.desktop - install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/GNU/GUI/bwfmetaedit-gui.kde4.desktop "${pkgdir}"/usr/share/kservices5/ServiceMenus/bwfmetaedit-gui.desktop + install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/Unix/bwfmetaedit-gui.desktop "${pkgdir}"/usr/share/applications/bwfmetaedit-gui.desktop + install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/Unix/bwfmetaedit-gui.metainfo.xml "${pkgdir}"/usr/share/metainfo/bwfmetaedit-gui.metainfo.xml + install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/Unix/bwfmetaedit-gui.kde3.desktop "${pkgdir}"/usr/share/apps/konqueror/servicemenus/bwfmetaedit-gui.desktop + install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/Unix/bwfmetaedit-gui.kde4.desktop "${pkgdir}"/usr/share/kde4/services/ServiceMenus/bwfmetaedit-gui.desktop + install -D -m 0644 "${srcdir}"/bwfmetaedit/Project/Unix/bwfmetaedit-gui.kde4.desktop "${pkgdir}"/usr/share/kservices5/ServiceMenus/bwfmetaedit-gui.desktop } diff --git a/Project/OBS/bwfmetaedit.spec b/Project/OBS/bwfmetaedit.spec index 171c1b0a..f299e895 100644 --- a/Project/OBS/bwfmetaedit.spec +++ b/Project/OBS/bwfmetaedit.spec @@ -187,22 +187,22 @@ popd # menu-entry %__install -dm 755 %{buildroot}/%{_datadir}/applications -%__install -m 644 Project/GNU/GUI/bwfmetaedit-gui.desktop \ +%__install -m 644 Project/Unix/bwfmetaedit-gui.desktop \ %{buildroot}/%{_datadir}/applications %if 0%{?suse_version} %suse_update_desktop_file -n bwfmetaedit-gui AudioVideo AudioVideoEditing %endif %__install -dm 755 %{buildroot}/%{_datadir}/apps/konqueror/servicemenus -%__install -m 644 Project/GNU/GUI/bwfmetaedit-gui.kde3.desktop \ +%__install -m 644 Project/Unix/bwfmetaedit-gui.kde3.desktop \ %{buildroot}/%{_datadir}/apps/konqueror/servicemenus/bwfmetaedit-gui.desktop %if 0%{?suse_version} %suse_update_desktop_file -n %{buildroot}/%{_datadir}/apps/konqueror/servicemenus/bwfmetaedit-gui.desktop AudioVideo AudioVideoEditing %endif %__install -dm 755 %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/ -%__install -m 644 Project/GNU/GUI/bwfmetaedit-gui.kde4.desktop \ +%__install -m 644 Project/Unix/bwfmetaedit-gui.kde4.desktop \ %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/bwfmetaedit-gui.desktop %__install -dm 755 %{buildroot}/%{_datadir}/kservices5/ServiceMenus/ -%__install -m 644 Project/GNU/GUI/bwfmetaedit-gui.kde4.desktop \ +%__install -m 644 Project/Unix/bwfmetaedit-gui.kde4.desktop \ %{buildroot}/%{_datadir}/kservices5/ServiceMenus/bwfmetaedit-gui.desktop %if 0%{?suse_version} %suse_update_desktop_file -n %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/bwfmetaedit-gui.desktop AudioVideo AudioVideoEditing @@ -210,10 +210,10 @@ popd %endif %if 0%{?fedora_version} install -dm 755 %{buildroot}%{_datadir}/metainfo/ -install -m 644 Project/GNU/GUI/bwfmetaedit-gui.metainfo.xml %{buildroot}%{_datadir}/metainfo/bwfmetaedit-gui.metainfo.xml +install -m 644 Project/Unix/bwfmetaedit-gui.metainfo.xml %{buildroot}%{_datadir}/metainfo/bwfmetaedit-gui.metainfo.xml %else install -dm 755 %{buildroot}%{_datadir}/appdata/ -install -m 644 Project/GNU/GUI/bwfmetaedit-gui.metainfo.xml %{buildroot}%{_datadir}/appdata/bwfmetaedit-gui.appdata.xml +install -m 644 Project/Unix/bwfmetaedit-gui.metainfo.xml %{buildroot}%{_datadir}/appdata/bwfmetaedit-gui.appdata.xml %endif %clean diff --git a/Project/GNU/CLI/AddThisToRoot_CLI_compile.sh b/Project/Unix/AddThisToRoot_CLI_compile.sh similarity index 100% rename from Project/GNU/CLI/AddThisToRoot_CLI_compile.sh rename to Project/Unix/AddThisToRoot_CLI_compile.sh diff --git a/Project/QtCreator/AddThisToRoot_GUI_compile.sh b/Project/Unix/AddThisToRoot_GUI_compile.sh similarity index 99% rename from Project/QtCreator/AddThisToRoot_GUI_compile.sh rename to Project/Unix/AddThisToRoot_GUI_compile.sh index f8c40f68..1b78ff2f 100644 --- a/Project/QtCreator/AddThisToRoot_GUI_compile.sh +++ b/Project/Unix/AddThisToRoot_GUI_compile.sh @@ -22,7 +22,7 @@ Parallel_Make () { if [ "$numprocs" = "" ] || [ "$numprocs" = "0" ]; then numprocs=1 - fi + fi make -s -j$numprocs } diff --git a/Project/GNU/GUI/bwfmetaedit-gui.desktop b/Project/Unix/bwfmetaedit-gui.desktop similarity index 100% rename from Project/GNU/GUI/bwfmetaedit-gui.desktop rename to Project/Unix/bwfmetaedit-gui.desktop diff --git a/Project/GNU/GUI/bwfmetaedit-gui.kde3.desktop b/Project/Unix/bwfmetaedit-gui.kde3.desktop similarity index 100% rename from Project/GNU/GUI/bwfmetaedit-gui.kde3.desktop rename to Project/Unix/bwfmetaedit-gui.kde3.desktop diff --git a/Project/GNU/GUI/bwfmetaedit-gui.kde4.desktop b/Project/Unix/bwfmetaedit-gui.kde4.desktop similarity index 100% rename from Project/GNU/GUI/bwfmetaedit-gui.kde4.desktop rename to Project/Unix/bwfmetaedit-gui.kde4.desktop diff --git a/Project/GNU/GUI/bwfmetaedit-gui.metainfo.xml b/Project/Unix/bwfmetaedit-gui.metainfo.xml similarity index 100% rename from Project/GNU/GUI/bwfmetaedit-gui.metainfo.xml rename to Project/Unix/bwfmetaedit-gui.metainfo.xml diff --git a/Release/CleanUp.bat b/Release/CleanUp.bat deleted file mode 100644 index cd753b15..00000000 --- a/Release/CleanUp.bat +++ /dev/null @@ -1,69 +0,0 @@ -@rem echo off -@rem --- General --- -cd .. -del *.~* *.obj *.o *.tds *.dcu *.ddp *.opt *.ncb *.suo *.ilk *.idb *.pdb *.pch *.plg *.aps *.user *.win *.layout *.local *.depend *.identcache *.tgs *.tgw /Q /S -del *.~* *.obj *.o *.tds *.dcu *.ddp *.opt *.ncb *.suo *.ilk *.idb *.pdb *.pch *.plg *.aps *.user *.win *.layout *.local *.depend *.identcache *.tgs *.tgw /AH /Q /S -del *.ogg *.ogm *.avi *.mkv /Q /S -del *.ogg *.ogm *.avi *.mkv /AH /Q /S -cd Release - -@rem --- In Project files --- -cd ..\Project -del *.exe *.dll *.a *.lib *.exp *.class *.zip *.7z /Q /S -del *.exe *.dll *.a *.lib *.exp *.class *.zip *.7z /AH /Q /S -cd ..\Release - -@rem --- MS Visual Studio specific --- -cd ..\Project -rmdir MSVC\CLI\Release /Q /S -rmdir MSVC\CLI\Release_Ansi /Q /S -rmdir MSVC\ShellExtension\Release /Q /S -cd ..\Release - -@rem Borland Developper Studio specific --- -cd ..\Source -rmdir CLI\__history /Q /S -rmdir Common\__history /Q /S -rmdir GUI\__history /Q /S -rmdir GUI\Qt\__history /Q /S -rmdir GUI\Qt\_Automated\__history /Q /S -rmdir Install\__history /Q /S -cd ..\Release -cd ..\Project -rmdir BCB\__history /Q /S -rmdir BCB\CLI\__history /Q /S -rmdir BCB\CLI\Debug_Build /Q /S -rmdir BCB\CLI\Release_Build /Q /S -rmdir BCB\GUI\__history /Q /S -rmdir BCB\GUI\Debug_Build /Q /S -rmdir BCB\GUI\Release_Build /Q /S -rmdir BCB\PreRelease\__history /Q /S -rmdir BCB\PreRelease\Debug_Build /Q /S -rmdir BCB\PreRelease\Release_Build /Q /S -rmdir MSVC\CLI\Win32 /Q /S -rmdir MSVC\CLI\x64 /Q /S -rmdir MSVC\GUI\Win32 /Q /S -rmdir MSVC\GUI\x64 /Q /S -cd ..\Release - -@rem Code::Blocks specific --- -cd ..\Project -rmdir CodeBlocks\CLI\.objs /Q /S -rmdir CodeBlocks\GUI\.objs /Q /S -rmdir CodeBlocks\PreRelease\.objs /Q /S -cd ..\Release - -@rem GCC specific --- -cd ..\Project -rmdir GCC\CLI\.deps /Q /S -rmdir GCC\CLI\.objs /Q /S -rmdir GCC\CLI_WithoutLib\.deps /Q /S -rmdir GCC\CLI_WithoutLib\.objs /Q /S -rmdir GCC\GUI\.deps /Q /S -rmdir GCC\GUI\.objs /Q /S -cd ..\Release - -@rem --- Release specific --- -del *.zip *.gz *.bz2 *.lib *.dll *.exp *.a *.so *.7z /Q /S -del AVWG*.* Debug*.* /Q /S -rmdir BCB\GUI\Plugins /Q /S \ No newline at end of file diff --git a/Release/ReadMe_CLI_Linux.txt b/Release/ReadMe_CLI_Linux.txt deleted file mode 100644 index 3993aea2..00000000 --- a/Release/ReadMe_CLI_Linux.txt +++ /dev/null @@ -1,15 +0,0 @@ -BWF MetaEdit ------------- -This code was created in 2010 for the Library of Congress and the other federal government agencies participating in the Federal Agencies Digital Guidelines Initiative and it is in the public domain. - -Usage ------ -bwfmetaedit FileName (options) -bwfmetaedit --Help - - -Compilation from source ------------------------ -* at the top of the archive, ./CLI_Compile.sh -or -* cd Project/GNU/CLI/, ./configure, ./make diff --git a/Release/ReadMe_CLI_Mac.txt b/Release/ReadMe_CLI_Mac.txt deleted file mode 100644 index 610ad8a7..00000000 --- a/Release/ReadMe_CLI_Mac.txt +++ /dev/null @@ -1 +0,0 @@ -BWF MetaEdit ------------ This code was created in 2010 for the Library of Congress and the other federal government agencies participating in the Federal Agencies Digital Guidelines Initiative and it is in the public domain. Usage ----- bwfmetaedit FileName (options) bwfmetaedit --Help Compilation from source ----------------------- * at the top of the archive, ./CLI_Compile.sh or * cd Project/GNU/CLI/, ./configure, ./make \ No newline at end of file diff --git a/Release/ReadMe_GUI_Linux.txt b/Release/ReadMe_GUI_Linux.txt deleted file mode 100644 index b44e05f0..00000000 --- a/Release/ReadMe_GUI_Linux.txt +++ /dev/null @@ -1,15 +0,0 @@ -BWF MetaEdit ------------- -This code was created in 2010 for the Library of Congress and the other federal government agencies participating in the Federal Agencies Digital Guidelines Initiative and it is in the public domain. - -Usage ------ -bwfmetaedit-gui - - -Compilation from source ------------------------ -* at the top of the archive, ./GUI_Compile.sh -or -* cd Project/GNU/GUI/, ./configure, ./make - diff --git a/Release/ReadMe_GUI_Mac.txt b/Release/ReadMe_GUI_Mac.txt deleted file mode 100644 index 25b47bc3..00000000 --- a/Release/ReadMe_GUI_Mac.txt +++ /dev/null @@ -1 +0,0 @@ -BWF MetaEdit ------------ This code was created in 2010 for the Library of Congress and the other federal government agencies participating in the Federal Agencies Digital Guidelines Initiative and it is in the public domain. Usage ----- bwfmetaedit-gui Compilation from source ----------------------- * at the top of the archive, ./GUI_Compile.sh or * cd Project/GNU/GUI/, ./configure, ./make \ No newline at end of file diff --git a/Release/Release_All_GNU_FromSource.sh b/Release/Release_All_GNU_FromSource.sh deleted file mode 100644 index f96307d2..00000000 --- a/Release/Release_All_GNU_FromSource.sh +++ /dev/null @@ -1,120 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Clean up -test -e BWF_MetaEdit_GNU_FromSource.tar && rm BWF_MetaEdit_GNU_FromSource.tar -test -e BWF_MetaEdit_GNU_FromSource.tar.bz2 && rm BWF_MetaEdit_GNU_FromSource.tar.bz2 -test -d BWF_MetaEdit_GNU_FromSource && rm -r BWF_MetaEdit_GNU_FromSource -mkdir BWF_MetaEdit_GNU_FromSource - - -#----------------------------------------------------------------------- -# Preparing : Project -cd ../Project/GNU/CLI -chmod u+x autogen -./autogen -cd ../../../Release -cd ../Project/GNU/GUI -chmod u+x autogen -./autogen -cd ../../../Release - - -#----------------------------------------------------------------------- -# Copying : Project -mkdir -p BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI -cp ../Project/GNU/CLI/aclocal.m4 BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/autogen BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/config.guess BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/config.sub BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/configure BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/configure.ac BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/depcomp BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/install-sh BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/Makefile.am BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/Makefile.in BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -cp ../Project/GNU/CLI/missing BWF_MetaEdit_GNU_FromSource/Project/GNU/CLI/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI -cp ../Project/GNU/GUI/aclocal.m4 BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/autogen BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/config.guess BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/config.sub BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/configure BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/configure.ac BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/depcomp BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/install-sh BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/Makefile.am BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/Makefile.in BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ -cp ../Project/GNU/GUI/missing BWF_MetaEdit_GNU_FromSource/Project/GNU/GUI/ - -#----------------------------------------------------------------------- -# Copying : Source -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/CLI -cp -r ../Source/CLI/*.h BWF_MetaEdit_GNU_FromSource/Source/CLI/ -cp -r ../Source/CLI/*.cpp BWF_MetaEdit_GNU_FromSource/Source/CLI/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/Common -cp -r ../Source/Common/*.h BWF_MetaEdit_GNU_FromSource/Source/Common/ -cp -r ../Source/Common/*.cpp BWF_MetaEdit_GNU_FromSource/Source/Common/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/GUI/Qt -cp -r ../Source/GUI/Qt/*.h BWF_MetaEdit_GNU_FromSource/Source/GUI/Qt/ -cp -r ../Source/GUI/Qt/*.cpp BWF_MetaEdit_GNU_FromSource/Source/GUI/Qt/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/MD5 -cp -r ../Source/MD5/*.h BWF_MetaEdit_GNU_FromSource/Source/MD5/ -cp -r ../Source/MD5/*.c BWF_MetaEdit_GNU_FromSource/Source/MD5/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/Resource -cp -r ../Source/Resource/*.qrc BWF_MetaEdit_GNU_FromSource/Source/Resource/ -cp -r ../Source/Resource/*.html BWF_MetaEdit_GNU_FromSource/Source/Resource/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/Resource/Image/Menu -cp -r ../Source/Resource/Image/Menu/*.png BWF_MetaEdit_GNU_FromSource/Source/Resource/Image/Menu/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/Resource/Image/Logo -cp -r ../Source/Resource/Image/Logo/*.png BWF_MetaEdit_GNU_FromSource/Source/Resource/Image/Logo/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/Resource/Documentation -cp -r ../Source/Resource/Documentation/*.html BWF_MetaEdit_GNU_FromSource/Source/Resource/Documentation/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/Riff -cp -r ../Source/Riff/*.h BWF_MetaEdit_GNU_FromSource/Source/Riff/ -cp -r ../Source/Riff/*.cpp BWF_MetaEdit_GNU_FromSource/Source/Riff/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/TinyXml -cp -r ../Source/TinyXml/*.h BWF_MetaEdit_GNU_FromSource/Source/TinyXml/ -cp -r ../Source/TinyXml/*.cpp BWF_MetaEdit_GNU_FromSource/Source/TinyXml/ -mkdir -p BWF_MetaEdit_GNU_FromSource/Source/ZenLib -cp -r ../Source/ZenLib/*.h BWF_MetaEdit_GNU_FromSource/Source/ZenLib/ -cp -r ../Source/ZenLib/*.cpp BWF_MetaEdit_GNU_FromSource/Source/ZenLib/ - -#----------------------------------------------------------------------- -# Copying : Release -mkdir -p BWF_MetaEdit_GNU_FromSource/Release -cp *.sub BWF_MetaEdit_GNU_FromSource/Release/ -cp *.sh BWF_MetaEdit_GNU_FromSource/Release/ -chmod u+x BWF_MetaEdit_GNU_FromSource/Release/*.sh - -#----------------------------------------------------------------------- -# Copying : Information -cp ../License.html BWF_MetaEdit_GNU_FromSource/ -cp ../History*.txt BWF_MetaEdit_GNU_FromSource/ -cp ../conformance_point_document.xsd BWF_MetaEdit_GNU_FromSource/ -dos2unix BWF_MetaEdit_GNU_FromSource/History*.txt -cp ReadMe_CLI_Linux.txt BWF_MetaEdit_GNU_FromSource/Release/ -cp ReadMe_CLI_Mac.txt BWF_MetaEdit_GNU_FromSource/Release/ -cp ReadMe_GUI_Linux.txt BWF_MetaEdit_GNU_FromSource/Release/ -cp ReadMe_GUI_Mac.txt BWF_MetaEdit_GNU_FromSource/Release/ - - -#----------------------------------------------------------------------- -# Preparing Archive : BWF_MetaEdit -mv BWF_MetaEdit_GNU_FromSource BWF_MetaEdit - -#----------------------------------------------------------------------- -# Preparing Archive : Automation -cp ../Project/GNU/CLI/AddThisToRoot_CLI_compile.sh BWF_MetaEdit/CLI_Compile.sh -chmod u+x BWF_MetaEdit/CLI_Compile.sh -cp ../Project/GNU/GUI/AddThisToRoot_GUI_compile.sh BWF_MetaEdit/GUI_Compile.sh -chmod u+x BWF_MetaEdit/GUI_Compile.sh - - -#----------------------------------------------------------------------- -# Compressing Archive -tar jchf BWF_MetaEdit_GNU_FromSource.tar.bz2 BWF_MetaEdit/* - -#----------------------------------------------------------------------- -# Clean up -rm -r BWF_MetaEdit diff --git a/Release/Release_CLI_GNU.sub b/Release/Release_CLI_GNU.sub deleted file mode 100644 index c0576c4b..00000000 --- a/Release/Release_CLI_GNU.sub +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# $1=OS, $2=Platform -Release_CLI() -{ -#----------------------------------------------------------------------- -# Clean up -test -e BWF_MetaEdit_CLI_$1_$2.tar && rm BWF_MetaEdit_CLI_$1_$2.tar -test -e BWF_MetaEdit_CLI_$1_$2.tar.bz2 && rm BWF_MetaEdit_CLI_$1_$2.tar.bz2 -test -d BWF_MetaEdit_CLI_$1_$2 && rm -r BWF_MetaEdit_CLI_$1_$2 -mkdir BWF_MetaEdit_CLI_$1_$2 - -#----------------------------------------------------------------------- -# Copying : Exe -cp ../Project/GNU/CLI/bwfmetaedit BWF_MetaEdit_CLI_$1_$2/bwfmetaedit -cd BWF_MetaEdit_CLI_$1_$2 -strip bwfmetaedit -cd .. - -#----------------------------------------------------------------------- -# Copying : Information file -cp ../License.html BWF_MetaEdit_CLI_$1_$2/ -cp ../History_CLI.txt BWF_MetaEdit_CLI_$1_$2/History.txt -cp ../conformance_point_document.xsd BWF_MetaEdit_CLI_$1_$2/ -cp ReadMe_CLI_$1.txt BWF_MetaEdit_CLI_$1_$2/ReadMe.txt - -#----------------------------------------------------------------------- -# Compressing Archive -tar jchf BWF_MetaEdit_CLI_$1_$2.tar.bz2 BWF_MetaEdit_CLI_$1_$2 - -#----------------------------------------------------------------------- -# Clean up -#if "%1"=="SkipCleanUp" goto SkipCleanUp -#rm -r BWF_MetaEdit_CLI_$1_$2 -#:SkipCleanUp -} - diff --git a/Release/Release_CLI_Linux_IA64.sh b/Release/Release_CLI_Linux_IA64.sh deleted file mode 100644 index 65ce68b4..00000000 --- a/Release/Release_CLI_Linux_IA64.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_CLI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_CLI Linux IA64 diff --git a/Release/Release_CLI_Linux_i386.sh b/Release/Release_CLI_Linux_i386.sh deleted file mode 100644 index 5fd54833..00000000 --- a/Release/Release_CLI_Linux_i386.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_CLI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_CLI Linux i386 diff --git a/Release/Release_CLI_Linux_x64.sh b/Release/Release_CLI_Linux_x64.sh deleted file mode 100644 index cd58a461..00000000 --- a/Release/Release_CLI_Linux_x64.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_CLI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_CLI Linux x64 diff --git a/Release/Release_CLI_Mac_Intel.sh b/Release/Release_CLI_Mac_Intel.sh deleted file mode 100644 index 38d47c23..00000000 --- a/Release/Release_CLI_Mac_Intel.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_CLI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_CLI Mac Intel diff --git a/Release/Release_CLI_Mac_PPC.sh b/Release/Release_CLI_Mac_PPC.sh deleted file mode 100644 index ac0f281d..00000000 --- a/Release/Release_CLI_Mac_PPC.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_CLI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_CLI Mac PPC diff --git a/Release/Release_CLI_Mac_Universal.sh b/Release/Release_CLI_Mac_Universal.sh deleted file mode 100644 index 7d80831c..00000000 --- a/Release/Release_CLI_Mac_Universal.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_CLI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_CLI Mac Universal diff --git a/Release/Release_GUI_GNU.sub b/Release/Release_GUI_GNU.sub deleted file mode 100644 index 917d0078..00000000 --- a/Release/Release_GUI_GNU.sub +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# $1=OS, $2=Platform -Release_GUI() -{ -#----------------------------------------------------------------------- -# Clean up -test -e BWF_MetaEdit_GUI_$1_$2.tar && rm BWF_MetaEdit_GUI_$1_$2.tar -test -e BWF_MetaEdit_GUI_$1_$2.tar.bz2 && rm BWF_MetaEdit_GUI_$1_$2.tar.bz2 -test -d BWF_MetaEdit_GUI_$1_$2 && rm -r BWF_MetaEdit_GUI_$1_$2 -mkdir BWF_MetaEdit_GUI_$1_$2 - -#----------------------------------------------------------------------- -# Copying : Exe -cp ../Project/GNU/GUI/bwfmetaedit-gui BWF_MetaEdit_GUI_$1_$2/bwfmetaedit-gui -cd BWF_MetaEdit_GUI_$1_$2 -strip bwfmetaedit-gui -cd .. - -#----------------------------------------------------------------------- -# Copying : Information file -cp ../License.html BWF_MetaEdit_GUI_$1_$2/ -cp ../History_GUI.txt BWF_MetaEdit_GUI_$1_$2/History.txt -cp ../conformance_point_document.xsd BWF_MetaEdit_GUI_$1_$2 -cp ReadMe_GUI_$1.txt BWF_MetaEdit_GUI_$1_$2/ReadMe.txt - -#----------------------------------------------------------------------- -# Compressing Archive -tar jchf BWF_MetaEdit_GUI_$1_$2.tar.bz2 BWF_MetaEdit_GUI_$1_$2 - -#----------------------------------------------------------------------- -# Clean up -#if "%1"=="SkipCleanUp" goto SkipCleanUp -#rm -r BWF_MetaEdit_GUI_$1_$2 -#:SkipCleanUp -} - diff --git a/Release/Release_GUI_Linux_i386.sh b/Release/Release_GUI_Linux_i386.sh deleted file mode 100644 index 1953bbbc..00000000 --- a/Release/Release_GUI_Linux_i386.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_GUI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_GUI Linux i386 diff --git a/Release/Release_GUI_Linux_x64.sh b/Release/Release_GUI_Linux_x64.sh deleted file mode 100644 index 148979c4..00000000 --- a/Release/Release_GUI_Linux_x64.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_GUI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_GUI Linux x64 diff --git a/Release/Release_GUI_Mac_Intel.sh b/Release/Release_GUI_Mac_Intel.sh deleted file mode 100644 index c36aa1ec..00000000 --- a/Release/Release_GUI_Mac_Intel.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_GUI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_GUI Mac Intel diff --git a/Release/Release_GUI_Mac_PPC.sh b/Release/Release_GUI_Mac_PPC.sh deleted file mode 100644 index 3b48804c..00000000 --- a/Release/Release_GUI_Mac_PPC.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_GUI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_GUI Mac PPC diff --git a/Release/Release_GUI_Mac_Universal.sh b/Release/Release_GUI_Mac_Universal.sh deleted file mode 100644 index 9be1ad84..00000000 --- a/Release/Release_GUI_Mac_Universal.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -#----------------------------------------------------------------------- -# Default script -. ./Release_GUI_GNU.sub - -#----------------------------------------------------------------------- -# Launch -Release_GUI Mac Universal diff --git a/Release/Release_Source.sh b/Release/Release_Source.sh index f4d8f932..21235d70 100755 --- a/Release/Release_Source.sh +++ b/Release/Release_Source.sh @@ -41,10 +41,9 @@ pushd "${temp_directory}" cp -r "${release_directory}/.." BWFMetaEdit_CLI_GNU_FromSource # Script preparation - mv BWFMetaEdit_CLI_GNU_FromSource/Project/GNU/CLI/AddThisToRoot_CLI_compile.sh BWFMetaEdit_CLI_GNU_FromSource/CLI_Compile.sh + mv BWFMetaEdit_CLI_GNU_FromSource/Project/Unix/AddThisToRoot_CLI_compile.sh BWFMetaEdit_CLI_GNU_FromSource/CLI_Compile.sh chmod +x BWFMetaEdit_CLI_GNU_FromSource/CLI_Compile.sh chmod +x BWFMetaEdit_CLI_GNU_FromSource/Project/GNU/CLI/autogen.sh - chmod +x BWFMetaEdit_CLI_GNU_FromSource/Project/Mac/BR_extension_CLI.sh chmod +x BWFMetaEdit_CLI_GNU_FromSource/Project/Mac/mkdmg.sh # Autotools @@ -60,8 +59,9 @@ pushd "${temp_directory}" rm -rf BWFMetaEdit_CLI_GNU_FromSource/debian rm -rf BWFMetaEdit_CLI_GNU_FromSource/Project/MSVC2022 rm -rf BWFMetaEdit_CLI_GNU_FromSource/Project/OBS - rm -rf BWFMetaEdit_CLI_GNU_FromSource/Project/GNU/GUI + rm -rf BWFMetaEdit_CLI_GNU_FromSource/Project/Unix rm -rf BWFMetaEdit_CLI_GNU_FromSource/Project/QtCreator + rm -rf BWFMetaEdit_CLI_GNU_FromSource/Project/CMake/GUI rm -rf BWFMetaEdit_CLI_GNU_FromSource/Project/Mac/*_GUI.sh rm -rf BWFMetaEdit_CLI_GNU_FromSource/Source/GUI rm -rf BWFMetaEdit_CLI_GNU_FromSource/Source/Resource @@ -80,9 +80,8 @@ pushd "${temp_directory}" cp -r "${release_directory}/.." BWFMetaEdit_GUI_GNU_FromSource # Script preparation - mv BWFMetaEdit_GUI_GNU_FromSource/Project/QtCreator/AddThisToRoot_GUI_compile.sh BWFMetaEdit_GUI_GNU_FromSource/GUI_Compile.sh + mv BWFMetaEdit_GUI_GNU_FromSource/Project/Unix/AddThisToRoot_GUI_compile.sh BWFMetaEdit_GUI_GNU_FromSource/GUI_Compile.sh chmod +x BWFMetaEdit_GUI_GNU_FromSource/GUI_Compile.sh - chmod +x BWFMetaEdit_GUI_GNU_FromSource/Project/Mac/BR_extension_GUI.sh chmod +x BWFMetaEdit_GUI_GNU_FromSource/Project/Mac/mkdmg.sh # Remove what is not wanted @@ -94,6 +93,7 @@ pushd "${temp_directory}" rm -rf BWFMetaEdit_GUI_GNU_FromSource/Project/MSVC2022 rm -rf BWFMetaEdit_GUI_GNU_FromSource/Project/OBS rm -rf BWFMetaEdit_GUI_GNU_FromSource/Project/GNU/CLI + rm -rf BWFMetaEdit_GUI_GNU_FromSource/Project/CMake/CLI rm -rf BWFMetaEdit_GUI_GNU_FromSource/Project/Mac/*_CLI.sh rm -rf BWFMetaEdit_GUI_GNU_FromSource/Source/CLI diff --git a/Release/UpgradeVersion.sh b/Release/UpgradeVersion.sh index 727cc2c4..6f272cef 100755 --- a/Release/UpgradeVersion.sh +++ b/Release/UpgradeVersion.sh @@ -39,7 +39,7 @@ files_dot=( "${release_directory}/../Project/OBS/bwfmetaedit.spec" "${release_directory}/../Project/OBS/bwfmetaedit.dsc" "${release_directory}/../Project/OBS/PKGBUILD" - "${release_directory}/../Project/GNU/GUI/bwfmetaedit-gui.metainfo.xml" + "${release_directory}/../Project/Unix/bwfmetaedit-gui.metainfo.xml" "${release_directory}/../Project/Mac/Info.plist" "${release_directory}/../Source/Common/Common_About.cpp" "${release_directory}/../Source/Install/BWF_MetaEdit_GUI_Windows_i386.nsi" @@ -84,7 +84,7 @@ fi #----------------------------------------------------------------------- # Processing metainfo.xml date date_YYYY_MM_DD="$(LC_ALL=C date -u +%Y-%m-%d)" -sed -i "s/date=\"[0-9-]\+\"/date=\"${date_YYYY_MM_DD}\"/g" "${release_directory}/../Project/GNU/GUI/bwfmetaedit-gui.metainfo.xml" +sed -i "s/date=\"[0-9-]\+\"/date=\"${date_YYYY_MM_DD}\"/g" "${release_directory}/../Project/Unix/bwfmetaedit-gui.metainfo.xml" #----------------------------------------------------------------------- # Update changelogs diff --git a/debian/rules b/debian/rules index 501d04ae..9c03b9ee 100644 --- a/debian/rules +++ b/debian/rules @@ -125,15 +125,15 @@ endif install -m 644 Source/Resource/Image/Logo/Logo128.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/128x128/apps/bwfmetaedit.png install -dm 755 $(CURDIR)/debian/tmp/usr/share/applications - install -m 644 Project/GNU/GUI/bwfmetaedit-gui.desktop $(CURDIR)/debian/tmp/usr/share/applications + install -m 644 Project/Unix/bwfmetaedit-gui.desktop $(CURDIR)/debian/tmp/usr/share/applications install -dm 755 $(CURDIR)/debian/tmp/usr/share/apps/konqueror/servicemenus/ - install -m 644 Project/GNU/GUI/bwfmetaedit-gui.kde3.desktop $(CURDIR)/debian/tmp/usr/share/apps/konqueror/servicemenus/bwfmetaedit-gui.desktop + install -m 644 Project/Unix/bwfmetaedit-gui.kde3.desktop $(CURDIR)/debian/tmp/usr/share/apps/konqueror/servicemenus/bwfmetaedit-gui.desktop install -dm 755 $(CURDIR)/debian/tmp/usr/share/kde4/services/ServiceMenus/ - install -m 644 Project/GNU/GUI/bwfmetaedit-gui.kde4.desktop $(CURDIR)/debian/tmp/usr/share/kde4/services/ServiceMenus/bwfmetaedit-gui.desktop + install -m 644 Project/Unix/bwfmetaedit-gui.kde4.desktop $(CURDIR)/debian/tmp/usr/share/kde4/services/ServiceMenus/bwfmetaedit-gui.desktop install -dm 755 $(CURDIR)/debian/tmp/usr/share/kservices5/ServiceMenus/ - install -m 644 Project/GNU/GUI/bwfmetaedit-gui.kde4.desktop $(CURDIR)/debian/tmp/usr/share/kservices5/ServiceMenus/bwfmetaedit-gui.desktop + install -m 644 Project/Unix/bwfmetaedit-gui.kde4.desktop $(CURDIR)/debian/tmp/usr/share/kservices5/ServiceMenus/bwfmetaedit-gui.desktop install -dm 755 $(CURDIR)/debian/tmp/usr/share/appdata - install -m 644 Project/GNU/GUI/bwfmetaedit-gui.metainfo.xml $(CURDIR)/debian/tmp/usr/share/appdata/bwfmetaedit-gui.appdata.xml + install -m 644 Project/Unix/bwfmetaedit-gui.metainfo.xml $(CURDIR)/debian/tmp/usr/share/appdata/bwfmetaedit-gui.appdata.xml # Build architecture-independent files here. binary-indep: build install From 81d9f9198280ff60edab0e0d6f20c74d69eac555 Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Fri, 11 Sep 2026 22:25:58 +0200 Subject: [PATCH 2/2] Add CMake projects for CLI and GUI Signed-off-by: Maxime Gervais --- .gitignore | 6 + Project/CMake/CLI/CMakeLists.txt | 167 ++++++++++ Project/CMake/CLI/bwfmetaedit.rc | 34 ++ Project/CMake/GUI/CMakeLists.txt | 306 ++++++++++++++++++ Project/CMake/GUI/bwfmetaedit-gui.rc | 37 +++ Project/Mac/Make_xcarchive.sh | 2 +- Project/Mac/mkdmg.sh | 15 +- Project/OBS/PKGBUILD | 26 +- Project/OBS/bwfmetaedit.dsc | 2 +- Project/OBS/bwfmetaedit.spec | 59 ++-- Release/Build_GUI_Windows.ps1 | 18 +- Release/Release_CLI_Mac.sh | 11 +- Release/Release_GUI_Mac.sh | 12 +- Release/Release_GUI_Windows.ps1 | 2 +- Release/Release_OBS.sh | 1 + Release/UpgradeVersion.sh | 2 + .../Install/BWF_MetaEdit_GUI_Windows_i386.nsi | 2 +- .../Install/BWF_MetaEdit_GUI_Windows_x64.nsi | 2 +- debian/control | 2 +- debian/rules | 28 +- 20 files changed, 631 insertions(+), 103 deletions(-) create mode 100644 Project/CMake/CLI/CMakeLists.txt create mode 100755 Project/CMake/CLI/bwfmetaedit.rc create mode 100644 Project/CMake/GUI/CMakeLists.txt create mode 100644 Project/CMake/GUI/bwfmetaedit-gui.rc diff --git a/.gitignore b/.gitignore index a0ff2447..513eff23 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,9 @@ Project/MSVC2022/Win32 Project/MSVC2022/x64 Project/MSVC2022/CLI/Win32 Project/MSVC2022/CLI/x64 +Project/CMake/CLI/build +Project/CMake/GUI/build +Project/CMake/CLI/Win32 +Project/CMake/CLI/x64 +Project/CMake/GUI/Win32 +Project/CMake/GUI/x64 diff --git a/Project/CMake/CLI/CMakeLists.txt b/Project/CMake/CLI/CMakeLists.txt new file mode 100644 index 00000000..d8f6c01c --- /dev/null +++ b/Project/CMake/CLI/CMakeLists.txt @@ -0,0 +1,167 @@ +cmake_minimum_required(VERSION 3.16) + +project(bwfmetaedit LANGUAGES CXX C) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE) +endif() + +option(ENABLE_C2PA "Enable C2PA support" OFF) +option(C2PA_DYNAMIC "Load the C2PA library dynamically at runtime" OFF) + +get_filename_component(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../Source" ABSOLUTE) + +set(HEADERS + ${SOURCE_DIR}/CLI/CLI_Help.h + ${SOURCE_DIR}/CLI/CommandLine_Parser.h + ${SOURCE_DIR}/Common/Common_About.h + ${SOURCE_DIR}/Common/Codes.h + ${SOURCE_DIR}/Common/Core.h + ${SOURCE_DIR}/MD5/md5.h + ${SOURCE_DIR}/Riff/Riff_Base.h + ${SOURCE_DIR}/Riff/Riff_Chunks.h + ${SOURCE_DIR}/Riff/Riff_Handler.h + ${SOURCE_DIR}/TinyXml2/tinyxml2.h + ${SOURCE_DIR}/ZenLib/BitStream.h + ${SOURCE_DIR}/ZenLib/BitStream_Fast.h + ${SOURCE_DIR}/ZenLib/BitStream_LE.h + ${SOURCE_DIR}/ZenLib/Conf.h + ${SOURCE_DIR}/ZenLib/Conf_Internal.h + ${SOURCE_DIR}/ZenLib/CriticalSection.h + ${SOURCE_DIR}/ZenLib/Dir.h + ${SOURCE_DIR}/ZenLib/File.h + ${SOURCE_DIR}/ZenLib/FileName.h + ${SOURCE_DIR}/ZenLib/InfoMap.h + ${SOURCE_DIR}/ZenLib/int128s.h + ${SOURCE_DIR}/ZenLib/int128u.h + ${SOURCE_DIR}/ZenLib/MemoryDebug.h + ${SOURCE_DIR}/ZenLib/MemoryUtils.h + ${SOURCE_DIR}/ZenLib/OS_Utils.h + ${SOURCE_DIR}/ZenLib/Thread.h + ${SOURCE_DIR}/ZenLib/Trace.h + ${SOURCE_DIR}/ZenLib/Translation.h + ${SOURCE_DIR}/ZenLib/Utils.h + ${SOURCE_DIR}/ZenLib/Ztring.h + ${SOURCE_DIR}/ZenLib/ZtringList.h + ${SOURCE_DIR}/ZenLib/ZtringListList.h + ${SOURCE_DIR}/ZenLib/ZtringListListF.h +) + +set(SOURCES + ${SOURCE_DIR}/CLI/CLI_Help.cpp + ${SOURCE_DIR}/CLI/CLI_Main.cpp + ${SOURCE_DIR}/CLI/CommandLine_Parser.cpp + ${SOURCE_DIR}/Common/Common_About.cpp + ${SOURCE_DIR}/Common/Codes.cpp + ${SOURCE_DIR}/Common/Core.cpp + ${SOURCE_DIR}/MD5/md5.c + ${SOURCE_DIR}/Riff/Riff_Base.cpp + ${SOURCE_DIR}/Riff/Riff_Base_Streams.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE__PMX.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_aXML.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_bext.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_data.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_ds64.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_FLLR.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_fmt_.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_INFO.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_INFO_xxxx.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_iXML.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_MD5_.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_cue_.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_adtl.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_adtl_labl.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_adtl_note.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_adtl_ltxt.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_CSET.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_C2PA.cpp + ${SOURCE_DIR}/Riff/Riff_Handler.cpp + ${SOURCE_DIR}/TinyXml2/tinyxml2.cpp + ${SOURCE_DIR}/ZenLib/Conf.cpp + ${SOURCE_DIR}/ZenLib/CriticalSection.cpp + ${SOURCE_DIR}/ZenLib/Dir.cpp + ${SOURCE_DIR}/ZenLib/File.cpp + ${SOURCE_DIR}/ZenLib/FileName.cpp + ${SOURCE_DIR}/ZenLib/InfoMap.cpp + ${SOURCE_DIR}/ZenLib/int128s.cpp + ${SOURCE_DIR}/ZenLib/int128u.cpp + ${SOURCE_DIR}/ZenLib/MemoryDebug.cpp + ${SOURCE_DIR}/ZenLib/OS_Utils.cpp + ${SOURCE_DIR}/ZenLib/Translation.cpp + ${SOURCE_DIR}/ZenLib/Thread.cpp + ${SOURCE_DIR}/ZenLib/Utils.cpp + ${SOURCE_DIR}/ZenLib/Ztring.cpp + ${SOURCE_DIR}/ZenLib/ZtringList.cpp + ${SOURCE_DIR}/ZenLib/ZtringListList.cpp + ${SOURCE_DIR}/ZenLib/ZtringListListF.cpp +) + +if(ENABLE_C2PA) + list(APPEND SOURCES ${SOURCE_DIR}/Riff/Riff_C2PA_Helpers.cpp) + list(APPEND HEADERS + ${SOURCE_DIR}/ThirdParty/json/json.h + ${SOURCE_DIR}/Riff/Riff_C2PA_Helpers.h + ${SOURCE_DIR}/Riff/Riff_C2PA_Helpers_CA.h + ) +endif() + +if(WIN32) + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + set(C2PA_TARGET_DIR ${SOURCE_DIR}/ThirdParty/c2pa-rs/target/i686-pc-windows-msvc/release) + else() + set(C2PA_TARGET_DIR ${SOURCE_DIR}/ThirdParty/c2pa-rs/target/x86_64-pc-windows-msvc/release) + endif() +else() + set(C2PA_TARGET_DIR ${SOURCE_DIR}/ThirdParty/c2pa-rs/target/release) +endif() + +set(TARGET_NAME bwfmetaedit) + +if(WIN32) + add_executable(${TARGET_NAME} ${SOURCES} ${HEADERS} + ${SOURCE_DIR}/../Project/CMake/CLI/bwfmetaedit.rc) +else() + add_executable(${TARGET_NAME} ${SOURCES} ${HEADERS}) +endif() + +target_include_directories(${TARGET_NAME} PRIVATE ${SOURCE_DIR}) + +target_compile_definitions(${TARGET_NAME} PRIVATE + TIXML_USE_STL + UNICODE + _UNICODE + _LARGE_FILES + _FILE_OFFSET_BITS=64 +) + +if(NOT WIN32) + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + target_link_libraries(${TARGET_NAME} PRIVATE Threads::Threads) +endif() + +if(ENABLE_C2PA) + target_compile_definitions(${TARGET_NAME} PRIVATE ENABLE_C2PA) + target_include_directories(${TARGET_NAME} PRIVATE ${C2PA_TARGET_DIR}) + + if(C2PA_DYNAMIC) + target_compile_definitions(${TARGET_NAME} PRIVATE C2PA_DYNAMIC_LOADING) + if(NOT WIN32) + target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS}) + endif() + elseif(WIN32) + target_link_libraries(${TARGET_NAME} PRIVATE ${C2PA_TARGET_DIR}/c2pa_c.dll.lib) + else() + target_link_directories(${TARGET_NAME} PRIVATE ${C2PA_TARGET_DIR}) + target_link_libraries(${TARGET_NAME} PRIVATE c2pa_c) + endif() +endif() + +include(GNUInstallDirs) +install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/Project/CMake/CLI/bwfmetaedit.rc b/Project/CMake/CLI/bwfmetaedit.rc new file mode 100755 index 00000000..a220bd2f --- /dev/null +++ b/Project/CMake/CLI/bwfmetaedit.rc @@ -0,0 +1,34 @@ +#include + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 26,08,0,0 + PRODUCTVERSION 26,08,0,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "MediaArea.net" + VALUE "FileDescription", "BWF MetaEdit" + VALUE "FileVersion", "26.08.0.0" + VALUE "InternalName", "BWF MetaEdit - CLI" + VALUE "LegalCopyright", "MediaArea.net" + VALUE "OriginalFilename", "bwfmetaedit.exe" + VALUE "ProductName", "BWF MetaEdit" + VALUE "ProductVersion", "26.08.0.0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/Project/CMake/GUI/CMakeLists.txt b/Project/CMake/GUI/CMakeLists.txt new file mode 100644 index 00000000..844936dd --- /dev/null +++ b/Project/CMake/GUI/CMakeLists.txt @@ -0,0 +1,306 @@ +cmake_minimum_required(VERSION 3.16) + +project(bwfmetaedit-gui LANGUAGES CXX C) + +# Qt6 requires C++17 at minimum +# Prefer Qt6, fall back to Qt5 if not found +find_package(Qt6 COMPONENTS Core QUIET) +if(Qt6_FOUND) + set(QT_VERSION_MAJOR 6) +else() + find_package(Qt5 REQUIRED COMPONENTS Core) + set(QT_VERSION_MAJOR 5) +endif() + +if(QT_VERSION_MAJOR EQUAL 6) + set(CMAKE_CXX_STANDARD 17) +else() + set(CMAKE_CXX_STANDARD 11) +endif() +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE) +endif() + +if(APPLE) + enable_language(OBJCXX) +endif() + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +option(ENABLE_C2PA "Enable C2PA support" OFF) +option(C2PA_DYNAMIC "Load the C2PA library dynamically at runtime" OFF) +option(MACSTORE "Build for the Mac App Store" OFF) +option(WIN32_CONSOLE "On Windows, build as a console app so qWarning/qDebug show up when run from a terminal" OFF) + +get_filename_component(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../Source" ABSOLUTE) + +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets Quick QuickWidgets QuickControls2 Svg) + +set(HEADERS + ${SOURCE_DIR}/Common/Common_About.h + ${SOURCE_DIR}/Common/Codes.h + ${SOURCE_DIR}/Common/Core.h + ${SOURCE_DIR}/GUI/Qt/App.h + ${SOURCE_DIR}/GUI/Qt/GUI_About.h + ${SOURCE_DIR}/GUI/Qt/GUI_Help.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Core_Table.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_PerFile.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Core_Text.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Output_Log.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Output_Trace.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Technical_Table.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Technical_Text.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_UndoDialog.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_Bext.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_CodingHistoryDialog.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_DateDialog.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_Loudness.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_TextEditDialog.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_TimeReferenceDialog.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_UmidDialog.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_EditMenu.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_CueDialog.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_CodePageDialog.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx__Common.h + ${SOURCE_DIR}/GUI/Qt/GUI_Colors.h + ${SOURCE_DIR}/GUI/Qt/GUI_Preferences.h + ${SOURCE_DIR}/MD5/md5.h + ${SOURCE_DIR}/Riff/Riff_Base.h + ${SOURCE_DIR}/Riff/Riff_Chunks.h + ${SOURCE_DIR}/Riff/Riff_Handler.h + ${SOURCE_DIR}/TinyXml2/tinyxml2.h + ${SOURCE_DIR}/ZenLib/BitStream.h + ${SOURCE_DIR}/ZenLib/BitStream_Fast.h + ${SOURCE_DIR}/ZenLib/BitStream_LE.h + ${SOURCE_DIR}/ZenLib/Conf.h + ${SOURCE_DIR}/ZenLib/Conf_Internal.h + ${SOURCE_DIR}/ZenLib/CriticalSection.h + ${SOURCE_DIR}/ZenLib/Dir.h + ${SOURCE_DIR}/ZenLib/File.h + ${SOURCE_DIR}/ZenLib/FileName.h + ${SOURCE_DIR}/ZenLib/InfoMap.h + ${SOURCE_DIR}/ZenLib/int128s.h + ${SOURCE_DIR}/ZenLib/int128u.h + ${SOURCE_DIR}/ZenLib/MemoryDebug.h + ${SOURCE_DIR}/ZenLib/MemoryUtils.h + ${SOURCE_DIR}/ZenLib/OS_Utils.h + ${SOURCE_DIR}/ZenLib/PreComp.h + ${SOURCE_DIR}/ZenLib/Thread.h + ${SOURCE_DIR}/ZenLib/Trace.h + ${SOURCE_DIR}/ZenLib/Translation.h + ${SOURCE_DIR}/ZenLib/Utils.h + ${SOURCE_DIR}/ZenLib/Ztring.h + ${SOURCE_DIR}/ZenLib/ZtringList.h + ${SOURCE_DIR}/ZenLib/ZtringListList.h + ${SOURCE_DIR}/ZenLib/ZtringListListF.h +) + +set(SOURCES + ${SOURCE_DIR}/Common/Common_About.cpp + ${SOURCE_DIR}/Common/Codes.cpp + ${SOURCE_DIR}/Common/Core.cpp + ${SOURCE_DIR}/GUI/Qt/App.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_About.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Help.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Core_Table.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_PerFile.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Core_Text.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Menu.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Output_Log.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Output_Trace.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Technical_Table.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_Technical_Text.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_UndoDialog.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_Bext.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_CodingHistoryDialog.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_DateDialog.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_Loudness.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_TextEditDialog.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_TimeReferenceDialog.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_UmidDialog.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_EditMenu.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_CueDialog.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_CodePageDialog.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx__Common.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Colors.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Preferences.cpp + ${SOURCE_DIR}/MD5/md5.c + ${SOURCE_DIR}/Riff/Riff_Base.cpp + ${SOURCE_DIR}/Riff/Riff_Base_Streams.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_aXML.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_bext.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_data.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_ds64.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_FLLR.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_fmt_.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_INFO.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_INFO_xxxx.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_iXML.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_MD5_.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE__PMX.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_cue_.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_adtl.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_adtl_labl.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_adtl_note.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_adtl_ltxt.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_CSET.cpp + ${SOURCE_DIR}/Riff/Riff_Chunks_WAVE_C2PA.cpp + ${SOURCE_DIR}/Riff/Riff_Handler.cpp + ${SOURCE_DIR}/TinyXml2/tinyxml2.cpp + ${SOURCE_DIR}/ZenLib/Conf.cpp + ${SOURCE_DIR}/ZenLib/CriticalSection.cpp + ${SOURCE_DIR}/ZenLib/Dir.cpp + ${SOURCE_DIR}/ZenLib/File.cpp + ${SOURCE_DIR}/ZenLib/FileName.cpp + ${SOURCE_DIR}/ZenLib/InfoMap.cpp + ${SOURCE_DIR}/ZenLib/int128s.cpp + ${SOURCE_DIR}/ZenLib/int128u.cpp + ${SOURCE_DIR}/ZenLib/MemoryDebug.cpp + ${SOURCE_DIR}/ZenLib/OS_Utils.cpp + ${SOURCE_DIR}/ZenLib/PreComp.cpp + ${SOURCE_DIR}/ZenLib/Thread.cpp + ${SOURCE_DIR}/ZenLib/Translation.cpp + ${SOURCE_DIR}/ZenLib/Utils.cpp + ${SOURCE_DIR}/ZenLib/Ztring.cpp + ${SOURCE_DIR}/ZenLib/ZtringList.cpp + ${SOURCE_DIR}/ZenLib/ZtringListList.cpp + ${SOURCE_DIR}/ZenLib/ZtringListListF.cpp +) + +set(RESOURCES ${SOURCE_DIR}/Resource/GUI_Main.qrc) + +if(ENABLE_C2PA) + list(APPEND SOURCES + ${SOURCE_DIR}/Riff/Riff_C2PA_Helpers.cpp + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_C2PADialog.cpp + ) + + list(APPEND HEADERS + ${SOURCE_DIR}/ThirdParty/json/json.h + ${SOURCE_DIR}/Riff/Riff_C2PA_Helpers.h + ${SOURCE_DIR}/GUI/Qt/GUI_Main_xxxx_C2PADialog.h + ) + + if(WIN32) + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + set(C2PA_TARGET_DIR ${SOURCE_DIR}/ThirdParty/c2pa-rs/target/i686-pc-windows-msvc/release) + else() + set(C2PA_TARGET_DIR ${SOURCE_DIR}/ThirdParty/c2pa-rs/target/x86_64-pc-windows-msvc/release) + endif() + else() + set(C2PA_TARGET_DIR ${SOURCE_DIR}/ThirdParty/c2pa-rs/target/release) + endif() +endif() + +if(APPLE) + set(APP_ICON ${SOURCE_DIR}/../Project/Mac/Logo.icns) + set_source_files_properties(${APP_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") + list(APPEND SOURCES ${SOURCE_DIR}/Common/Mac_Helpers.mm) + list(APPEND HEADERS ${SOURCE_DIR}/Common/Mac_Helpers.h) +endif() + +# The target name stays a plain identifier as some generators (e.g. +# Xcode or Visual Studio) don't like spaces there, the full +# "BWF MetaEdit" output name is applied below via OUTPUT_NAME instead. +set(TARGET_NAME bwfmetaedit-gui) + +if(WIN32) + add_executable(${TARGET_NAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} + ${SOURCE_DIR}/../Project/CMake/GUI/bwfmetaedit-gui.rc) + set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "BWF MetaEdit") + if(WIN32_CONSOLE) + set_target_properties(${TARGET_NAME} PROPERTIES WIN32_EXECUTABLE FALSE) + endif() +elseif(APPLE) + add_executable(${TARGET_NAME} MACOSX_BUNDLE ${SOURCES} ${HEADERS} ${RESOURCES} ${APP_ICON}) + set_target_properties(${TARGET_NAME} PROPERTIES + OUTPUT_NAME "BWF MetaEdit" + MACOSX_BUNDLE_INFO_PLIST ${SOURCE_DIR}/../Project/Mac/Info.plist + MACOSX_BUNDLE_ICON_FILE Logo.icns + ) + target_link_libraries(${TARGET_NAME} PRIVATE "-framework CoreFoundation" "-framework Foundation") +else() + add_executable(${TARGET_NAME} ${SOURCES} ${HEADERS} ${RESOURCES}) +endif() + +target_include_directories(${TARGET_NAME} PRIVATE ${SOURCE_DIR}) + +target_compile_definitions(${TARGET_NAME} PRIVATE + TIXML_USE_STL + UNICODE + _UNICODE + _LARGE_FILES + _FILE_OFFSET_BITS=64 + QT_NO_KEYWORDS +) + +if(APPLE AND MACSTORE) + target_compile_definitions(${TARGET_NAME} PRIVATE MACSTORE) + target_compile_options(${TARGET_NAME} PRIVATE -gdwarf-2) +endif() + +if(NOT WIN32) + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + target_link_libraries(${TARGET_NAME} PRIVATE Threads::Threads) +endif() + +if(ENABLE_C2PA) + target_compile_definitions(${TARGET_NAME} PRIVATE ENABLE_C2PA) + target_include_directories(${TARGET_NAME} PRIVATE ${C2PA_TARGET_DIR}) + + if(C2PA_DYNAMIC) + target_compile_definitions(${TARGET_NAME} PRIVATE C2PA_DYNAMIC_LOADING) + elseif(WIN32) + target_link_libraries(${TARGET_NAME} PRIVATE ${C2PA_TARGET_DIR}/c2pa_c.dll.lib) + else() + target_link_directories(${TARGET_NAME} PRIVATE ${C2PA_TARGET_DIR}) + target_link_libraries(${TARGET_NAME} PRIVATE c2pa_c) + endif() +endif() + +target_link_libraries(${TARGET_NAME} PRIVATE + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Gui + Qt${QT_VERSION_MAJOR}::Widgets + Qt${QT_VERSION_MAJOR}::Quick + Qt${QT_VERSION_MAJOR}::QuickWidgets + Qt${QT_VERSION_MAJOR}::QuickControls2 + Qt${QT_VERSION_MAJOR}::Svg +) + +# Links additional Qt plugins needed for when using a static Qt build. +get_target_property(_qt_core_type Qt${QT_VERSION_MAJOR}::Core TYPE) +if(_qt_core_type STREQUAL "STATIC_LIBRARY") + target_link_libraries(${TARGET_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::QSvgPlugin) + if(QT_VERSION_MAJOR GREATER_EQUAL 6) + if(COMMAND qt6_import_qml_plugins) + set_property(TARGET ${TARGET_NAME} PROPERTY _qt_generated_qrc_files ${RESOURCES}) + qt6_import_qml_plugins(${TARGET_NAME}) + else() + message(FATAL_ERROR "qt6_import_qml_plugins not found; a static build will not render PerFile.qml") + endif() + else() + find_package(Qt5 COMPONENTS QmlImportScanner QUIET) + if(COMMAND qt5_import_qml_plugins) + qt5_import_qml_plugins(${TARGET_NAME} PATH_TO_SCAN "${SOURCE_DIR}/GUI/Qt") + else() + message(FATAL_ERROR "Qt5QmlImportScanner not found; a static build will not render PerFile.qml") + endif() + endif() +endif() +unset(_qt_core_type) + +if(UNIX AND NOT APPLE) + include(GNUInstallDirs) + install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() diff --git a/Project/CMake/GUI/bwfmetaedit-gui.rc b/Project/CMake/GUI/bwfmetaedit-gui.rc new file mode 100644 index 00000000..f18cd995 --- /dev/null +++ b/Project/CMake/GUI/bwfmetaedit-gui.rc @@ -0,0 +1,37 @@ +#include + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 26,08,0,0 + PRODUCTVERSION 26,08,0,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "MediaArea.net" + VALUE "FileDescription", "BWF MetaEdit" + VALUE "FileVersion", "26.08.0.0" + VALUE "InternalName", "BWF MetaEdit - GUI" + VALUE "LegalCopyright", "MediaArea.net" + VALUE "OriginalFilename", "BWF MetaEdit.exe" + VALUE "ProductName", "BWF MetaEdit" + VALUE "ProductVersion", "26.08.0.0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +//Icons +aaaaaaaa ICON "../../../Source/Resource/Image/Logo/Logo.ico" diff --git a/Project/Mac/Make_xcarchive.sh b/Project/Mac/Make_xcarchive.sh index 82720563..91442994 100755 --- a/Project/Mac/Make_xcarchive.sh +++ b/Project/Mac/Make_xcarchive.sh @@ -5,7 +5,7 @@ TEAMID="$4" SIGNATURE="MediaArea.net" -cp -r ../QtCreator/"$APPNAME.app" . || exit 1 +cp -r ../CMake/GUI/build/"$APPNAME.app" . || exit 1 codesign --force --deep --verbose --sign "Apple Distribution: $SIGNATURE" --entitlements "$APPNAME.entitlements" "$APPNAME.app" productbuild --component "$APPNAME.app" /Applications --sign "3rd Party Mac Developer Installer: $SIGNATURE" "$APPNAME-$VERSION.pkg" diff --git a/Project/Mac/mkdmg.sh b/Project/Mac/mkdmg.sh index 24654226..f1be4763 100644 --- a/Project/Mac/mkdmg.sh +++ b/Project/Mac/mkdmg.sh @@ -48,10 +48,7 @@ cp Logo_White.icns "${FILES}/.background" if [ "$KIND" = "CLI" ]; then - cd ../GNU/CLI - if test -e ".libs/${APPNAME_lower}"; then - mv -f ".libs/${APPNAME_lower}" . - fi + cd ../CMake/CLI/build if ! test -x "${APPNAME_lower}"; then echo echo "${APPNAME_lower} can’t be found, or this file isn’t a executable." @@ -59,10 +56,10 @@ if [ "$KIND" = "CLI" ]; then exit 1 fi strip -u -r "${APPNAME_lower}" - cd ../../Mac + cd ../../../Mac mkdir -p "${FILES}-Root/usr/local/bin" - cp "../GNU/CLI/${APPNAME_lower}" "${FILES}-Root/usr/local/bin" + cp "../CMake/CLI/build/${APPNAME_lower}" "${FILES}-Root/usr/local/bin" codesign -f --deep --options=runtime -s "Developer ID Application: ${SIGNATURE}" --verbose "${FILES}-Root/usr/local/bin/${APPNAME_lower}" mkdir -p "${FILES}-Root/usr/local/lib/${APPNAME_lower}/lib" @@ -76,16 +73,16 @@ fi if [ "$KIND" = "GUI" ]; then - cd ../QtCreator + cd ../CMake/GUI/build if ! test -e "${APPNAME}.app"; then echo echo "${APPNAME}.app can’t be found, or this file isn’t a executable." echo exit 1 fi - cd ../Mac + cd ../../../Mac - cp -r "../QtCreator/${APPNAME}.app" "${FILES}" + cp -r "../CMake/GUI/build/${APPNAME}.app" "${FILES}" macdeployqt "${FILES}/${APPNAME}.app" diff --git a/Project/OBS/PKGBUILD b/Project/OBS/PKGBUILD index cf9bde20..1cc04013 100644 --- a/Project/OBS/PKGBUILD +++ b/Project/OBS/PKGBUILD @@ -9,7 +9,7 @@ arch=('x86_64') url="https://mediaarea.net/BWFMetaEdit" license=('GPL') -makedepends=('qt6-base' 'qt6-declarative' 'qt6-svg' 'qt6-tools' 'ca-certificates' 'rust') +makedepends=('qt6-base' 'qt6-declarative' 'qt6-svg' 'qt6-tools' 'ca-certificates' 'rust' 'cmake' 'ninja') source=(${pkgname}_${pkgver}.tar.xz bwfmetaedit-vendor_${pkgver}.tar.xz) sha256sums=('SKIP' 'SKIP') @@ -20,12 +20,13 @@ prepare() { mkdir .cargo printf '[source.crates-io]\nreplace-with = "vendored-sources"\n\n[source.vendored-sources]\ndirectory = "vendor"\n' > .cargo/config.toml - cd "${srcdir}"/bwfmetaedit/Project/GNU/CLI - sh ./autogen - LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/bwfmetaedit" ./configure --prefix=/usr --enable-c2pa=dynamic + cmake -GNinja -S"${srcdir}"/bwfmetaedit/Project/CMake/CLI -B"${srcdir}"/bwfmetaedit/Project/CMake/CLI/build \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RPATH=/usr/lib/bwfmetaedit -DENABLE_C2PA=YES -DC2PA_DYNAMIC=YES - cd "${srcdir}"/bwfmetaedit/Project/QtCreator - qmake6 ENABLE_C2PA=dynamic QMAKE_RPATHDIR+=/usr/lib/bwfmetaedit BINDIR=/usr/bin + cmake -GNinja -S"${srcdir}"/bwfmetaedit/Project/CMake/GUI -B"${srcdir}"/bwfmetaedit/Project/CMake/GUI/build \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RPATH=/usr/lib/bwfmetaedit -DENABLE_C2PA=YES -DC2PA_DYNAMIC=YES } build() { @@ -34,18 +35,14 @@ build() { cargo build --release --offline --locked -p c2pa-c-ffi --no-default-features --features "rust_native_crypto, http, file_io" strip target/release/libc2pa_c.so - cd "${srcdir}"/bwfmetaedit/Project/GNU/CLI - make - - cd "${srcdir}"/bwfmetaedit/Project/QtCreator - make + cmake --build "${srcdir}"/bwfmetaedit/Project/CMake/CLI/build --parallel + cmake --build "${srcdir}"/bwfmetaedit/Project/CMake/GUI/build --parallel } package_bwfmetaedit() { pkgdesc="${pkgdesc} (CLI)" - cd "${srcdir}"/bwfmetaedit/Project/GNU/CLI - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --install "${srcdir}"/bwfmetaedit/Project/CMake/CLI/build install -D -m 0644 "${srcdir}"/bwfmetaedit/License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html install -D -m 0644 "${srcdir}"/bwfmetaedit/History_CLI.txt "${pkgdir}"/usr/share/doc/${pkgname}/History.txt @@ -64,8 +61,7 @@ package_bwfmetaedit-gui() { pkgdesc="${pkgdesc} (GUI)" depends=('qt6-base' 'qt6-declarative' 'qt6-svg') - cd "${srcdir}"/bwfmetaedit/Project/QtCreator - make INSTALL_ROOT="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --install "${srcdir}"/bwfmetaedit/Project/CMake/GUI/build install -D -m 0644 "${srcdir}"/bwfmetaedit/License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html install -D -m 0644 "${srcdir}"/bwfmetaedit/History_GUI.txt "${pkgdir}"/usr/share/doc/${pkgname}/History.txt diff --git a/Project/OBS/bwfmetaedit.dsc b/Project/OBS/bwfmetaedit.dsc index 99fdd9d7..dbd0a753 100644 --- a/Project/OBS/bwfmetaedit.dsc +++ b/Project/OBS/bwfmetaedit.dsc @@ -6,6 +6,6 @@ Version: 26.08-1 Maintainer: Jerome Martinez Homepage: http://mediainfo.sourceforge.net Standards-Version: 4.6.2 -Build-Depends: debhelper (>= 12), tofrodos, qt6-base-dev | qtbase5-dev, qt6-declarative-dev | qtdeclarative5-dev, qt6-declarative-dev | qtquickcontrols2-5-dev, qt6-svg-dev | libqt6svg6-dev | libqt5svg5-dev, libqt6opengl6-dev | libqt5opengl5-dev, libgl-dev, qt6-base-dev-tools | qtbase5-dev-tools, qmake6 | qt5-qmake, qtchooser, zlib1g-dev, pkg-config, automake, autoconf, libtool, cargo, rustc +Build-Depends: debhelper (>= 12), tofrodos, cmake, ninja-build, qt6-base-dev | qtbase5-dev, qt6-declarative-dev | qtdeclarative5-dev, qt6-declarative-dev | qtquickcontrols2-5-dev, qt6-svg-dev | libqt6svg6-dev | libqt5svg5-dev, libqt6opengl6-dev | libqt5opengl5-dev, libgl-dev, qt6-base-dev-tools | qtbase5-dev-tools, zlib1g-dev, pkg-config, cargo, rustc DEBTRANSFORM-TAR: bwfmetaedit_26.08.tar.xz DEBTRANSFORM-FILES: bwfmetaedit-vendor_26.08.tar.xz diff --git a/Project/OBS/bwfmetaedit.spec b/Project/OBS/bwfmetaedit.spec index f299e895..5f57d093 100644 --- a/Project/OBS/bwfmetaedit.spec +++ b/Project/OBS/bwfmetaedit.spec @@ -13,7 +13,13 @@ %global build_c2pa_plugin 0 %endif -%if 0%{?suse_version} || 0%{?mageia} || (0%{?rhel} > 9) || 0%{?fedora_version} +%if %{build_c2pa_plugin} +%global c2pa_cmake_flags -DENABLE_C2PA=YES -DC2PA_DYNAMIC=YES +%else +%global c2pa_cmake_flags %{nil} +%endif + +%if 0%{?suse_version} > 1599 || 0%{?mageia} || 0%{?rhel} > 9 || 0%{?fedora_version} %global qt6_gui 1 %else %global qt6_gui 0 @@ -32,8 +38,12 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: dos2unix BuildRequires: pkgconfig -BuildRequires: automake -BuildRequires: autoconf +BuildRequires: cmake +%if 0%{?suse_version} || 0%{?mageia} +BuildRequires: ninja +%else +BuildRequires: ninja-build +%endif BuildRequires: gcc-c++ %if %{build_c2pa_plugin} BuildRequires: cargo @@ -122,7 +132,6 @@ EOF %build export CFLAGS="-g $RPM_OPT_FLAGS" export CXXFLAGS="-g $RPM_OPT_FLAGS" -export QMAKEOPTS="CONFIG+=force_debug_info" %if %{build_c2pa_plugin} # build c2pa-rs (offline, from the vendored dependencies unpacked during prep) @@ -136,40 +145,20 @@ popd %endif # build CLI -pushd Project/GNU/CLI - %__chmod +x autogen - ./autogen - %if %{build_c2pa_plugin} - LDFLAGS="$LDFLAGS -Wl,-rpath,%{_libdir}/%{name}" %configure --enable-c2pa=dynamic - %else - %configure - %endif - %__make %{?jobs:-j%{jobs}} -popd +cmake -GNinja -SProject/CMake/CLI -BProject/CMake/CLI/build \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_INSTALL_RPATH=%{_libdir}/%{name} %{c2pa_cmake_flags} +cmake --build Project/CMake/CLI/build %{?jobs:--parallel %{jobs}} -# now build GUI -pushd Project/QtCreator - %if %{build_c2pa_plugin} - QMAKE_ARGS="$QMAKEOPTS ENABLE_C2PA=dynamic QMAKE_RPATHDIR+=%{_libdir}/%{name} BINDIR=%{_bindir}" - %else - QMAKE_ARGS="$QMAKEOPTS BINDIR=%{_bindir}" - %endif - %if %{qt6_gui} - qmake6 $QMAKE_ARGS - %else - qmake-qt5 $QMAKE_ARGS - %endif - %__make %{?jobs:-j%{jobs}} -popd +# build GUI +cmake -GNinja -SProject/CMake/GUI -BProject/CMake/GUI/build \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_INSTALL_RPATH=%{_libdir}/%{name} %{c2pa_cmake_flags} +cmake --build Project/CMake/GUI/build %{?jobs:--parallel %{jobs}} %install -pushd Project/GNU/CLI - %__make install DESTDIR=%{buildroot} -popd - -pushd Project/QtCreator - %__make install INSTALL_ROOT=%{buildroot} -popd +DESTDIR=%{buildroot} cmake --install Project/CMake/CLI/build +DESTDIR=%{buildroot} cmake --install Project/CMake/GUI/build %if %{build_c2pa_plugin} %__install -dm 755 %{buildroot}%{_libdir}/%{name} diff --git a/Release/Build_GUI_Windows.ps1 b/Release/Build_GUI_Windows.ps1 index 049969ac..9486d366 100755 --- a/Release/Build_GUI_Windows.ps1 +++ b/Release/Build_GUI_Windows.ps1 @@ -4,7 +4,10 @@ ## be found in the License.html file in the root of the source tree. ## -Param([parameter(Mandatory=$true)][String]$arch) +Param( + [parameter(Mandatory=$true)][String]$arch, + [parameter(Mandatory=$false)][String]$runtime +) $ErrorActionPreference = "Stop" @@ -40,10 +43,11 @@ if (-Not (Test-Path -Path "${release_directory}\..\Source\ThirdParty\c2pa-rs\tar #----------------------------------------------------------------------- # Build -Push-Location -Path "${release_directory}\..\Project\QtCreator" - New-Item -Force -ItemType Directory "${arch}" - Push-Location -Path "${arch}" - qmake ENABLE_C2PA=dynamic .. - nmake - Pop-Location +Push-Location -Path "${release_directory}\..\Project\CMake\GUI" + $cmake_args = @("-GNinja", "-B${arch}", "-DCMAKE_BUILD_TYPE=Release", "-DENABLE_C2PA=YES", "-DC2PA_DYNAMIC=YES") + if ($runtime) { + $cmake_args += "-DCMAKE_MSVC_RUNTIME_LIBRARY=${runtime}" + } + cmake @cmake_args . + cmake --build "${arch}" --parallel Pop-Location diff --git a/Release/Release_CLI_Mac.sh b/Release/Release_CLI_Mac.sh index 676ce9d0..df44ff15 100755 --- a/Release/Release_CLI_Mac.sh +++ b/Release/Release_CLI_Mac.sh @@ -15,8 +15,6 @@ version="$(<"${release_directory}/../Project/version.txt")" macosx_version_min="10.9" -export MAKEOPTS=-j$(($(sysctl -n hw.logicalcpu)+1)) - #----------------------------------------------------------------------- # Cleanup rm -f "${release_directory}/BWFMetaEdit_CLI_${version}_Mac.dmg" @@ -37,12 +35,11 @@ popd #----------------------------------------------------------------------- # Build bwfmetaedit -pushd "${release_directory}/../Project/GNU/CLI" - ./autogen.sh - ./configure --enable-arch-x86_64 --enable-arch-arm64 --enable-c2pa=dynamic --with-macosx-version-min="${macosx_version_min}" - make +pushd "${release_directory}/../Project/CMake/CLI" + cmake -GNinja -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_version_min}" -DENABLE_C2PA=YES -DC2PA_DYNAMIC=YES . + cmake --build build --parallel - install_name_tool -add_rpath /usr/local/lib/bwfmetaedit/lib bwfmetaedit + install_name_tool -add_rpath /usr/local/lib/bwfmetaedit/lib build/bwfmetaedit popd #----------------------------------------------------------------------- diff --git a/Release/Release_GUI_Mac.sh b/Release/Release_GUI_Mac.sh index 06074252..53392508 100755 --- a/Release/Release_GUI_Mac.sh +++ b/Release/Release_GUI_Mac.sh @@ -15,8 +15,6 @@ version="$(<"${release_directory}/../Project/version.txt")" macosx_version_min="11.0" -export MAKEOPTS=-j$(($(sysctl -n hw.logicalcpu)+1)) - #----------------------------------------------------------------------- # Cleanup rm -f "${release_directory}/BWFMetaEdit_GUI_${version}_Mac.dmg" @@ -37,11 +35,11 @@ popd #----------------------------------------------------------------------- # Build BWF MetaEdit -pushd "${release_directory}/../Project/QtCreator" - qmake ENABLE_C2PA=dynamic - make - if ! otool -l "BWF MetaEdit.app/Contents/MacOS/BWF MetaEdit" | grep -q "@executable_path/../Frameworks" ; then - install_name_tool -add_rpath "@executable_path/../Frameworks" "BWF MetaEdit.app/Contents/MacOS/BWF MetaEdit" +pushd "${release_directory}/../Project/CMake/GUI" + cmake -GNinja -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_version_min}" -DENABLE_C2PA=YES -DC2PA_DYNAMIC=YES . + cmake --build build --parallel + if ! otool -l "build/BWF MetaEdit.app/Contents/MacOS/BWF MetaEdit" | grep -q "@executable_path/../Frameworks" ; then + install_name_tool -add_rpath "@executable_path/../Frameworks" "build/BWF MetaEdit.app/Contents/MacOS/BWF MetaEdit" fi popd diff --git a/Release/Release_GUI_Windows.ps1 b/Release/Release_GUI_Windows.ps1 index 4e3c290d..e04b4142 100755 --- a/Release/Release_GUI_Windows.ps1 +++ b/Release/Release_GUI_Windows.ps1 @@ -45,7 +45,7 @@ Push-Location "${release_directory}" New-Item -Force -ItemType Directory -Path "BWFMetaEdit_GUI_${version}_Windows_${arch_alt}" Push-Location "BWFMetaEdit_GUI_${version}_Windows_${arch_alt}" ### Copying: Exe ### - Copy-Item -Force "..\..\Project\QtCreator\${arch}\BWF MetaEdit.exe" bwfmetaedit-gui.exe + Copy-Item -Force "..\..\Project\CMake\GUI\${arch}\BWF MetaEdit.exe" bwfmetaedit-gui.exe ### Copying: DLLs ### Copy-Item -Force "..\..\Source\ThirdParty\c2pa-rs\target\${arch_c2pa}-pc-windows-msvc\release\c2pa_c.dll" . ### Copying: Information files ### diff --git a/Release/Release_OBS.sh b/Release/Release_OBS.sh index 4546059d..aa5e99c4 100755 --- a/Release/Release_OBS.sh +++ b/Release/Release_OBS.sh @@ -18,6 +18,7 @@ version="$(<"${release_directory}/../Project/version.txt")" mkdir "${release_directory}/obs" cp "${release_directory}/../Project/OBS/bwfmetaedit.spec" "${release_directory}/obs/" +cp "${release_directory}/../Project/OBS/bwfmetaedit.changes" "${release_directory}/obs/" cp "${release_directory}/../Project/OBS/bwfmetaedit.dsc" "${release_directory}/obs/" cp "${release_directory}/../Project/OBS/PKGBUILD" "${release_directory}/obs/" diff --git a/Release/UpgradeVersion.sh b/Release/UpgradeVersion.sh index 6f272cef..ab5853b2 100755 --- a/Release/UpgradeVersion.sh +++ b/Release/UpgradeVersion.sh @@ -55,6 +55,8 @@ done files_rc=( "${release_directory}/../Project/MSVC2022/CLI/BWF_MetaEdit_CLI.rc" "${release_directory}/../Project/QtCreator/bwfmetaedit-gui.rc" + "${release_directory}/../Project/CMake/CLI/bwfmetaedit.rc" + "${release_directory}/../Project/CMake/GUI/bwfmetaedit-gui.rc" ) for file in "${files_rc[@]}" ; do diff --git a/Source/Install/BWF_MetaEdit_GUI_Windows_i386.nsi b/Source/Install/BWF_MetaEdit_GUI_Windows_i386.nsi index 31b8c940..3bd70c8d 100755 --- a/Source/Install/BWF_MetaEdit_GUI_Windows_i386.nsi +++ b/Source/Install/BWF_MetaEdit_GUI_Windows_i386.nsi @@ -85,7 +85,7 @@ Section "SectionPrincipale" SEC01 CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME_EXE}" "" "" "" "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}" SetOutPath "$INSTDIR" - File "/oname=${PRODUCT_NAME_EXE}" "..\..\Project\QtCreator\Win32\${PRODUCT_NAME_EXE}" + File "/oname=${PRODUCT_NAME_EXE}" "..\..\Project\CMake\GUI\Win32\${PRODUCT_NAME_EXE}" File "..\..\Source\ThirdParty\c2pa-rs\target\i686-pc-windows-msvc\release\c2pa_c.dll" File "/oname=History.txt" "..\..\History_GUI.txt" File "..\..\License.html" diff --git a/Source/Install/BWF_MetaEdit_GUI_Windows_x64.nsi b/Source/Install/BWF_MetaEdit_GUI_Windows_x64.nsi index 1aa0c7e8..8070be9a 100755 --- a/Source/Install/BWF_MetaEdit_GUI_Windows_x64.nsi +++ b/Source/Install/BWF_MetaEdit_GUI_Windows_x64.nsi @@ -84,7 +84,7 @@ Section "SectionPrincipale" SEC01 CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME_EXE}" "" "" "" "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}" SetOutPath "$INSTDIR" - File "/oname=${PRODUCT_NAME_EXE}" "..\..\Project\QtCreator\x64\${PRODUCT_NAME_EXE}" + File "/oname=${PRODUCT_NAME_EXE}" "..\..\Project\CMake\GUI\x64\${PRODUCT_NAME_EXE}" File "..\..\Source\ThirdParty\c2pa-rs\target\x86_64-pc-windows-msvc\release\c2pa_c.dll" File "/oname=History.txt" "..\..\History_GUI.txt" File "..\..\License.html" diff --git a/debian/control b/debian/control index db0003b7..0af0ee71 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Jerome Martinez Rules-Requires-Root: no # The rustc shipped by some Debian/Ubuntu releases is too old to build plugin-c2pa. # The actual rustc version will be checked at build time id debian/rules and the package skipped when it's too old. -Build-Depends: debhelper (>= 12), tofrodos, qt6-base-dev | qtbase5-dev, qt6-declarative-dev | qtdeclarative5-dev, qt6-declarative-dev | qtquickcontrols2-5-dev, qt6-svg-dev | libqt6svg6-dev | libqt5svg5-dev, libqt6opengl6-dev | libqt5opengl5-dev, libgl-dev, qt6-base-dev-tools | qtbase5-dev-tools, qmake6 | qt5-qmake, qtchooser, zlib1g-dev, pkg-config, automake, autoconf, libtool, cargo, rustc +Build-Depends: debhelper (>= 12), tofrodos, cmake, ninja-build, qt6-base-dev | qtbase5-dev, qt6-declarative-dev | qtdeclarative5-dev, qt6-declarative-dev | qtquickcontrols2-5-dev, qt6-svg-dev | libqt6svg6-dev | libqt5svg5-dev, libqt6opengl6-dev | libqt5opengl5-dev, libgl-dev, qt6-base-dev-tools | qtbase5-dev-tools, zlib1g-dev, pkg-config, cargo, rustc Standards-Version: 4.6.2 Homepage: https://mediaarea.net/BWFMetaEdit diff --git a/debian/rules b/debian/rules index 9c03b9ee..2836d2f6 100644 --- a/debian/rules +++ b/debian/rules @@ -9,15 +9,12 @@ C2PA_LIBDIR := /usr/lib/bwfmetaedit # Qt6 dev packages only exist from Debian 12 (bookworm) onward (debian/control # build-depends on them with a Qt5 fallback for Debian 11/bullseye), so detect # at build time which flavour actually got installed. -HAVE_QT6 := $(shell command -v qmake6 >/dev/null 2>&1 && echo yes) +HAVE_QT6 := $(shell pkg-config --exists Qt6Core >/dev/null 2>&1 && echo yes) ifeq ($(HAVE_QT6),yes) -QMAKE := qmake6 QML_DEPENDS := qml6-module-qtquick, qml6-module-qtquick-window, qml6-module-qtquick-controls, qml6-module-qtquick-templates, qml6-module-qtquick-layouts, qml6-module-qtqml, qml6-module-qtqml-models, qml6-module-qtqml-workerscript else -QMAKE := qmake QML_DEPENDS := qml-module-qtquick2, qml-module-qtquick-window2, qml-module-qtquick-layouts, qml-module-qtquick-controls2, qml-module-qtquick-templates2, qml-module-qtqml, qml-module-qtqml-models2, qml-module-qtqml-workerscript2 -export QT_SELECT=qt5 endif # The C2PA plugin is only built when the rustc actually installed is new @@ -30,12 +27,10 @@ RUSTC_VERSION := $(shell rustc --version 2>/dev/null | sed -n 's/^rustc \([0-9][ HAVE_C2PA := $(shell [ -n "$(RUSTC_VERSION)" ] && dpkg --compare-versions "$(RUSTC_VERSION)" ge "$(C2PA_MIN_RUSTC_VERSION)" && echo yes) ifeq ($(HAVE_C2PA),yes) -CONFIGURE_C2PA_FLAGS := --enable-c2pa=dynamic -PREPARE_C2PA_FLAGS := ENABLE_C2PA=dynamic +CMAKE_C2PA_FLAGS := -DENABLE_C2PA=YES -DC2PA_DYNAMIC=YES -DCMAKE_INSTALL_RPATH=$(C2PA_LIBDIR) C2PA_EXCLUDE := else -CONFIGURE_C2PA_FLAGS := -PREPARE_C2PA_FLAGS := +CMAKE_C2PA_FLAGS := C2PA_EXCLUDE := -N bwfmetaedit-plugin-c2pa -N bwfmetaedit-plugin-c2pa-dbg endif @@ -63,11 +58,11 @@ ifeq ($(HAVE_C2PA),yes) strip Source/ThirdParty/c2pa-rs/target/release/libc2pa_c.so endif - cd Project/GNU/CLI && chmod u+x autogen - cd Project/GNU/CLI && ./autogen - cd Project/GNU/CLI && LDFLAGS="$(LDFLAGS) -Wl,-rpath,$(C2PA_LIBDIR) -Wl,--allow-shlib-undefined" ./configure --prefix=/usr $(CONFIGURE_C2PA_FLAGS) + cmake -GNinja -SProject/CMake/CLI -BProject/CMake/CLI/build \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr $(CMAKE_C2PA_FLAGS) - cd Project/QtCreator && $(QMAKE) $(PREPARE_C2PA_FLAGS) QMAKE_RPATHDIR+=$(C2PA_LIBDIR) QMAKE_LFLAGS+=-Wl,--allow-shlib-undefined BINDIR=/usr/bin + cmake -GNinja -SProject/CMake/GUI -BProject/CMake/GUI/build \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr $(CMAKE_C2PA_FLAGS) touch $@ @@ -75,11 +70,10 @@ endif build: build-stamp build-stamp: configure-stamp dh_testdir - # Add here commands to compile the package. - cd Project/GNU/CLI && $(MAKE) - cd Project/QtCreator && $(MAKE) + cmake --build Project/CMake/CLI/build --parallel + cmake --build Project/CMake/GUI/build --parallel touch $@ @@ -99,8 +93,8 @@ install: build dh_installdirs # Add here commands to install the package into debian/tmp - cd Project/GNU/CLI && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - cd Project/QtCreator && $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp + DESTDIR=$(CURDIR)/debian/tmp cmake --install Project/CMake/CLI/build + DESTDIR=$(CURDIR)/debian/tmp cmake --install Project/CMake/GUI/build ifeq ($(HAVE_C2PA),yes) install -dm 755 $(CURDIR)/debian/tmp$(C2PA_LIBDIR)