--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildfiles/certs/generate_self_signed_cert.cmd	Fri Jul 21 09:45:37 2017 -0400
@@ -0,0 +1,62 @@
+@echo off
+
+rem
+rem Copyright 2012-2017 Red Hat, Inc.
+rem
+rem This file is part of Thermostat.
+rem
+rem Thermostat is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License as published
+rem by the Free Software Foundation; either version 2, or (at your
+rem option) any later version.
+rem
+rem Thermostat is distributed in the hope that it will be useful, but
+rem WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+rem General Public License for more details.
+rem
+rem You should have received a copy of the GNU General Public License
+rem along with Thermostat; see the file COPYING.  If not see
+rem <http://www.gnu.org/licenses/>.
+rem
+rem Linking this code with other modules is making a combined work
+rem based on this code.  Thus, the terms and conditions of the GNU
+rem General Public License cover the whole combination.
+rem
+rem As a special exception, the copyright holders of this code give
+rem you permission to link this code with independent modules to
+rem produce an executable, regardless of the license terms of these
+rem independent modules, and to copy and distribute the resulting
+rem executable under terms of your choice, provided that you also
+rem meet, for each linked independent module, the terms and conditions
+rem of the license of that module.  An independent module is a module
+rem which is not derived from or based on this code.  If you modify
+rem this code, you may extend this exception to your version of the
+rem library, but you are not obligated to do so.  If you do not wish
+rem to do so, delete this exception statement from your version.
+rem
+
+setlocal
+echo off
+
+set ALIAS="thermostat"
+set VALIDITY_DAYS="365"
+set KEYSTORE_FILE=%~dp0..\..\distribution\src\cert\thermostat.jks
+
+if EXIST %KEYSTORE_FILE% (
+   del %KEYSTORE_FILE%
+)
+
+echo Generating self signed cert with alias %ALIAS% in %KEYSTORE_FILE% ...
+keytool -v -genkey -keyalg RSA -alias %ALIAS% -keystore %KEYSTORE_FILE% -validity %VALIDITY_DAYS% -keysize 4096 <%~dp0\generate_in.txt >NUL 2>NUL
+set ERR=%ERRORLEVEL%
+
+if %ERR% == 0 (
+  echo Completed successfully.
+) else (
+  echo Failed.
+)
+
+endlocal
+exit /b %ERR%
+

--- a/buildfiles/certs/generate_self_signed_cert.sh	Fri Jul 21 09:30:27 2017 -0400
+++ b/buildfiles/certs/generate_self_signed_cert.sh	Fri Jul 21 09:45:37 2017 -0400
@@ -35,10 +35,22 @@
 # to do so, delete this exception statement from your version.
 #
 
+if [ "$(uname -s | cut -b1-6)" == "CYGWIN" ]; then
+  ##echo "Running under Cygwin"
+  export CYGWIN_MODE=1
+else
+  ##echo "Running under Linux"
+  export CYGWIN_MODE=0
+fi
+
 ALIAS="thermostat"
 VALIDITY_DAYS="365"
 KEYSTORE_FILE=$(echo "$(pwd)/../../distribution/src/cert/thermostat.jks")
 
+if [ $CYGWIN_MODE -eq 1 ]; then
+    KEYSTORE_FILE=$(cygpath -w -p "KEYSTORE_FILE")
+fi
+
 if [ -e ${KEYSTORE_FILE} ]; then
   rm ${KEYSTORE_FILE}
 fi