Git commit a310819d576e267e54bd5c965eeda78afb87ed9b by Hrvoje Senjan. Committed on 21/01/2014 at 17:20. Pushed by hrvojes into branch 'master'.
Append 5 to kjscmd & it's manpage This is done to to make kjsembed not collide with kdelibs(4) when installed to same prefix. REVIEW: 115134 M +1 -1 docs/kjscmd/CMakeLists.txt R +8 -8 docs/kjscmd/man-kjscmd5.1.docbook [from: docs/kjscmd/man-kjscmd.1.docbook - 088% similarity] M +3 -3 src/kjscmd/CMakeLists.txt http://commits.kde.org/kjsembed/a310819d576e267e54bd5c965eeda78afb87ed9b diff --git a/docs/kjscmd/CMakeLists.txt b/docs/kjscmd/CMakeLists.txt index eda31bf..181bb79 100644 --- a/docs/kjscmd/CMakeLists.txt +++ b/docs/kjscmd/CMakeLists.txt @@ -1 +1 @@ -kdoctools_create_manpage(man-kjscmd.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) +kdoctools_create_manpage(man-kjscmd5.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) diff --git a/docs/kjscmd/man-kjscmd.1.docbook b/docs/kjscmd/man-kjscmd5.1.docbook similarity index 88% rename from docs/kjscmd/man-kjscmd.1.docbook rename to docs/kjscmd/man-kjscmd5.1.docbook index 5a7fd02..26caa5d 100644 --- a/docs/kjscmd/man-kjscmd.1.docbook +++ b/docs/kjscmd/man-kjscmd5.1.docbook @@ -24,12 +24,12 @@ </refentryinfo> <refmeta> -<refentrytitle><command>kjscmd</command></refentrytitle> +<refentrytitle><command>kjscmd5</command></refentrytitle> <manvolnum>1</manvolnum> </refmeta> <refnamediv> -<refname><command>kjscmd</command></refname> +<refname><command>kjscmd5</command></refname> <refpurpose>&kde; KJSEmbed interpreter</refpurpose> </refnamediv> @@ -37,7 +37,7 @@ <title>Synopsis</title> <cmdsynopsis> -<command>kjscmd</command> +<command>kjscmd5</command> <arg choice="opt">--help</arg> <!-- @@ -64,7 +64,7 @@ <refsect1> <title>Description</title> -<para><command>kjscmd</command> is a tool for launching KJSEmbed scripts from the command line. +<para><command>kjscmd5</command> is a tool for launching KJSEmbed scripts from the command line. It will run the scripts contained in the named <parameter>file</parameter> using KJSEmbed. It does not accept - (stdin) as a <parameter>file</parameter>. </para> @@ -180,19 +180,19 @@ execute script in <parameter>file</parameter> without gui support. <refsect1> <title>Usage</title> <para> -The most common way to run <command>kjscmd</command> is simply as +The most common way to run <command>kjscmd5</command> is simply as <literallayout> -<userinput><command>kjscmd</command> <parameter>file</parameter> +<userinput><command>kjscmd5</command> <parameter>file</parameter> </userinput> </literallayout> If no parameter <parameter>file</parameter> is used, it executes a predefined test -script that measures the start speed of <command>kjscmd</command>. +script that measures the start speed of <command>kjscmd5</command>. </para> </refsect1> <refsect1> <title>See Also</title> -<para><replaceable>kjs</replaceable>(1)</para> +<para><replaceable>kjs5</replaceable>(1)</para> </refsect1> <refsect1> diff --git a/src/kjscmd/CMakeLists.txt b/src/kjscmd/CMakeLists.txt index a659f0f..7ade1cc 100644 --- a/src/kjscmd/CMakeLists.txt +++ b/src/kjscmd/CMakeLists.txt @@ -4,10 +4,10 @@ set(kjscmd_SRCS kjscmd.cpp ) qt5_add_resources(kjscmd_SRCS kjscmd.qrc) # This is a developer tool, not intended for normal user installs -add_executable(kjscmd ${kjscmd_SRCS}) -target_link_libraries(kjscmd +add_executable(kjscmd5 ${kjscmd_SRCS}) +target_link_libraries(kjscmd5 Qt5::Widgets # QApplication::lastWindowClosed KF5::JsEmbed ) -install(TARGETS kjscmd EXPORT KF5JsEmbedTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kjscmd5 EXPORT KF5JsEmbedTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
