widgets: Install into correctly-named directory.

peter-b · peter-b · commit 9e25f971de07 · 2016-01-06T11:51:17.000Z
Ensures that the directory that widgets are installed into
matches their actual module name.
diff --git a/docs/notes/feature-packaged_extensions_naming_consistency.md b/docs/notes/feature-packaged_extensions_naming_consistency.md
@@ -1,6 +1,3 @@
----
-version: 8.0.0-dp-3
----
 # Packaged extension name changes
 
 Earlier versions of the widgets and libraries which are bundled with
@@ -10,5 +7,8 @@ Now all LiveCode extensions are named either
 **com.livecode.widget.<widget name>** or
 **com.livecode.library.<library name>**.
 
+Their directories in the installed LiveCode bundle have also been updated to
+match.
+
 **Note:** This change will break some stacks that have widgets saved
 on them, or scripts which refer to a widget by its kind.
diff --git a/tests/_testlib.livecodescript b/tests/_testlib.livecodescript
@@ -152,7 +152,7 @@ end TestGetIDERepositoryPath
 on TestLoadExtension pName	
    set the itemdelimiter to "."
    local tExtensionUnzipFolder
-   put "com.livecode.extensions.livecode." & toLower(item -1 of pName) into tExtensionUnzipFolder
+   put pName into tExtensionUnzipFolder
 
    local tPath, tRepoPath
    put specialfolderpath("engine") into tPath
diff --git a/util/build-extensions.sh b/util/build-extensions.sh
@@ -4,10 +4,16 @@
 
 set -e
 
+function extract_name {
+	# Extract an e.g. "module foo.bar.baz" line from an LCB source file
+	sed -nEe 's/^([[:space:]]*(module|widget|library)[[:space:]]*)([-_\.[:alnum:]]*)[[:space:]]*$/\3/p' < "$1"
+}
+
 function build_widget {
 	WIDGET_DIR=$1
 	WIDGET_NAME=$(basename $1)
-	TARGET_DIR="com.livecode.extensions.livecode.${WIDGET_NAME}"
+	WIDGET_LCB="${WIDGET_DIR}/${WIDGET_NAME}.lcb"
+	TARGET_DIR=$(extract_name "${WIDGET_LCB}")
 	BUILD_DIR=$2
 	MODULE_DIR=$3
 	LC_COMPILE=$4
@@ -17,8 +23,8 @@ function build_widget {
 		--modulepath "${MODULE_DIR}" \
 		--manifest "${WIDGET_DIR}/manifest.xml" \
 		--output "${WIDGET_DIR}/module.lcm" \
-		"${WIDGET_DIR}/${WIDGET_NAME}.lcb"
-		
+		"${WIDGET_LCB}"
+
 	pushd "${WIDGET_DIR}" 1>/dev/null
 	zip -q -r "${TARGET_DIR}.lce" *
 	popd 1>/dev/null
