livecode · livecodeali · Apr 30, 2020 · Apr 30, 2020 · Apr 30, 2020 · Jun 3, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -10,14 +10,15 @@ dist: trusty
 os:
   - linux
   - osx
+  - windows
 
 # Use a Travis image containing an Xcode we support
 # This prevents surprise upgrades!
 osx_image: xcode7.3
 
-language: c++
+language: cpp
 
-compiler: 
+compiler:
   - clang
   - gcc
 
@@ -46,11 +47,13 @@ matrix:
     compiler: gcc
   - os: linux
     compiler: clang
+  - os: windows
+    compiler: clang
 
 # Install any required tools
 before_install:
   - |
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then 
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
       rvm --default use 2.2.1
       gem install xcpretty
     fi
@@ -59,13 +62,22 @@ before_install:
     if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
       sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
       sudo apt-get -qq update
-      sudo apt-get -qq install g++-4.9    
+      sudo apt-get -qq install g++-4.9
+    fi
+
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then
+      choco install --yes cygwin -params '/InstallDir:C:\Cygwin'
+      choco install --yes --source cygwin bash curl zip unzip
+      choco install make
+      choco install winflexbison
     fi
 
 # Set up the source tree by fetching Linux-specific prebuilt objects
 install: 
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then (cd prebuilt && ./fetch-libraries.sh linux x86_64) ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx"   ]] ; then (cd prebuilt && ./fetch-libraries.sh mac)   ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "windows"   ]] ; then (cd prebuilt && ./fetch-libraries.sh win32 x86_64)   ; fi
 
 # Bootstrap the LCB compiler, build the default target set and run a
 # the default test suite.
@@ -89,8 +101,9 @@ script: |
       export JAVA_HOME=$(/usr/libexec/java_home)
       ;;
   esac
-
-  if [[ "${COVERITY_SCAN_BRANCH}" != "1" ]]; then
+  if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then
+    cmd.exe /C configure.bat
+  elif [[ "${COVERITY_SCAN_BRANCH}" != "1" ]]; then
     mkdir -p "${LICENSE_DIR}" &&
     touch "${LICENSE_DIR}/livecode-firstrun.lcf" &&
     make all-${BUILD_PLATFORM} &&

diff --git a/Makefile.common b/Makefile.common
@@ -50,13 +50,22 @@ guess_linux_arch_script := \
 	esac
 guess_linux_arch := $(shell $(guess_linux_arch_script))
 
-guess_platform_script := \
+guess_platform_no_arch_script := \
 	case `uname -s` in \
-	    Linux) echo linux-$(guess_linux_arch) ;; \
+	    Linux) echo linux ;; \
 	    Darwin) echo mac ;; \
+        MSYS*) echo win ;; \
 	esac
+guess_platform_no_arch := $(shell $(guess_platform_no_arch_script))
+
+guess_platform_script := \
+    case `uname -s` in \
+        Linux) echo linux-$(guess_linux_arch) ;; \
+        Darwin) echo mac ;; \
+        MSYS*) echo win-$(guess_linux_arch) ;; \
+    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 \
@@ -70,5 +79,20 @@ 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)
+guess_engine_script := \
+    case `uname -s` in \
+        Linux) echo $(bin_dir)/standalone-community ;; \
+        Darwin) echo $(bin_dir)/Standalone-Community.app/Contents/MacOS/Standalone-Community ;; \
+        MSYS*) echo $(bin_dir)/standalone-community.exe ;; \
+    esac
+guess_engine := $(shell $(guess_engine_script))
+
+
+guess_dev_engine_script := \
+    case `uname -s` in \
+        Linux) echo $(bin_dir)/LiveCode-Community ;; \
+        Darwin) echo $(bin_dir)/LiveCode-Community.app/Contents/MacOS/LiveCode-Community ;; \
+        MSYS*) echo $(bin_dir)/LiveCode-Community.exe ;; \
+    esac
+guess_dev_engine := $(shell $(guess_dev_engine_script))
+
diff --git a/buildbot.py b/buildbot.py
@@ -195,25 +195,23 @@ def __exit__(self, type, value, traceback):
 def exec_msbuild(platform):
     # Run the make.cmd batch script; it's run using Wine if this is
     # not actually a Windows system.
-    cwd = 'build-' + platform
-
     if _platform.system() == 'Windows':
         with UniqueMspdbsrv() as mspdbsrv:
-            args = ['cmd', '/C', '..\\make.cmd']
+            args = ['cmd', '/C', 'make.cmd']
             print(' '.join(args))
-            result = subprocess.call(args, cwd=cwd)
+            result = subprocess.call(args)
 
         sys.exit(result)
 
     else:
-        args = ['wine', 'cmd', '/K', '..\\make.cmd']
+        args = ['wine', 'cmd', '/K', 'make.cmd']
         print(' '.join(args))
-        exit_status = sys.exit(subprocess.call(args, cwd=cwd))
+        exit_status = sys.exit(subprocess.call(args))
 
         # Clean up any Wine processes that are still hanging around.
         # This is important in case the build fails.
         args = ['wineserver', '-k', '-w']
-        subprocess.call(args, cwd=cwd)
+        subprocess.call(args)
 
         sys.exit(exit_status)
 

diff --git a/config/yacc.gypi b/config/yacc.gypi
@@ -6,13 +6,32 @@
 			[
 				'OS == "win"',
 				{
-					'variables':
-					{
-						'invoke_unix_path': '$(ProjectDir)../../../../../util/invoke-unix.bat',
-					},
-
-					'flex': ['<(invoke_unix_path)', '/usr/bin/flex'],
-					'bison': ['<(invoke_unix_path)', '/usr/bin/bison'],
+                    'variables':
+                    {
+						# Whether to use flex and bison installed via chocolatey winflexbison
+						# package or installed through Cygwin
+						'use_winflexbison': '<!(echo ${USE_WINFLEXBISON:-0})',
+                    },
+
+					'conditions':
+					[
+						[
+							'use_winflexbison != "0"',
+							{
+								'flex': ['win_flex.exe'],
+								'bison': ['win_bison.exe'],
+							},
+							{
+			                    'variables':
+			                    {
+			                            'invoke_unix_path': '$(ProjectDir)../../../../../util/invoke-unix.bat',
+			                    },
+
+			                    'flex': ['<(invoke_unix_path)', '/usr/bin/flex'],
+			                    'bison': ['<(invoke_unix_path)', '/usr/bin/bison'],
+							},
+						],
+					],
 				},
 				{
 					'flex': 'flex',

diff --git a/configure.bat b/configure.bat
@@ -1,4 +1,3 @@
-@echo off
 REM Configures the Windows build
 
 SETLOCAL EnableExtensions
@@ -59,11 +58,15 @@ IF EXIST "%programfiles(x86)%\Microsoft Speech SDK 5.1\*" (
 )
 
 REM Pause so any warnings can be seen
-IF %warnings% NEQ 0 PAUSE
+IF %TRAVIS_OS_NAME%=="" (
+  IF %warnings% NEQ 0 PAUSE
+)
 
 REM Run the configure step
 %python% config.py --platform win-%TARGET_ARCH% %extra_options% %gypfile%
-PAUSE
+IF %TRAVIS_OS_NAME%=="" (
+  PAUSE
+)
 
 REM Pause if there was an error so that the user gets a chance to see it
 IF %ERRORLEVEL% NEQ 0 PAUSE

diff --git a/docs/development/build-win.md b/docs/development/build-win.md
@@ -119,7 +119,6 @@ and build LiveCode from there.
 If you installed the Visual Studio build tools, you can run:
 
 ````
-cd build-win-x86
 set BUILD_PLATFORM=win-x86
 cmd /C ..\make.cmd
 ````

diff --git a/extensions/script-libraries/diff/test/diff.livecodescript b/extensions/script-libraries/diff/test/diff.livecodescript
@@ -7,6 +7,12 @@ on TestSetup
 end TestSetup
 
 on TestContextLines
+   // These tests seem to fail on windows
+   if the platform is "win32" then
+      TestAssertBroken "Diff library context lines", false, "Bug 22152"
+      exit TestContextLines
+   end if
+
    local tTestFolder
    put get_test_folder() & "/test_context" into tTestFolder
 
@@ -23,6 +29,12 @@ on TestLineEndings
 end TestLineEndings
 
 on TestTerminatingNewline
+   // These tests seem to fail on windows
+   if the platform is "win32" then
+      TestAssertBroken "Diff library terminating new line", false, "Bug 22152"
+      exit TestTerminatingNewline
+   end if
+
    local tTestFolder
    put get_test_folder() & "/test_terminating_newline" into tTestFOlder
 

diff --git a/lcidlc/lcidlc.gyp b/lcidlc/lcidlc.gyp
@@ -62,6 +62,26 @@
 						'type': 'none',
 					},
 				],
+                [
+                    'OS == "win"',
+                    {
+                        'variables':
+                        {
+                            # Skip LCIDLC on Windows if the appropriate environment variable is set
+                            'skip_lcidlc': '<!(echo ${SKIP_LCIDLC:-0})',
+                        },
+
+                        'conditions':
+                        [
+                            [
+                                'skip_lcidlc != "0"',
+                                {
+                                    'type': 'none',
+                                },
+                            ],
+                        ],
+                    },
+                ],
 			],
 
 			'msvs_settings':

diff --git a/livecode.gyp b/livecode.gyp
@@ -38,8 +38,7 @@
 			],
 
 			'conditions':
-			[
-
+			[				
 				[
 					'OS != "emscripten"',
 					{

diff --git a/make.cmd b/make.cmd
@@ -14,10 +14,10 @@ if not defined BUILDTYPE set BUILDTYPE=Debug
 @rem Guess build project
 if not defined BUILD_EDITION set BUILD_EDITION=community
 if /I "%BUILD_EDITION%"=="commercial" (
-    set BUILD_PROJECT=livecode-commercial.sln
+    set BUILD_PROJECT=build-%BUILD_PLATFORM%\livecode-commercial.sln
     set DEFAULT_TARGET=____\default
 ) else (
-    set BUILD_PROJECT=livecode\livecode.sln
+    set BUILD_PROJECT=build-%BUILD_PLATFORM%\livecode\livecode.sln
     set DEFAULT_TARGET=default
 )
 

diff --git a/tests/Makefile b/tests/Makefile
@@ -26,18 +26,30 @@ else
 LCS_CMD = $(INTERPRETER) $(LCS_ENGINE) $(LCS_ENGINE_FLAGS) $(LCS_TESTRUNNER) run $(LCS_TESTS_DIR)
 endif
 
-LCS_SERVER_ENGINE ?= $(bin_dir)/server-community
+ifeq ($(guess_platform_no_arch),win)
+	LCS_SERVER_ENGINE ?= $(bin_dir)/server-community.exe
+else
+	LCS_SERVER_ENGINE ?= $(bin_dir)/server-community
+endif
 LCS_SERVER_TESTRUNNER ?= $(TESTS_DIR)/_testrunner.lc
 LCS_SERVER_CMD = $(LCS_SERVER_ENGINE) $(LCS_SERVER_TESTRUNNER) run $(LCS_TESTS_DIR)
 
 ########## LiveCode Builder test parameters
 
 MODULE_DIR ?= $(bin_dir)/modules/lci
 
-LC_COMPILE ?= $(bin_dir)/lc-compile
+ifeq ($(guess_platform_no_arch),win)
+	LC_COMPILE ?= $(bin_dir)/lc-compile.exe
+else
+	LC_COMPILE ?= $(bin_dir)/lc-compile
+endif
 LC_COMPILE_FLAGS += --modulepath $(LCM_DIR) --modulepath $(MODULE_DIR)
 
-LC_RUN ?= $(bin_dir)/lc-run
+ifeq ($(guess_platform_no_arch),win)
+	LC_RUN ?= $(bin_dir)/lc-run.exe
+else
+	LC_RUN ?= $(bin_dir)/lc-run
+endif
 
 LCB_LOG = _lcb_test_suite.log
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,8 +38,7 @@ @@
     			],
     			'conditions':
-    			[
+    			[
     				[
     					'OS != "emscripten"',
     					{
@@ Expand Down @@