diff --git a/Cargo.lock b/Cargo.lock index d24ac60..8f8538e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -534,6 +534,27 @@ dependencies = [ "system-deps", ] +[[package]] +name = "gst-pipeline-studio" +version = "0.3.4" +dependencies = [ + "anyhow", + "chrono", + "futures-channel", + "futures-executor", + "gst-plugin-gtk4", + "gstreamer", + "gtk4", + "lazy_static", + "log 0.4.14", + "once_cell", + "serde", + "serde_any", + "simplelog", + "structopt", + "xml-rs 0.8.4", +] + [[package]] name = "gst-plugin-gtk4" version = "0.11.0" @@ -559,27 +580,6 @@ dependencies = [ "chrono", ] -[[package]] -name = "gst_pipeline_studio" -version = "0.3.4" -dependencies = [ - "anyhow", - "chrono", - "futures-channel", - "futures-executor", - "gst-plugin-gtk4", - "gstreamer", - "gtk4", - "lazy_static", - "log 0.4.14", - "once_cell", - "serde", - "serde_any", - "simplelog", - "structopt", - "xml-rs 0.8.4", -] - [[package]] name = "gstreamer" version = "0.21.0" diff --git a/Cargo.toml b/Cargo.toml index 8780fdd..0ccadbd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "gst_pipeline_studio" +name = "gst-pipeline-studio" version = "0.3.4" edition = "2018" rust-version = "1.70.0" diff --git a/README.md b/README.md index d0bb956..351d2f1 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ brew install gstreamer gst-plugins-base gst-plugins-bad ```sh $ meson builddir -Dbuildtype=release $ ninja -C builddir -$ ./builddir/target/release/gst_pipeline_studio +$ ./builddir/target/release/gst-pipeline-studio ``` ## Flatpak diff --git a/build-aux/org.freedesktop.dabrain34.GstPipelineStudio.Devel.json b/build-aux/org.freedesktop.dabrain34.GstPipelineStudio.Devel.json index 6ba7243..eba3220 100644 --- a/build-aux/org.freedesktop.dabrain34.GstPipelineStudio.Devel.json +++ b/build-aux/org.freedesktop.dabrain34.GstPipelineStudio.Devel.json @@ -6,7 +6,7 @@ "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable" ], - "command": "gst_pipeline_studio", + "command": "gst-pipeline-studio", "finish-args": [ "--socket=fallback-x11", "--socket=wayland", @@ -45,7 +45,7 @@ ] }, { - "name": "gst_pipeline_studio", + "name": "gst-pipeline-studio", "buildsystem": "meson", "run-tests": true, "config-opts": [ diff --git a/data/org.freedesktop.dabrain34.GstPipelineStudio.desktop.in b/data/org.freedesktop.dabrain34.GstPipelineStudio.desktop.in index 68de2ed..0b83ff3 100644 --- a/data/org.freedesktop.dabrain34.GstPipelineStudio.desktop.in +++ b/data/org.freedesktop.dabrain34.GstPipelineStudio.desktop.in @@ -3,7 +3,7 @@ Name=GstPipelineStudio GenericName=GPS Comment=A GUI for GStreamer Type=Application -Exec=gst_pipeline_studio +Exec=gst-pipeline-studio Terminal=false Categories=AudioVideo;Audio;Video;Midi;Settings;GNOME;GTK; Icon=@icon@ diff --git a/installer/macos/deploy_macos.sh b/installer/macos/deploy_macos.sh index 1bb47ae..4ad9e67 100755 --- a/installer/macos/deploy_macos.sh +++ b/installer/macos/deploy_macos.sh @@ -93,7 +93,7 @@ function lib_dependency_analyze # copy app dependency library to target dir echo -n "Copy app dependency library......" -lib_dependency_copy ${TARGETDIR}/bin/gst_pipeline_studio "${TARGETDIR}/bin" +lib_dependency_copy ${TARGETDIR}/bin/gst-pipeline-studio "${TARGETDIR}/bin" lib_dependency_copy ${TARGETDIR}/lib/libgobject-2.0.0.dylib "${TARGETDIR}/bin" lib_dependency_copy ${TARGETDIR}/lib/libsoup-2.4.1.dylib "${TARGETDIR}/bin" lib_dependency_copy "${TARGETDIR}/bin/libgtk-4.1.dylib" "${TARGETDIR}/bin" diff --git a/installer/macos/installers/Info.plist b/installer/macos/installers/Info.plist index de6666f..6dba0b1 100644 --- a/installer/macos/installers/Info.plist +++ b/installer/macos/installers/Info.plist @@ -18,7 +18,7 @@ GtkOSXLaunchScriptFile launcher.sh CFBundleExecutable - gst_pipeline_studio + gst-pipeline-studio CFBundleIconFile GstPipelineStudio.icns CFBundleIdentifier @@ -38,6 +38,6 @@ CFBundleVersion 1 NSPrincipalClass - NSApplication + NSApplication diff --git a/installer/macos/mac_app_pack.sh b/installer/macos/mac_app_pack.sh index 2b20555..3e5e8ea 100755 --- a/installer/macos/mac_app_pack.sh +++ b/installer/macos/mac_app_pack.sh @@ -93,10 +93,10 @@ cp -rf "$APP_BUILD/etc" "$APP_RES_DIR" cp -rf "$APP_BUILD/lib" "$APP_RES_DIR" cp -rf "$APP_BUILD/share" "$APP_RES_DIR" cp -rf "$APP_BUILD/libexec" "$APP_RES_DIR" -cp $APP_BUILD/bin/gst_pipeline_studio $APP_EXE_DIR/gst_pipeline_studio-real -cp $APP_BUILD/bin/launcher.sh $APP_EXE_DIR/gst_pipeline_studio -chmod 766 "$APP_EXE_DIR/gst_pipeline_studio" -chmod 766 "$APP_EXE_DIR/gst_pipeline_studio-real" +cp $APP_BUILD/bin/gst-pipeline-studio $APP_EXE_DIR/gst-pipeline-studio-real +cp $APP_BUILD/bin/launcher.sh $APP_EXE_DIR/gst-pipeline-studio +chmod 766 "$APP_EXE_DIR/gst-pipeline-studio" +chmod 766 "$APP_EXE_DIR/gst-pipeline-studio-real" chmod -R 766 "$APP_RES_DIR"/libexec/gstreamer-1.0 @@ -123,7 +123,7 @@ done lib_change_paths \ @executable_path/../Resources/lib \ $APP_LIB_DIR \ - $APP_EXE_DIR/gst_pipeline_studio-real + $APP_EXE_DIR/gst-pipeline-studio-real lib_change_siblings $APP_LIB_DIR @loader_path diff --git a/installer/macos/mac_launcher.sh b/installer/macos/mac_launcher.sh index 489cc4b..e75c732 100755 --- a/installer/macos/mac_launcher.sh +++ b/installer/macos/mac_launcher.sh @@ -167,4 +167,4 @@ if /bin/expr "x$1" : '^x-psn_' > /dev/null; then shift 1 fi -$EXEC "$bundle_contents/MacOS/gst_pipeline_studio-real" "$@" $EXTRA_ARGS +$EXEC "$bundle_contents/MacOS/gst-pipeline-studio-real" "$@" $EXTRA_ARGS diff --git a/installer/wix/gps.bat b/installer/wix/gps.bat index df85317..b2ed60f 100644 --- a/installer/wix/gps.bat +++ b/installer/wix/gps.bat @@ -5,4 +5,4 @@ set PATH=%MYDIR%bin;%PATH% echo %PATH% set GST_PLUGIN_PATH=%MYDIR%\lib\gstreamer-1.0 echo %GST_PLUGIN_PATH% -gst_pipeline_studio.exe \ No newline at end of file +gst-pipeline-studio.exe \ No newline at end of file diff --git a/meson.build b/meson.build index 9cf5385..8226674 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('gst_pipeline_studio', +project('gst-pipeline-studio', version: '0.3.4', meson_version: '>= 0.63.0', default_options: [ 'warning_level=2',