Tweak the makefiles in preparation for commercial builds

livecodefraser · livecodefraser · commit 6b8c9b1c8a64 · 2015-04-30T12:16:11.000+01:00
diff --git a/Makefile b/Makefile
@@ -43,6 +43,15 @@ else
   $(error "Mode must be 'debug' or 'release'")
 endif
 
+# Where to run the build command depends on community vs commercial
+ifeq ($(BUILD_EDITION),commercial)
+  BUILD_SUBDIR :=
+  BUILD_PROJECT := livecode-commercial
+else
+  BUILD_SUBDIR := "/livecode"
+  BUILD_PROJECT := livecode
+endif
+
 ################################################################
 
 .DEFAULT: all
@@ -74,7 +83,7 @@ config-linux-%:
 	./config.sh --platform linux-$*
 
 compile-linux-%:
-	$(MAKE) -C build-linux-$*
+	$(MAKE) -C build-linux-$*/livecode
 
 all-linux-%:
 	$(MAKE) config-linux-$*
@@ -92,7 +101,7 @@ config-android-%:
 	./config.sh --platform android-$*
 
 compile-android-%:
-	$(MAKE) -C build-android-$*
+	$(MAKE) -C build-android-$*/livecode
 
 all-android-%:
 	$(MAKE) config-android-$*
@@ -108,7 +117,7 @@ config-mac:
 	./config.sh --platform mac
 
 compile-mac:
-	$(XCODEBUILD) -project build-mac/livecode.xcodeproj -configuration $(BUILDTYPE)
+	$(XCODEBUILD) -project build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj -configuration $(BUILDTYPE)
 
 all-mac:
 	$(MAKE) config-mac
@@ -126,7 +135,7 @@ config-ios-%:
 	./config.sh --platform ios --generator-output build-ios-$* -Dtarget_sdk=$*
 
 compile-ios-%:
-	$(XCODEBUILD) -project build-ios-$*/livecode.xcodeproj -configuration $(BUILDTYPE)
+	$(XCODEBUILD) -project build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj -configuration $(BUILDTYPE)
 
 # Provide some synonyms for "latest iOS SDK"
 $(addsuffix -ios-iphoneos,all config compile): %: %8.3
@@ -156,3 +165,4 @@ all-win-%:
 	$(MAKE) compile-win-$*
 
 $(addsuffix -win,all config compile): %: %-x86
+
diff --git a/config.sh b/config.sh
@@ -187,7 +187,7 @@ esac
 
 # Guess generator output directory from platform
 if test -z "$GENERATOR_OUTPUT"; then
-  GENERATOR_OUTPUT="build-${PLATFORM}"
+  GENERATOR_OUTPUT="build-${PLATFORM}/livecode"
 fi
 
 # Guess OS from platform
@@ -283,6 +283,10 @@ ANDROID_STRIP=${STRIP:-${ANDROID_TOOLCHAIN}strip}
 format_args="$(for f in ${FORMATS}; do echo --format ${f} ; done)"
 basic_args="${format_args} --depth ${DEPTH} --generator-output ${GENERATOR_OUTPUT}"
 
+if [ "${BUILD_EDITION}" == "commercial" ] ; then
+  basic_args="${basic_args} ../livecode-commercial.gyp"
+fi
+
 case ${OS} in
   linux)
     invoke_gyp $basic_args "-DOS=${OS}" "-Dtarget_arch=${TARGET_ARCH}" "$@"
diff --git a/engine/kernel.gypi b/engine/kernel.gypi
@@ -134,7 +134,7 @@
 						{
 							'sources':
 							[
-								'<(INTERMEDIATE_DIR)/src/linux.stubs.cpp',
+								'<(SHARED_INTERMEDIATE_DIR)/src/linux.stubs.cpp',
 							],
 							
 							'libraries':
@@ -156,7 +156,7 @@
 									],
 									'outputs':
 									[
-										'<(INTERMEDIATE_DIR)/src/linux.stubs.cpp',
+										'<(SHARED_INTERMEDIATE_DIR)/src/linux.stubs.cpp',
 									],
 									
 									'action':
diff --git a/make.cmd b/make.cmd
@@ -12,8 +12,17 @@
 @REM Select the correct build mode.
 @REM 
 @IF NOT DEFINED BUILDTYPE SET BUILDTYPE=Debug
+
+@REM Select the correct build project file
+@REM
+IF NOT DEFINED BUILD_EDITION SET BUILD_EDITION=community
+IF %BUILD_EDITION%==commercial (
+  SET BUILD_PROJECT=livecode-commercial.sln
+) ELSE (
+  SET BUILD_PROJECT=livecode\livecode.sln
+)
  
-@msbuild livecode.sln /fl /flp:Verbosity=normal /nologo /p:Configuration=%BUILDTYPE% /m:1
+@msbuild %BUILD_PROJECT% /fl /flp:Verbosity=normal /nologo /p:Configuration=%BUILDTYPE% /m:1
  
 @exit %ERRORLEVEL%
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@`
`134`	`134`	`{`
`135`	`135`	`'sources':`
`136`	`136`	`[`
`137`		`- '<(INTERMEDIATE_DIR)/src/linux.stubs.cpp',`
	`137`	`+ '<(SHARED_INTERMEDIATE_DIR)/src/linux.stubs.cpp',`
`138`	`138`	`],`
`139`	`139`
`140`	`140`	`'libraries':`
`@@ -156,7 +156,7 @@`
`156`	`156`	`],`
`157`	`157`	`'outputs':`
`158`	`158`	`[`
`159`		`- '<(INTERMEDIATE_DIR)/src/linux.stubs.cpp',`
	`159`	`+ '<(SHARED_INTERMEDIATE_DIR)/src/linux.stubs.cpp',`
`160`	`160`	`],`
`161`	`161`
`162`	`162`	`'action':`