[[ cpptest ]] Add check targets for Mac and Windows

livecodestephen · livecodestephen · commit 4f02ce30668a · 2015-10-14T09:54:02.000+01:00
diff --git a/Makefile b/Makefile
@@ -85,7 +85,7 @@ config-linux-%:
 	./config.sh --platform linux-$*
 
 compile-linux-%:
-	$(MAKE) -C build-linux-$*/livecode
+	$(MAKE) -C build-linux-$*/livecode default
 
 check-linux-%:
 	$(MAKE) -C build-linux-$*/livecode check
@@ -106,7 +106,7 @@ config-android-%:
 	./config.sh --platform android-$*
 
 compile-android-%:
-	$(MAKE) -C build-android-$*/livecode
+	$(MAKE) -C build-android-$*/livecode default
 
 check-android-%:
 	$(MAKE) -C build-android-$*/livecode check
@@ -125,7 +125,10 @@ config-mac:
 	./config.sh --platform mac
 
 compile-mac:
-	$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE)
+	$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target default
+
+check-mac:
+	$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check
 
 all-mac:
 	$(MAKE) config-mac
@@ -143,25 +146,31 @@ config-ios-%:
 	./config.sh --platform ios --generator-output build-ios-$*/livecode -Dtarget_sdk=$*
 
 compile-ios-%:
-	$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE)
+	$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target default
+
+check-ios-%:
+	$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check
 
 # Dummy targets to prevent our build system from building iOS 5.1 simulator
 config-ios-iphonesimulator5.1:
 	@echo "Skipping iOS simulator 5.1 (no longer supported)"
 compile-ios-iphonesimulator5.1:
 	@echo "Skipping iOS simulator 5.1 (no longer supported)"
+check-ios-iphonesimulator5.1:
+	@echo "Skipping iOS simulator 5.1 (no longer supported)"
 
 # Provide some synonyms for "latest iOS SDK"
-$(addsuffix -ios-iphoneos,all config compile): %: %8.4
+$(addsuffix -ios-iphoneos,all config compile check): %: %8.4
 	@true
-$(addsuffix -ios-iphonesimulator,all config compile): %: %8.4
+$(addsuffix -ios-iphonesimulator,all config compile check): %: %8.4
 	@true
 
 all_ios_subplatforms = iphoneos iphonesimulator $(IOS_SDKS)
 
 all-ios: $(addprefix all-ios-,$(IOS_SDKS))
 config-ios: $(addprefix config-ios-,$(IOS_SDKS))
 compile-ios: $(addprefix compile-ios-,$(IOS_SDKS))
+check-ios: $(addprefix check-ios-,$(IOS_SDKS))
 
 ################################################################
 # Windows rules
@@ -172,7 +181,11 @@ config-win-%:
 
 compile-win-%:
 	# windows builds occur under Wine
-	cd build-win-$* && $(WINE) /K ../make.cmd
+	cd build-win-$* && $(WINE) /K ../make.cmd default
+
+check-win-%:
+	# windows builds occur under Wine
+	cd build-win-$* && $(WINE) /K ../make.cmd check
 
 all-win-%:
 	$(MAKE) config-win-$*
@@ -188,7 +201,7 @@ config-emscripten:
 	$(EMMAKE) ./config.sh --platform emscripten
 
 compile-emscripten:
-	$(EMMAKE) $(MAKE) -C build-emscripten/livecode
+	$(EMMAKE) $(MAKE) -C build-emscripten/livecode default
 
 check-emscripten:
 	$(EMMAKE) $(MAKE) -C build-emscripten/livecode check
diff --git a/make.cmd b/make.cmd
@@ -21,8 +21,14 @@ IF %BUILD_EDITION%==commercial (
 ) ELSE (
   SET BUILD_PROJECT=livecode\livecode.sln
 )
- 
-@msbuild %BUILD_PROJECT% /fl /flp:Verbosity=normal /nologo /p:Configuration=%BUILDTYPE% /m:1
+
+IF -%1-==-- (
+  SET TARGET=default
+) ELSE (
+  SET TARGET=%1
+)
+
+@msbuild %BUILD_PROJECT% /fl /flp:Verbosity=normal /nologo /p:Configuration=%BUILDTYPE% /m:1 /t:%TARGET%
  
 @exit %ERRORLEVEL%
 
