[rkward] /: Fix lookup of common.js without installation
Thomas Friedrichsmeier
null at kde.org
Sat May 2 18:08:29 BST 2020
Git commit 15b02c7506f0c75f2fb4819ee1054201709eedfa by Thomas Friedrichsmeier.
Committed on 02/05/2020 at 17:08.
Pushed by tfry into branch 'master'.
Fix lookup of common.js without installation
M +0 -1 ChangeLog
M +1 -0 rkward/CMakeLists.txt
M +0 -18 rkward/scriptbackends/CMakeLists.txt
https://commits.kde.org/rkward/15b02c7506f0c75f2fb4819ee1054201709eedfa
diff --git a/ChangeLog b/ChangeLog
index aa56fe4c..3e6e8773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,6 @@
- <text> elements in plugins may now also contain clickable links, including rkward://-scheme links
- The new code hinting features from version 0.7.1 are now also available in the console
- On unix-systems, RKWard can now be run without installation
- - TODO: common.js is not found in plugins!
- Kate addons are now supported within RKWard. Intially, search-in-files, snippets, and projects are loaded by default
* TODO: Some plugins still have UI issues. E.g.:
- SQL plugin fails to add toplevel menu
diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index 9594be12..de489f84 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -90,6 +90,7 @@ IF(NOT WIN32)
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/pages ${CMAKE_CURRENT_BINARY_DIR}/rkwardinstall/pages
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/rkwardinstall/plugins
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/resource.ver ${CMAKE_CURRENT_BINARY_DIR}/rkwardinstall/resource.ver
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/scriptbackends ${CMAKE_CURRENT_BINARY_DIR}/rkwardinstall/phpfiles
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_BINARY_DIR}/rbackend/rpackages ${CMAKE_CURRENT_BINARY_DIR}/rkwardinstall/rpackages
)
ENDIF(NOT WIN32)
diff --git a/rkward/scriptbackends/CMakeLists.txt b/rkward/scriptbackends/CMakeLists.txt
index 4720c0ea..f53d6b1d 100644
--- a/rkward/scriptbackends/CMakeLists.txt
+++ b/rkward/scriptbackends/CMakeLists.txt
@@ -1,8 +1,5 @@
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
-
-########### next target ###############
-
SET(scriptbackends_STAT_SRCS
scriptbackend.cpp
simplebackend.cpp
@@ -14,19 +11,4 @@ SET(scriptbackends_STAT_SRCS
ADD_LIBRARY(scriptbackends STATIC ${scriptbackends_STAT_SRCS})
TARGET_LINK_LIBRARIES(scriptbackends Qt5::Script Qt5::Widgets Qt5::Xml KF5::WidgetsAddons KF5::I18n)
-########### install files ###############
-
INSTALL(FILES common.js rkcomponentscripting.js DESTINATION ${DATA_INSTALL_DIR}/rkward/phpfiles )
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = $(all_includes)
-#METASOURCES = AUTO
-#noinst_LIBRARIES = libscriptbackends.a
-#noinst_HEADERS = phpbackend.h scriptbackend.h simplebackend.h
-#libscriptbackends_a_SOURCES = phpbackend.cpp scriptbackend.cpp simplebackend.cpp
-#phpfilesdir = $(kde_datadir)/rkward/phpfiles
-#phpfiles_DATA = common.php php.ini
-#
More information about the rkward-tracker
mailing list