Use lc-compile's dependency tracking when building extensions

livecodefraser · livecodefraser · commit 690794b52cb9 · 2015-06-24T17:06:56.000+01:00
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
@@ -56,23 +56,23 @@
 				},
 			},
 			
-			'rules':
+			'actions':
 			[
 				{
-					'rule_name': 'build_extension',
-					'extension': 'lcb',
+					'action_name': 'build_extensions',
 					
 					'inputs': 
 					[
-						'../util/build-widget.sh',
+						'../util/build-extensions.sh',
+						'<@(_sources)',
 					],
 					
 					'outputs':
 					[
-						'<(PRODUCT_DIR)/packaged_extensions/com.livecode.extensions.livecode.<(RULE_INPUT_ROOT)/module.lcb',
+						'<(PRODUCT_DIR)/packaged_extensions',
 					],
 					
-					'message': 'Building extension <(RULE_INPUT_ROOT)',
+					'message': 'Building extensions',
 					
 					'conditions':
 					[
@@ -81,13 +81,13 @@
 							{
 								'variables':
 								{
-									'build_command': [ '$(ProjectDir)../../../util/invoke-unix.bat', '$(ProjectDir)../../../util/build-widget.sh' ],
+									'build_command': [ '$(ProjectDir)../../../util/invoke-unix.bat', '$(ProjectDir)../../../util/build-extensions.sh' ],
 								},
 							},
 							{
 								'variables':
 								{
-									'build_command': [ '../util/build-widget.sh' ],
+									'build_command': [ '../util/build-extensions.sh' ],
 								},
 							},
 						],
@@ -96,10 +96,10 @@
 					'action':
 					[
 						'<@(build_command)',
-						'<(RULE_INPUT_DIRNAME)',
-						'<(PRODUCT_DIR)',
+						'<(PRODUCT_DIR)/packaged_extensions',
 						'<(PRODUCT_DIR)/modules/lci',
 						'>(lc-compile_host)',
+						'<@(_sources)',
 					],
 				},
 			],
diff --git a/util/build-extensions.sh b/util/build-extensions.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Utility script called by the build system to compile extensions
+
+set -e
+
+function build_widget {
+	WIDGET_DIR=$1
+	WIDGET_NAME=$(basename $1)
+	TARGET_DIR="com.livecode.extensions.livecode.${WIDGET_NAME}"
+	BUILD_DIR=$2
+	MODULE_DIR=$3
+	LC_COMPILE=$4
+	
+	"${LC_COMPILE}" \
+		--modulepath "${MODULE_DIR}" \
+		--manifest "${WIDGET_DIR}/manifest.xml" \
+		--output "${WIDGET_DIR}/module.lcm" \
+		"${WIDGET_DIR}/${WIDGET_NAME}.lcb"
+		
+	pushd "${WIDGET_DIR}" 1>/dev/null
+	zip -q -r "${TARGET_DIR}.lce" *
+	popd 1>/dev/null
+	
+	mkdir -p "${BUILD_DIR}/${TARGET_DIR}"
+	
+	unzip -q \
+		-o "${WIDGET_DIR}/${TARGET_DIR}.lce" \
+		-d "${BUILD_DIR}/${TARGET_DIR}"
+		
+	rm "${WIDGET_DIR}/${TARGET_DIR}.lce"
+	
+	return 0
+}
+
+# Arguments 4 and above are the list of extensions to compile
+destination_dir=$1
+module_dir=$2
+lc_compile=$3
+shift 3
+
+# Find the dependency/build ordering of the extensions
+build_order=$(${lc_compile} --modulepath ${module_dir} --deps changed-order -- $@)
+
+# Loop over the extensions that need to be (re-)built
+for ext in ${build_order} ; do
+	# Create the output directory
+	mkdir -p "${destination_dir}"/com.livecode.extensions.livecode.$(basename -s .lcb "${ext}")
+	
+	# Build this extension
+	build_widget $(dirname "${ext}") "${destination_dir}" "${module_dir}" "${lc_compile}"
+done
diff --git a/util/build-widget.sh b/util/build-widget.sh

Original file line number	Diff line number	Diff line change
`@@ -56,23 +56,23 @@`
`56`	`56`	`},`
`57`	`57`	`},`
`58`	`58`
`59`		`- 'rules':`
	`59`	`+ 'actions':`
`60`	`60`	`[`
`61`	`61`	`{`
`62`		`- 'rule_name': 'build_extension',`
`63`		`- 'extension': 'lcb',`
	`62`	`+ 'action_name': 'build_extensions',`
`64`	`63`
`65`	`64`	`'inputs':`
`66`	`65`	`[`
`67`		`- '../util/build-widget.sh',`
	`66`	`+ '../util/build-extensions.sh',`
	`67`	`+ '<@(_sources)',`
`68`	`68`	`],`
`69`	`69`
`70`	`70`	`'outputs':`
`71`	`71`	`[`
`72`		`- '<(PRODUCT_DIR)/packaged_extensions/com.livecode.extensions.livecode.<(RULE_INPUT_ROOT)/module.lcb',`
	`72`	`+ '<(PRODUCT_DIR)/packaged_extensions',`
`73`	`73`	`],`
`74`	`74`
`75`		`- 'message': 'Building extension <(RULE_INPUT_ROOT)',`
	`75`	`+ 'message': 'Building extensions',`
`76`	`76`
`77`	`77`	`'conditions':`
`78`	`78`	`[`
`@@ -81,13 +81,13 @@`
`81`	`81`	`{`
`82`	`82`	`'variables':`
`83`	`83`	`{`
`84`		`- 'build_command': [ '$(ProjectDir)../../../util/invoke-unix.bat', '$(ProjectDir)../../../util/build-widget.sh' ],`
	`84`	`+ 'build_command': [ '$(ProjectDir)../../../util/invoke-unix.bat', '$(ProjectDir)../../../util/build-extensions.sh' ],`
`85`	`85`	`},`
`86`	`86`	`},`
`87`	`87`	`{`
`88`	`88`	`'variables':`
`89`	`89`	`{`
`90`		`- 'build_command': [ '../util/build-widget.sh' ],`
	`90`	`+ 'build_command': [ '../util/build-extensions.sh' ],`
`91`	`91`	`},`
`92`	`92`	`},`
`93`	`93`	`],`
`@@ -96,10 +96,10 @@`
`96`	`96`	`'action':`
`97`	`97`	`[`
`98`	`98`	`'<@(build_command)',`
`99`		`- '<(RULE_INPUT_DIRNAME)',`
`100`		`- '<(PRODUCT_DIR)',`
	`99`	`+ '<(PRODUCT_DIR)/packaged_extensions',`
`101`	`100`	`'<(PRODUCT_DIR)/modules/lci',`
`102`	`101`	`'>(lc-compile_host)',`
	`102`	`+ '<@(_sources)',`
`103`	`103`	`],`
`104`	`104`	`},`
`105`	`105`	`],`