Move common makefile functionality into single file

livecodeali · livecodeali · commit fda187fd8ded · 2016-07-08T11:21:44.000+01:00
diff --git a/Makefile b/Makefile
@@ -34,15 +34,6 @@ IOS_SDKS ?= \
 
 # Choose the correct build type
 MODE ?= debug
-ifeq ($(MODE),debug)
-  export BUILDTYPE ?= Debug
-else ifeq ($(MODE),release)
-  export BUILDTYPE ?= Release
-else ifeq ($(MODE),fast)
-  export BUILDTYPE ?= Fast
-else
-  $(error "Mode must be 'debug' or 'release'")
-endif
 
 # Where to run the build command depends on community vs commercial
 ifeq ($(BUILD_EDITION),commercial)
@@ -53,17 +44,12 @@ else
   BUILD_PROJECT := livecode
 endif
 
+include Makefile.common
+
 ################################################################
 
 .DEFAULT: all
 
-guess_platform_script := \
-	case `uname -s` in \
-		Linux) echo linux ;; \
-		Darwin) echo mac ;; \
-	esac
-guess_platform := $(shell $(guess_platform_script))
-
 all: all-$(guess_platform)
 check: check-$(guess_platform)
 
@@ -78,14 +64,6 @@ check-common-%:
 
 LINUX_ARCHS = x86_64 x86
 
-guess_linux_arch_script := \
-	case `uname -p` in \
-		x86_64) echo x86_64 ;; \
-		x86|i*86) echo x86 ;; \
-	esac
-
-guess_linux_arch := $(shell $(guess_linux_arch_script))
-
 config-linux-%:
 	./config.sh --platform linux-$*
 
diff --git a/Makefile.common b/Makefile.common
@@ -0,0 +1,64 @@
+# Copyright (C) 2016 LiveCode Ltd.
+#
+# This file is part of LiveCode.
+#
+# LiveCode is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License v3 as published by the Free
+# Software Foundation.
+#
+# LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LiveCode.  If not see <http://www.gnu.org/licenses/>.
+
+# This file consists of some common functionality required by various 
+# Makefiles
+
+ifeq ($(MODE),debug)
+  export BUILDTYPE ?= Debug
+else ifeq ($(MODE),release)
+  export BUILDTYPE ?= Release
+else ifeq ($(MODE),fast)
+  export BUILDTYPE ?= Fast
+else
+  $(error "Mode must be 'debug' or 'release'")
+endif
+
+################################################################
+# Attempt to guess where to find various tools and libraries
+################################################################
+
+top_srcdir ?= .
+
+guess_linux_arch_script := \
+	case `uname -p` in \
+	    x86_64) echo x86_64 ;; \
+	    x86|i*86) echo x86 ;; \
+	esac
+guess_linux_arch := $(shell $(guess_linux_arch_script))
+
+guess_platform_script := \
+	case `uname -s` in \
+	    Linux) echo linux-$(guess_linux_arch) ;; \
+	    Darwin) echo mac ;; \
+	esac
+guess_platform := $(shell $(guess_platform_script))
+	
+guess_engine_flags_script := \
+	if echo $(guess_platform) | grep "^linux" >/dev/null 2>&1 && \
+	        ! xset -q >/dev/null 2>&1 ; then \
+	    echo "-ui"; \
+	fi
+guess_engine_flags := $(shell $(guess_engine_flags_script))
+
+ifeq ($(guess_platform),mac)
+	bin_dir ?= $(top_srcdir)/_build/mac/$(BUILDTYPE)
+else
+	bin_dir ?= $(top_srcdir)/$(guess_platform)-bin
+endif
+
+guess_engine := $(if $(filter mac,$(guess_platform)),$(bin_dir)/Standalone-Community.app/Contents/MacOS/Standalone-Community,$(bin_dir)/standalone-community)
+guess_dev_engine := $(if $(filter mac,$(guess_platform)),$(bin_dir)/LiveCode-Community.app/Contents/MacOS/LiveCode-Community,$(bin_dir)/LiveCode-Community)
diff --git a/tests/Makefile b/tests/Makefile
@@ -4,57 +4,17 @@ else
 _PRINT_RULE ?=
 endif
 
-################################################################
-# Attempt to guess where to find various tools and libraries
-################################################################
-
 MODE ?= release
-ifeq ($(MODE),release)
-	UC_MODE := Release
-else ifeq ($(MODE),debug)
-	UC_MODE := Debug
-else ifeq ($(MODE),fast)
-	UC_MODE := Fast
-else
-	$(error "Mode must be 'debug' or 'release'")
-endif
-
 top_srcdir ?= ..
-TEST_DIR ?= $(top_srcdir)/_tests
-LCM_DIR ?= $(TEST_DIR)/_build
 
-guess_linux_arch_script := \
-	case `uname -p` in \
-	    x86_64) echo x86_64 ;; \
-	    x86|i*86) echo x86 ;; \
-	esac
-guess_linux_arch := $(shell $(guess_linux_arch_script))
-
-guess_platform_script := \
-	case `uname -s` in \
-	    Linux) echo linux-$(guess_linux_arch) ;; \
-	    Darwin) echo mac ;; \
-	esac
-guess_platform := $(shell $(guess_platform_script))
-
-ifeq ($(guess_platform),mac)
-	bin_dir ?= $(top_srcdir)/_build/mac/$(UC_MODE)
-else
-	bin_dir ?= $(top_srcdir)/$(guess_platform)-bin
-endif
+include $(top_srcdir)/Makefile.common
 
 ########## LiveCode Script test parameters
 
-guess_engine := $(if $(filter mac,$(guess_platform)),$(bin_dir)/Standalone-Community.app/Contents/MacOS/Standalone-Community,$(bin_dir)/standalone-community)
-guess_dev_engine := $(if $(filter mac,$(guess_platform)),$(bin_dir)/LiveCode-Community.app/Contents/MacOS/LiveCode-Community,$(bin_dir)/LiveCode-Community)
+TEST_DIR ?= $(top_srcdir)/_tests
+LCM_DIR ?= $(TEST_DIR)/_build
 
 # When running on headless Linux, run tests in -ui mode.
-guess_engine_flags_script := \
-	if echo $(guess_platform) | grep "^linux" >/dev/null 2>&1 && \
-	        ! xset -q >/dev/null 2>&1 ; then \
-	    echo "-ui"; \
-	fi
-guess_engine_flags := $(shell $(guess_engine_flags_script))
 
 LCS_ENGINE ?= $(guess_engine)
 LCS_ENGINE_FLAGS ?= $(guess_engine_flags)
