[[ ExtensionPackageUtils ]] Move server script to resources folder

livecodeali · livecodeali · commit 2a37058243a8 · 2018-03-02T09:23:56.000Z
There's not really an ideal place for something like a server
script that provides access to an extension, so move it to resources
folder for now.
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
@@ -108,7 +108,7 @@
 					'action':
 					[
 						'<(engine)',
-						'../util/extensions-utils.lc',
+						'script-libraries/extension-utils/resources/extension-utils.lc',
 						'$(not_a_real_variable)buildextension',
 						'dummy1',
 						'dummy2',
@@ -189,7 +189,7 @@
 
 					'inputs':
 					[
-						'../util/extensions-utils.lc',
+						'script-libraries/extension-utils/resources/extension-utils.lc',
 						'<@(_sources)',
 					],
 
@@ -204,7 +204,7 @@
 					'action':
 					[
 						'<(engine)',
-						'../util/extensions-utils.lc',
+						'script-libraries/extension-utils/resources/extension-utils.lc',
 						'$(not_a_real_variable)buildlcbextensions',
 												'../ide-support/revdocsparser.livecodescript',
 						'<(PRODUCT_DIR)/packaged_extensions',
diff --git a/extensions/script-libraries/extension-utils/resources/extension-utils.lc b/extensions/script-libraries/extension-utils/resources/extension-utils.lc
@@ -20,10 +20,7 @@ on doPackage
    put pathFromNative(the filename of me) into tPackagerFilename
    
    set the itemdelimiter to slash
-   put "extensions" & slash & \
-      "script-libraries" & slash & \
-	  "extension-utils" & slash & \
-      "extension-utils.livecodescript" \
+   put "extension-utils.livecodescript" \
       into item -2 to -1 of tPackagerFilename
 
    start using stack tPackagerFilename
diff --git a/tests/Makefile b/tests/Makefile
@@ -128,7 +128,7 @@ extensions_compile: $(LCM_DIR) $(LCS_EXTENSION_SOURCES)
 	@set -e; \
 	echo "$(LCS_EXTENSION_SOURCES)" $(_PRINT_RULE); \
 	cp -r "$(MODULE_DIR)/." "$(LCM_DIR)"; \
-	"$(LCS_SERVER_ENGINE)" "${top_srcdir}/util/extensions-utils.lc" "buildlcbextensions" "${top_srcdir}/ide-support/revdocsparser.livecodescript" "$(LCM_DIR)/packaged_extensions" "false" "$(LC_COMPILE)" "$(LCM_DIR)" "$(NOTHING)" $(LCS_EXTENSION_SOURCES)
+	"$(LCS_SERVER_ENGINE)" "${top_srcdir}/extensions/script-libraries/extension-utils/resources/extension-utils.lc" "buildlcbextensions" "${top_srcdir}/ide-support/revdocsparser.livecodescript" "$(LCM_DIR)/packaged_extensions" "false" "$(LC_COMPILE)" "$(LCM_DIR)" "$(NOTHING)" $(LCS_EXTENSION_SOURCES)
 
 lcm_compile: $(LCM_MODULES) extensions_compile
 
