Add make.sh script for windows support, update make-all.sh, add breadcrumb to premake to emulate Makefile contextual behavior

gorlak · gorlak · commit a2082f98650f · 2018-12-27T17:56:17.000-08:00
diff --git a/.travis.before_install.windows.sh b/.travis.before_install.windows.sh
@@ -0,0 +1 @@
+
diff --git a/.travis.yml b/.travis.yml
@@ -34,6 +34,14 @@ matrix:
   - os: osx
     compiler: clang
     env: CONFIG=release ARCH=x86_64
+  - os: windows
+    env: CONFIG=debug ARCH=x86_64
+  - os: windows
+    env: CONFIG=intermediate ARCH=x86_64
+  - os: windows
+    env: CONFIG=profile ARCH=x86_64
+  - os: windows
+    env: CONFIG=release ARCH=x86_64
   - os: linux
     compiler: gcc
     env: CONFIG=debug ARCH=x86
@@ -58,6 +66,14 @@ matrix:
   - os: osx
     compiler: clang
     env: CONFIG=release ARCH=x86
+  - os: windows
+    env: CONFIG=debug ARCH=x86
+  - os: windows
+    env: CONFIG=intermediate ARCH=x86
+  - os: windows
+    env: CONFIG=profile ARCH=x86
+  - os: windows
+    env: CONFIG=release ARCH=x86
   - os: linux
     compiler: gcc
     env: CONFIG=debug ARCH=x86_64 ARGS=--shared
@@ -82,6 +98,14 @@ matrix:
   - os: osx
     compiler: clang
     env: CONFIG=release ARCH=x86_64 ARGS=--shared
+  - os: windows
+    env: CONFIG=debug ARCH=x86_64 ARGS=--shared
+  - os: windows
+    env: CONFIG=intermediate ARCH=x86_64 ARGS=--shared
+  - os: windows
+    env: CONFIG=profile ARCH=x86_64 ARGS=--shared
+  - os: windows
+    env: CONFIG=release ARCH=x86_64 ARGS=--shared
   - os: linux
     compiler: gcc
     env: CONFIG=debug ARCH=x86 ARGS=--shared
@@ -106,6 +130,14 @@ matrix:
   - os: osx
     compiler: clang
     env: CONFIG=release ARCH=x86 ARGS=--shared
+  - os: windows
+    env: CONFIG=debug ARCH=x86 ARGS=--shared
+  - os: windows
+    env: CONFIG=intermediate ARCH=x86 ARGS=--shared
+  - os: windows
+    env: CONFIG=profile ARCH=x86 ARGS=--shared
+  - os: windows
+    env: CONFIG=release ARCH=x86 ARGS=--shared
 git:
   submodules: false
 before_install:
@@ -114,10 +146,10 @@ before_install:
 script:
 - cd Dependencies
 - "../premake.sh --architecture=${ARCH} gmake"
-- make -C Build -j4 config=${CONFIG}
+- "../make.sh ${CONFIG}"
 - cd ..
 - "./premake.sh --architecture=${ARCH} ${ARGS} gmake"
-- make -C Build -j4 config=${CONFIG}
+- "./make.sh ${CONFIG}"
 notifications:
   slack:
     secure: WGphmpc2xT8R701bspa9Q3z/I/zBoU+Sf069IXq/ATqgzqKBMxyjexQY4SwQmsEuZwC13Ax31uaT9hpcv02gEB29PDnCUFoRyWrdCrSDPsfAUvjY9LEDkUlxYXyeOqJ+jR7yleSIRK7CVyXJgHYvGXn9wwa7w/2JzgUvnhN8hFMLHWqX+bJ9oRPcZAzNkdT2TWxM5SkJCw5NL8UnSnY2Si1BKS1EFj3RX2FBgyHbYdBxXwTMSpSkzWpqvhTZruYLT7Hi9ZpUKgA0XIPxV+o2+ZYcoUczlBSa2yAK0yyestltMWhraYbCnIY6cRoqFXTRlX7SRSPYzf+HpDIZqlziX3jsNiUreYmWNZrp2sf4Lh76xUGsAvaqi3AeywPiWtT/t6z7GGHjIZ5TEIDRlFaMopTGNRTObEFG9VFCTFFprN7siie6roxAKs76gqC6t8w05fLS88Urerdf7dAMCo7ruVJ9dCKQgkLFM4XkNXrOKa2vNq1Iy0y30upd2SeuY0LTKlBS7BbeTxVsZOSO4obmy5HvJNzT76z8kw7OMBMwdVTaw8wLw3xuJkquZx+1em5ymO/YGzTelz34r5Dw6IMPn3Dfve1Q5skOTsGdJGNrxCogLhe6dEyj1ArKPzmYqmEA8y53pgCnbZ5IdQmmjYrri3ihUMrCOZkMYUjPwJrYe18=
diff --git a/Dependencies/premake5.lua b/Dependencies/premake5.lua
@@ -1,5 +1,11 @@
 require( './premake' )
 
+-- This is a breadcrumb for the travis scripts
+print("Writing solution.txt...")
+local file = io.open("./Build/solution.txt", "w");
+file:write("Dependencies\n");
+file:close();
+
 workspace "Dependencies"
 Helium.DoBasicWorkspaceSettings()
 
diff --git a/make-all.sh b/make-all.sh
@@ -1,27 +1,27 @@
 #!/bin/bash
 
-make -C Build $@ config=debug
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+$DIR/make.sh debug
 if [ "$?" -ne "0" ]; then
 	echo "Debug failed!"
 	exit 1
 fi
 
-make -C Build $@ config=intermediate
+$DIR/make.sh intermediate
 if [ "$?" -ne "0" ]; then
 	echo "Intermediate failed!"
 	exit 1
 fi
 
-make -C Build $@ config=profile
+$DIR/make.sh profile
 if [ "$?" -ne "0" ]; then
 	echo "Profile failed!"
 	exit 1
 fi
 
-make -C Build $@ config=release
+$DIR/make.sh release
 if [ "$?" -ne "0" ]; then
 	echo "Release failed!"
 	exit 1
 fi
-
-popd
diff --git a/make.sh b/make.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+pushd Build
+
+if [ `uname` == "Darwin" ]; then
+	make -j4 config=$1
+elif [ `uname` == "Linux" ]; then
+	make -j4 config=$1
+else
+	VSINSTALL=`"/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -property installationPath`
+	VSINSTALL_BASH=`cygpath -a "$VSINSTALL"`
+	SOLUTION=`cat solution.txt`
+	#cmd //c "$VSINSTALL_BASH/VC/Auxiliary/Build/vcvars64.bat" \&\& devenv.com Dependencies.sln //build debug
+	cmd //c "$VSINSTALL_BASH/VC/Auxiliary/Build/vcvars64.bat" \&\& msbuild $SOLUTION.sln //p:Configuration=$1 //verbosity:minimal
+fi
+
+popd
diff --git a/premake.sh b/premake.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if [ ! -f $DIR/Dependencies/premake/bin/release/premake5 ]; then
diff --git a/premake5.lua b/premake5.lua
@@ -1,7 +1,12 @@
 require( './premake' )
 
-workspace "Core"
+-- This is a breadcrumb for the travis scripts
+print("Writing solution.txt...")
+local file = io.open("./Build/solution.txt", "w");
+file:write("Core\n");
+file:close();
 
+workspace "Core"
 Helium.DoBasicWorkspaceSettings()
 
 configuration "Debug"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
`1`	`3`	`DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"`
`2`	`4`
`3`	`5`	`if [ ! -f $DIR/Dependencies/premake/bin/release/premake5 ]; then`