[[ cpptest ]] Do not build and run the tests as part of the default build target

livecodestephen · livecodestephen · commit f694a233e9f4 · 2015-10-14T09:54:02.000+01:00
diff --git a/Makefile b/Makefile
@@ -65,6 +65,7 @@ guess_platform_script := \
 guess_platform := $(shell $(guess_platform_script))
 
 all: all-$(guess_platform)
+check: check-$(guess_platform)
 
 ################################################################
 # Linux rules
@@ -86,11 +87,14 @@ config-linux-%:
 compile-linux-%:
 	$(MAKE) -C build-linux-$*/livecode
 
+check-linux-%:
+	$(MAKE) -C build-linux-$*/livecode check
+
 all-linux-%:
 	$(MAKE) config-linux-$*
 	$(MAKE) compile-linux-$*
 
-$(addsuffix -linux,all config compile): %: %-$(guess_linux_arch)
+$(addsuffix -linux,all config compile check): %: %-$(guess_linux_arch)
 
 ################################################################
 # Android rules
@@ -104,11 +108,14 @@ config-android-%:
 compile-android-%:
 	$(MAKE) -C build-android-$*/livecode
 
+check-android-%:
+	$(MAKE) -C build-android-$*/livecode check
+
 all-android-%:
 	$(MAKE) config-android-$*
 	$(MAKE) compile-android-$*
 
-$(addsuffix -android,all config compile): %: %-armv6
+$(addsuffix -android,all config compile check): %: %-armv6
 
 ################################################################
 # Mac rules
@@ -183,6 +190,9 @@ config-emscripten:
 compile-emscripten:
 	$(EMMAKE) $(MAKE) -C build-emscripten/livecode
 
+check-emscripten:
+	$(EMMAKE) $(MAKE) -C build-emscripten/livecode check
+
 all-emscripten:
 	$(MAKE) config-emscripten
 	$(MAKE) compile-emscripten
diff --git a/config.sh b/config.sh
@@ -359,7 +359,7 @@ fi
 ################################################################
 
 format_args="$(for f in ${FORMATS}; do echo --format ${f} ; done)"
-basic_args="${format_args} --depth ${DEPTH} --generator-output ${GENERATOR_OUTPUT}"
+basic_args="${format_args} --depth ${DEPTH} --generator-output ${GENERATOR_OUTPUT} -G default_target=default"
 
 if [ "${BUILD_EDITION}" == "commercial" ] ; then
   basic_args="${basic_args} ../livecode-commercial.gyp"
diff --git a/livecode.gyp b/livecode.gyp
@@ -6,6 +6,18 @@
 	
 	'targets':
 	[
+		{
+			'target_name': 'default',
+			'type': 'none',
+			'dependencies': [ 'binzip-copy', ],
+		},
+
+		{
+			'target_name': 'check',
+			'type': 'none',
+			'dependencies': [ 'cpptest-run-all', ],
+		},
+
 		{
 			'target_name': 'LiveCode-all',
 			'type': 'none',
@@ -180,48 +192,7 @@
 				'files': [ '>@(dist_files)', '>@(dist_aux_files)', ],
 			}],
 		},
-
-		{
-			'target_name': 'cpptest-all',
-			'type': 'none',
-
-			'variables':
-			{
-				'javascriptify': ''
-			},
-
-			'dependencies':
-			[
-				'libcpptest/libcpptest.gyp:test-libcpptest<(javascriptify)',
-				'libfoundation/libfoundation.gyp:test-libFoundation<(javascriptify)',
-				'engine/kernel-standalone.gyp:test-kernel-standalone<(javascriptify)',
-			],
-
-			'conditions':
-			[
-				[
-					'OS == "emscripten"',
-					{
-						'variables':
-						{
-							'javascriptify': '-javascriptify'
-						},
-					},
-				],
-				[
-					'mobile == 0',
-					{
-						'dependencies':
-						[
-							'engine/kernel-server.gyp:test-kernel-server<(javascriptify)',
-							'engine/kernel-development.gyp:test-kernel-development<(javascriptify)',
-							'engine/kernel-installer.gyp:test-kernel-installer<(javascriptify)',
-						],
-					},
-				],
-			],
-		},
-
+		
 		{
 			'target_name': 'cpptest-run-all',
 			'type': 'none',
